database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Post-merge fix. Update some test results, and add an InnoDB-only

Browse Source 
compatibility hook, thd_mark_transaction_to_rollback().
This commit is contained in:
tsmith@ramayana.hindu.god
2007-08-02 02:22:31 -06:00
parent b13de9343f
commit 0f6f44424f
5 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mysql-test/r/ps.result
View File

@ -1857,10 +1857,9 @@ select Host, Db from mysql.host limit 0;
Host Db
show open tables from mysql;
Database Table In_use Name_locked
mysql general_log 0 0
mysql slow_log 0 0
mysql host 0 0
mysql user 0 0
mysql general_log 0 0
mysql host 0 0
call proc_1();
show open tables from mysql;
Database Table In_use Name_locked
@ -1871,10 +1870,9 @@ select Host, Db from mysql.host limit 0;
Host Db
show open tables from mysql;
Database Table In_use Name_locked
mysql general_log 0 0
mysql slow_log 0 0
mysql host 0 0
mysql user 0 0
mysql general_log 0 0
mysql host 0 0
call proc_1();
show open tables from mysql;
Database Table In_use Name_locked
@ -1885,10 +1883,9 @@ select Host, Db from mysql.host limit 0;
Host Db
show open tables from mysql;
Database Table In_use Name_locked
mysql general_log 0 0
mysql slow_log 0 0
mysql host 0 0
mysql user 0 0
mysql general_log 0 0
mysql host 0 0
call proc_1();
show open tables from mysql;
Database Table In_use Name_locked
@ -1899,10 +1896,9 @@ select Host, Db from mysql.host limit 0;
Host Db
show open tables from mysql;
Database Table In_use Name_locked
mysql general_log 0 0
mysql slow_log 0 0
mysql host 0 0
mysql user 0 0
mysql general_log 0 0
mysql host 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
@ -1932,10 +1928,9 @@ select Host, Db from mysql.host limit 0;
Host Db
show open tables from mysql;
Database Table In_use Name_locked
mysql general_log 0 0
mysql slow_log 0 0
mysql host 0 0
mysql user 0 0
mysql general_log 0 0
mysql host 0 0
execute abc;
show open tables from mysql;
Database Table In_use Name_locked
@ -1946,10 +1941,9 @@ select Host, Db from mysql.host limit 0;
Host Db
show open tables from mysql;
Database Table In_use Name_locked
mysql general_log 0 0
mysql slow_log 0 0
mysql host 0 0
mysql user 0 0
mysql general_log 0 0
mysql host 0 0
execute abc;
show open tables from mysql;
Database Table In_use Name_locked
@ -1960,10 +1954,9 @@ select Host, Db from mysql.host limit 0;
Host Db
show open tables from mysql;
Database Table In_use Name_locked
mysql general_log 0 0
mysql slow_log 0 0
mysql host 0 0
mysql user 0 0
mysql general_log 0 0
mysql host 0 0
flush tables;
deallocate prepare abc;
create procedure proc_1() flush logs;

7
mysql-test/r/show_check.result
View File

@ -256,9 +256,8 @@ create table t1(n int);
insert into t1 values (1);
show open tables;
Database Table In_use Name_locked
mysql general_log 0 0
mysql slow_log 0 0
test t1 0 0
mysql general_log 0 0
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;
show create table t1;
@ -685,9 +684,8 @@ Database Table In_use Name_locked
mysql db 0 0
mysql time_zone 0 0
mysql general_log 0 0
mysql slow_log 0 0
mysql user 0 0
mysql proc 0 0
mysql user 0 0
mysql time_zone_name 0 0
SHOW OPEN TABLES FROM mysql LIKE 'u%';
Database Table In_use Name_locked
@ -702,7 +700,6 @@ SHOW OPEN TABLES LIKE '%o%';
Database Table In_use Name_locked
mysql time_zone 0 0
mysql general_log 0 0
mysql slow_log 0 0
mysql proc 0 0
mysql time_zone_name 0 0
FLUSH TABLES;