From c65479d02c1a93b1b06a2fdda4b5c2f88f3f63be Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 13 Jul 2006 17:34:49 +0400 Subject: Post-merge fixes. mysql-test/r/federated.result: A post-merge fix. mysql-test/r/show_check.result: A post-merge fix. sql/log_event.cc: Remove rewrite_db (it's refactored in 5.1 to rpl_filter) sql/share/errmsg.txt: Move ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA to the end of the list. This breaks compatibility of errmsg.sys with 5.0 but preserves compatibility with 5.1.11. sql/sql_class.h: A post-merge fix. --- mysql-test/r/federated.result | 1 - 1 file changed, 1 deletion(-) (limited to 'mysql-test/r/federated.result') diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result index b59274ed4e7..1b9d02a64d0 100644 --- a/mysql-test/r/federated.result +++ b/mysql-test/r/federated.result @@ -1603,7 +1603,6 @@ fld_cid fld_name fld_parentid fld_delt 5 Torkel 0 0 DROP TABLE federated.t1; DROP TABLE federated.bug_17377_table; -DROP TABLE federated.t1; drop table if exists federated.t1; create table federated.t1 (a int, b int, c int); drop table if exists federated.t1; -- cgit v1.2.1