Commit b22e2aca authored by bell@book.sanja.is.com.ua's avatar bell@book.sanja.is.com.ua

Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1

into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
parents 80aa0062 203881d9
drop table if exists test.t1,mysqltest.t1,mysqltest.t2; drop table if exists test.t1,mysqltest.t1,mysqltest.t2;
drop database if exists mysqltest; drop database if exists mysqltest;
set GLOBAL query_cache_size=1355776;
reset query cache; reset query cache;
flush status; flush status;
show grants for current_user; show grants for current_user;
...@@ -206,3 +207,4 @@ delete from mysql.columns_priv where user in ("mysqltest_1","mysqltest_2","mysql ...@@ -206,3 +207,4 @@ delete from mysql.columns_priv where user in ("mysqltest_1","mysqltest_2","mysql
flush privileges; flush privileges;
drop table test.t1,mysqltest.t1,mysqltest.t2; drop table test.t1,mysqltest.t1,mysqltest.t2;
drop database mysqltest; drop database mysqltest;
set GLOBAL query_cache_size=default;
--set-variable=query_cache_size=1355776
...@@ -10,6 +10,8 @@ drop table if exists test.t1,mysqltest.t1,mysqltest.t2; ...@@ -10,6 +10,8 @@ drop table if exists test.t1,mysqltest.t1,mysqltest.t2;
drop database if exists mysqltest; drop database if exists mysqltest;
--enable_warnings --enable_warnings
set GLOBAL query_cache_size=1355776;
reset query cache; reset query cache;
flush status; flush status;
connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock); connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
...@@ -145,3 +147,5 @@ delete from mysql.columns_priv where user in ("mysqltest_1","mysqltest_2","mysql ...@@ -145,3 +147,5 @@ delete from mysql.columns_priv where user in ("mysqltest_1","mysqltest_2","mysql
flush privileges; flush privileges;
drop table test.t1,mysqltest.t1,mysqltest.t2; drop table test.t1,mysqltest.t1,mysqltest.t2;
drop database mysqltest; drop database mysqltest;
set GLOBAL query_cache_size=default;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment