mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
990b106b63
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string BUILD/SETUP.sh: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/events.result: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/events.test: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/sql_parse.cc: remove_escape() function removed. Manual merge. sql/table.cc: Manually merged. Old line removed. tests/mysql_client_test.c: Manually merged. test_status position now last. sql/sql_parse.cc.rej: undefined sql/table.cc.rej: undefined tests/mysql_client_test.c.rej: undefined
20 lines
566 B
Text
20 lines
566 B
Text
***************
|
|
*** 15693,15700 ****
|
|
{ "test_bug17667", test_bug17667 },
|
|
{ "test_bug15752", test_bug15752 },
|
|
{ "test_mysql_insert_id", test_mysql_insert_id },
|
|
! { "test_bug19671", test_bug19671},
|
|
! { "test_bug21206", test_bug21206},
|
|
{ 0, 0 }
|
|
};
|
|
|
|
--- 15776,15784 ----
|
|
{ "test_bug17667", test_bug17667 },
|
|
{ "test_bug15752", test_bug15752 },
|
|
{ "test_mysql_insert_id", test_mysql_insert_id },
|
|
! { "test_bug19671", test_bug19671 },
|
|
! { "test_bug21206", test_bug21206 },
|
|
! { "test_bug21726", test_bug21726 },
|
|
{ 0, 0 }
|
|
};
|
|
|