diff options
| author | jani@ua141d10.elisa.omakaista.fi <> | 2006-10-17 19:54:44 +0300 |
|---|---|---|
| committer | jani@ua141d10.elisa.omakaista.fi <> | 2006-10-17 19:54:44 +0300 |
| commit | 8dd0b2d0ae23519daebd55219e73a7bf8bca7928 (patch) | |
| tree | a8bc649b4ac9032ab7c5d55fda0c7d3f09be6e91 /tests/mysql_client_test.c.rej | |
| parent | e6be42e1c97bcb29c0c0ab5cc58185ee4293f86b (diff) | |
| parent | 02f29377fdcecd29c7af13557dd078a25ae20305 (diff) | |
| download | mariadb-git-8dd0b2d0ae23519daebd55219e73a7bf8bca7928.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string
Diffstat (limited to 'tests/mysql_client_test.c.rej')
| -rw-r--r-- | tests/mysql_client_test.c.rej | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/mysql_client_test.c.rej b/tests/mysql_client_test.c.rej new file mode 100644 index 00000000000..400ffee8a5e --- /dev/null +++ b/tests/mysql_client_test.c.rej @@ -0,0 +1,20 @@ +*************** +*** 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 } + }; + |