From ae5c3bf81703bc98ca2c6463c7a85e25f8626360 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 2 Jul 2007 12:29:07 -0400 Subject: [PATCH] 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. --- mysql-test/r/information_schema.result | 14 +++++++------- win/mysql_manifest.cmake | 0 2 files changed, 7 insertions(+), 7 deletions(-) mode change 100644 => 100755 win/mysql_manifest.cmake diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index aff0ba94f13..62b81ea260c 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -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 # diff --git a/win/mysql_manifest.cmake b/win/mysql_manifest.cmake old mode 100644 new mode 100755