diff options
| author | unknown <kostja@bodhi.local> | 2006-11-29 11:44:37 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-11-29 11:44:37 +0300 |
| commit | 0e978328ae3055a55f9e21cc7b395cf2581925b9 (patch) | |
| tree | f6410b9231112e66043c0eb7edc1b33fbff6e760 /tests/mysql_client_test.c.rej | |
| parent | 0534b679b70d34db1a9ff3d5ae0c6dd39560636f (diff) | |
| parent | fe99bda872fd51b07e1ebb0dc506e26d195edec7 (diff) | |
| download | mariadb-git-0e978328ae3055a55f9e21cc7b395cf2581925b9.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
libmysql/libmysql.c:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
server-tools/instance-manager/mysql_connection.cc:
Rollback Monty's removals of explicit casts
tests/mysql_client_test.c:
SCCS merged
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 } + }; + |