diff options
author | unknown <tsmith@ramayana.hindu.god> | 2007-08-02 02:22:31 -0600 |
---|---|---|
committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-02 02:22:31 -0600 |
commit | c7419debba007918f6317ccf844ae333031fcff5 (patch) | |
tree | 3c815f60241d30c32d0c3d887db177e83005e33a /cmd-line-utils | |
parent | 48eb7f8c857493ca7d30da4b78b279e4938f8c83 (diff) | |
download | mariadb-git-c7419debba007918f6317ccf844ae333031fcff5.tar.gz |
Post-merge fix. Update some test results, and add an InnoDB-only
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().
Diffstat (limited to 'cmd-line-utils')
0 files changed, 0 insertions, 0 deletions