Skip to content

M
mariadb
Commit c055efba authored by unknown's avatar unknown
Browse files
Options

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/r/ps.result:
  Auto merged
parents dfa183b7 099d8741
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 22 deletions
mysql-test/r/ps.result
View file @ c055efba
...@@ -1537,54 +1537,62 @@ flush tables; ...@@ -1537,54 +1537,62 @@ flush tables;
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
select Host, User from mysql.user limit 0; select Host, User from mysql.user limit 0;
Host User Host User
select Host, Db from mysql.host limit 0; select Host, Db from mysql.host limit 0;
Host Db Host Db
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql user 0 0
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
mysql host 0 0 mysql host 0 0
mysql user 0 0
call proc_1(); call proc_1();
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
select Host, User from mysql.user limit 0; select Host, User from mysql.user limit 0;
Host User Host User
select Host, Db from mysql.host limit 0; select Host, Db from mysql.host limit 0;
Host Db Host Db
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql user 0 0
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
mysql host 0 0 mysql host 0 0
mysql user 0 0
call proc_1(); call proc_1();
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
select Host, User from mysql.user limit 0; select Host, User from mysql.user limit 0;
Host User Host User
select Host, Db from mysql.host limit 0; select Host, Db from mysql.host limit 0;
Host Db Host Db
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql user 0 0
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
mysql host 0 0 mysql host 0 0
mysql user 0 0
call proc_1(); call proc_1();
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
select Host, User from mysql.user limit 0; select Host, User from mysql.user limit 0;
Host User Host User
select Host, Db from mysql.host limit 0; select Host, Db from mysql.host limit 0;
Host Db Host Db
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql user 0 0
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
mysql host 0 0 mysql host 0 0
mysql user 0 0
flush tables; flush tables;
create function func_1() returns int begin flush tables; return 1; end| create function func_1() returns int begin flush tables; return 1; end|
ERROR 0A000: FLUSH is not allowed in stored function or trigger ERROR 0A000: FLUSH is not allowed in stored function or trigger
...@@ -1600,49 +1608,56 @@ select Host, Db from mysql.host limit 0; ...@@ -1600,49 +1608,56 @@ select Host, Db from mysql.host limit 0;
Host Db Host Db
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql user 0 0
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
mysql host 0 0 mysql host 0 0
mysql user 0 0
prepare abc from "flush tables"; prepare abc from "flush tables";
execute abc; execute abc;
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
select Host, User from mysql.user limit 0; select Host, User from mysql.user limit 0;
Host User Host User
select Host, Db from mysql.host limit 0; select Host, Db from mysql.host limit 0;
Host Db Host Db
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql user 0 0
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
mysql host 0 0 mysql host 0 0
mysql user 0 0
execute abc; execute abc;
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
select Host, User from mysql.user limit 0; select Host, User from mysql.user limit 0;
Host User Host User
select Host, Db from mysql.host limit 0; select Host, Db from mysql.host limit 0;
Host Db Host Db
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql user 0 0
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
mysql host 0 0 mysql host 0 0
mysql user 0 0
execute abc; execute abc;
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
select Host, User from mysql.user limit 0; select Host, User from mysql.user limit 0;
Host User Host User
select Host, Db from mysql.host limit 0; select Host, Db from mysql.host limit 0;
Host Db Host Db
show open tables from mysql; show open tables from mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql user 0 0
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
mysql host 0 0 mysql host 0 0
mysql user 0 0
flush tables; flush tables;
deallocate prepare abc; deallocate prepare abc;
create procedure proc_1() flush logs; create procedure proc_1() flush logs;
......
mysql-test/r/show_check.result
View file @ c055efba
...@@ -148,12 +148,14 @@ flush tables; ...@@ -148,12 +148,14 @@ flush tables;
show open tables; show open tables;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
create table t1(n int); create table t1(n int);
insert into t1 values (1); insert into t1 values (1);
show open tables; show open tables;
Database Table In_use Name_locked Database Table In_use Name_locked
test t1 0 0
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
test t1 0 0
drop table t1; drop table t1;
create table t1 (a int not null, b VARCHAR(10), INDEX (b) ) AVG_ROW_LENGTH=10 CHECKSUM=1 COMMENT="test" ENGINE=MYISAM MIN_ROWS=10 MAX_ROWS=100 PACK_KEYS=1 DELAY_KEY_WRITE=1 ROW_FORMAT=fixed; create table t1 (a int not null, b VARCHAR(10), INDEX (b) ) AVG_ROW_LENGTH=10 CHECKSUM=1 COMMENT="test" ENGINE=MYISAM MIN_ROWS=10 MAX_ROWS=100 PACK_KEYS=1 DELAY_KEY_WRITE=1 ROW_FORMAT=fixed;
show create table t1; show create table t1;
...@@ -566,21 +568,23 @@ SELECT 1 FROM mysql.db, mysql.proc, mysql.user, mysql.time_zone, mysql.time_zone ...@@ -566,21 +568,23 @@ SELECT 1 FROM mysql.db, mysql.proc, mysql.user, mysql.time_zone, mysql.time_zone
1 1
SHOW OPEN TABLES; SHOW OPEN TABLES;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql db 0 0 mysql proc 0 0
test urkunde 0 0 test urkunde 0 0
mysql time_zone 0 0 mysql time_zone 0 0
mysql general_log 1 0 mysql db 0 0
test txt1 0 0 test txt1 0 0
mysql proc 0 0 mysql slow_log 1 0
test tyt2 0 0 test tyt2 0 0
mysql general_log 1 0
mysql user 0 0 mysql user 0 0
mysql time_zone_name 0 0 mysql time_zone_name 0 0
SHOW OPEN TABLES FROM mysql; SHOW OPEN TABLES FROM mysql;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql db 0 0 mysql proc 0 0
mysql time_zone 0 0 mysql time_zone 0 0
mysql db 0 0
mysql slow_log 1 0
mysql general_log 1 0 mysql general_log 1 0
mysql proc 0 0
mysql user 0 0 mysql user 0 0
mysql time_zone_name 0 0 mysql time_zone_name 0 0
SHOW OPEN TABLES FROM mysql LIKE 'u%'; SHOW OPEN TABLES FROM mysql LIKE 'u%';
...@@ -594,14 +598,16 @@ test tyt2 0 0 ...@@ -594,14 +598,16 @@ test tyt2 0 0
mysql time_zone_name 0 0 mysql time_zone_name 0 0
SHOW OPEN TABLES LIKE '%o%'; SHOW OPEN TABLES LIKE '%o%';
Database Table In_use Name_locked Database Table In_use Name_locked
mysql proc 0 0
mysql time_zone 0 0 mysql time_zone 0 0
mysql slow_log 1 0
mysql general_log 1 0 mysql general_log 1 0
mysql proc 0 0
mysql time_zone_name 0 0 mysql time_zone_name 0 0
FLUSH TABLES; FLUSH TABLES;
SHOW OPEN TABLES; SHOW OPEN TABLES;
Database Table In_use Name_locked Database Table In_use Name_locked
mysql general_log 1 0 mysql general_log 1 0
mysql slow_log 1 0
DROP TABLE txt1; DROP TABLE txt1;
DROP TABLE tyt2; DROP TABLE tyt2;
DROP TABLE urkunde; DROP TABLE urkunde;
...@@ -680,14 +686,14 @@ show tables; ...@@ -680,14 +686,14 @@ show tables;
Tables_in_test Tables_in_test
show status like 'slow_queries'; show status like 'slow_queries';
Variable_name Value Variable_name Value
Slow_queries 0 Slow_queries 1
select 1 from information_schema.tables limit 1; select 1 from information_schema.tables limit 1;
1 1
1 1
show status like 'slow_queries'; show status like 'slow_queries';
Variable_name Value Variable_name Value
Slow_queries 1 Slow_queries 2
End of 5.0 tests End of 5.0 tests.
SHOW AUTHORS; SHOW AUTHORS;
create database mysqltest; create database mysqltest;
show create database mysqltest; show create database mysqltest;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7