Merge fix-up.
BitKeeper/deleted/.del-create_manifest.js: Delete: win/create_manifest.js BitKeeper/deleted/.del-mysql_manifest.cmake: Delete: win/mysql_manifest.cmake mysql-test/r/information_schema.result: Move the test down.
This commit is contained in:
parent
9c1671267a
commit
ae5c3bf817
@ -1319,6 +1319,13 @@ TABLE_PRIVILEGES information_schema.TABLE_PRIVILEGES 1
|
||||
TRIGGERS information_schema.TRIGGERS 1
|
||||
USER_PRIVILEGES information_schema.USER_PRIVILEGES 1
|
||||
VIEWS information_schema.VIEWS 1
|
||||
show global status like "Uptime_%";
|
||||
Variable_name Value
|
||||
Uptime_since_flush_status #
|
||||
flush status;
|
||||
show global status like "Uptime_%";
|
||||
Variable_name Value
|
||||
Uptime_since_flush_status #
|
||||
create table t1(f1 int);
|
||||
create view v1 as select f1+1 as a from t1;
|
||||
create table t2 (f1 int, f2 int);
|
||||
@ -1330,10 +1337,3 @@ v2 YES
|
||||
delete from v1;
|
||||
drop view v1,v2;
|
||||
drop table t1,t2;
|
||||
show global status like "Uptime_%";
|
||||
Variable_name Value
|
||||
Uptime_since_flush_status #
|
||||
flush status;
|
||||
show global status like "Uptime_%";
|
||||
Variable_name Value
|
||||
Uptime_since_flush_status #
|
||||
|
0
win/mysql_manifest.cmake
Normal file → Executable file
0
win/mysql_manifest.cmake
Normal file → Executable file
Loading…
x
Reference in New Issue
Block a user