diff options
| author | unknown <kostja@bodhi.(none)> | 2007-06-20 19:05:38 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-06-20 19:05:38 +0400 |
| commit | 5a945c3d8953a2893c6ef97449a867c0632c7426 (patch) | |
| tree | b92170caeca0bdf5f3d43d41e9f3aaee7dd72151 /tests | |
| parent | 3f03ff9579a5d9df0b5daacc31386bdc19b58fa5 (diff) | |
| parent | cb5f8fa50b3605f4d4e069330f2ede4eded60394 (diff) | |
| download | mariadb-git-5a945c3d8953a2893c6ef97449a867c0632c7426.tar.gz | |
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/t/ndb_index_ordered.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/t/greedy_optimizer.test:
Manual merge.
mysql-test/t/join.test:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 0fff1bb71b5..e9943e8dca8 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -16079,7 +16079,8 @@ static void test_bug24179() Bug#28075 "COM_DEBUG crashes mysqld" Note: Test disabled because of failure in PushBuild. */ -#ifdef fix_bug_in_pb_first +#ifdef FIX_BUG_IN_PB_FIRST + static void test_bug28075() { int rc; @@ -16089,7 +16090,7 @@ static void test_bug28075() rc= mysql_dump_debug_info(mysql); DIE_UNLESS(rc == 0); - + rc= mysql_ping(mysql); DIE_UNLESS(rc == 0); @@ -16101,6 +16102,7 @@ static void test_bug28075() /* Bug#27876 (SF with cyrillic variable name fails during execution (regression)) */ + static void test_bug27876() { int rc; @@ -16165,6 +16167,7 @@ static void test_bug27876() Bug#28505: mysql_affected_rows() returns wrong value if CLIENT_FOUND_ROWS flag is set. */ + static void test_bug28505() { my_ulonglong res; @@ -16554,7 +16557,7 @@ static struct my_tests_st my_tests[]= { { "test_status", test_status }, { "test_bug24179", test_bug24179 }, { "test_ps_query_cache", test_ps_query_cache }, -#ifdef fix_bug_in_pb_first +#ifdef FIX_BUG_IN_PB_FIRST { "test_bug28075", test_bug28075 }, #endif { "test_bug27876", test_bug27876 }, |