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().


mysql-test/r/ps.result:
  Post-merge fix.   Changes for WL 3984 (Revise locking
  of mysql.general_log and mysql.slow_log) cause some test
  result differences.
mysql-test/r/show_check.result:
  Post-merge fix.   Changes for WL 3984 (Revise locking
  of mysql.general_log and mysql.slow_log) cause some test
  result differences.
sql/sql_class.cc:
  Post-merge fix, add InnoDB compatibility hook (defined for
  InnoDB only), thd_mark_transaction_to_rollback().
storage/innobase/handler/ha_innodb.cc:
  Post-merge fix, add InnoDB compatibility hook (defined for
  InnoDB only), thd_mark_transaction_to_rollback().
storage/innobase/handler/ha_innodb.h:
  Post-merge fix, add InnoDB compatibility hook (defined for
  InnoDB only), thd_mark_transaction_to_rollback().
This commit is contained in:
unknown
2007-08-02 02:22:31 -06:00
parent 48eb7f8c85
commit c7419debba
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;