diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-10-17 12:15:14 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-10-17 12:15:14 -0600 |
| commit | 099d87419e897aaac1088bee57e523ae8b6b23d3 (patch) | |
| tree | da7ac1172cb8adabcfcc7a04e16ea06271ca3a95 /mysql-test/r/ps.result | |
| parent | 309962243d7ade38854c74d729d6dbb33c4a8ff4 (diff) | |
| download | mariadb-git-099d87419e897aaac1088bee57e523ae8b6b23d3.tar.gz | |
Update ps and show_check results to account for new -master.opt settings.
mysql-test/r/ps.result:
Update test results to account for new ps-master.opt settings
mysql-test/r/show_check.result:
Update test results to account for new show_check-master.opt settings
Diffstat (limited to 'mysql-test/r/ps.result')
| -rw-r--r-- | mysql-test/r/ps.result | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 7dadb3207a8..0d9c108a2bf 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -1537,54 +1537,62 @@ flush tables; show open tables from mysql; Database Table In_use Name_locked mysql general_log 1 0 +mysql slow_log 1 0 select Host, User from mysql.user limit 0; Host User select Host, Db from mysql.host limit 0; Host Db show open tables from mysql; Database Table In_use Name_locked -mysql user 0 0 mysql general_log 1 0 +mysql slow_log 1 0 mysql host 0 0 +mysql user 0 0 call proc_1(); show open tables from mysql; Database Table In_use Name_locked mysql general_log 1 0 +mysql slow_log 1 0 select Host, User from mysql.user limit 0; Host User select Host, Db from mysql.host limit 0; Host Db show open tables from mysql; Database Table In_use Name_locked -mysql user 0 0 mysql general_log 1 0 +mysql slow_log 1 0 mysql host 0 0 +mysql user 0 0 call proc_1(); show open tables from mysql; Database Table In_use Name_locked mysql general_log 1 0 +mysql slow_log 1 0 select Host, User from mysql.user limit 0; Host User select Host, Db from mysql.host limit 0; Host Db show open tables from mysql; Database Table In_use Name_locked -mysql user 0 0 mysql general_log 1 0 +mysql slow_log 1 0 mysql host 0 0 +mysql user 0 0 call proc_1(); show open tables from mysql; Database Table In_use Name_locked mysql general_log 1 0 +mysql slow_log 1 0 select Host, User from mysql.user limit 0; Host User select Host, Db from mysql.host limit 0; Host Db show open tables from mysql; Database Table In_use Name_locked -mysql user 0 0 mysql general_log 1 0 +mysql slow_log 1 0 mysql host 0 0 +mysql user 0 0 flush tables; create function func_1() returns int begin flush tables; return 1; end| ERROR 0A000: FLUSH is not allowed in stored function or trigger @@ -1600,49 +1608,56 @@ select Host, Db from mysql.host limit 0; Host Db show open tables from mysql; Database Table In_use Name_locked -mysql user 0 0 mysql general_log 1 0 +mysql slow_log 1 0 mysql host 0 0 +mysql user 0 0 prepare abc from "flush tables"; execute abc; show open tables from mysql; Database Table In_use Name_locked mysql general_log 1 0 +mysql slow_log 1 0 select Host, User from mysql.user limit 0; Host User select Host, Db from mysql.host limit 0; Host Db show open tables from mysql; Database Table In_use Name_locked -mysql user 0 0 mysql general_log 1 0 +mysql slow_log 1 0 mysql host 0 0 +mysql user 0 0 execute abc; show open tables from mysql; Database Table In_use Name_locked mysql general_log 1 0 +mysql slow_log 1 0 select Host, User from mysql.user limit 0; Host User select Host, Db from mysql.host limit 0; Host Db show open tables from mysql; Database Table In_use Name_locked -mysql user 0 0 mysql general_log 1 0 +mysql slow_log 1 0 mysql host 0 0 +mysql user 0 0 execute abc; show open tables from mysql; Database Table In_use Name_locked mysql general_log 1 0 +mysql slow_log 1 0 select Host, User from mysql.user limit 0; Host User select Host, Db from mysql.host limit 0; Host Db show open tables from mysql; Database Table In_use Name_locked -mysql user 0 0 mysql general_log 1 0 +mysql slow_log 1 0 mysql host 0 0 +mysql user 0 0 flush tables; deallocate prepare abc; create procedure proc_1() flush logs; |