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.

1 files changed, 2 insertions, 9 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 6a8c901b2b3..0e8ef66bd4e 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1587,15 +1587,8 @@ public:
       memcpy(db, new_db, new_db_len+1);
     else
     {
-      /* Do not reallocate memory if current chunk is big enough. */
-      if (db && db_length >= new_db_len)
-        memcpy(db, new_db, new_db_len+1);
-      else
-      {
-        x_free(db);
-        db= new_db ? my_strndup(new_db, new_db_len, MYF(MY_WME)) : NULL;
-      }
-      db_length= db ? new_db_len: 0;
+      x_free(db);
+      db= new_db ? my_strndup(new_db, new_db_len, MYF(MY_WME)) : NULL;
     }
     db_length= db ? new_db_len : 0;
     return new_db && !db;