merge from 5.1 main

2025-07-30 16:24:05 +03:00 · 2009-10-16 23:25:05 +02:00
parent 972e938dac edb40a05a1
commit 72c96cbd0e
400 changed files with 14941 additions and 3583 deletions
--- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql
@ -173,6 +173,7 @@ INSERT INTO global_suppressions VALUES
      this error message.
  */
 ("Can't find file: '.\\\\test\\\\\\?{8}.frm'"),
+ ("Slave: Unknown table 't1' Error_code: 1051"),

 ("THE_LAST_SUPPRESSION")||