diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-20 16:03:21 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-20 16:03:21 +0500 |
| commit | c988ef942fed9688fd2bd126af1e6946bbdd531d (patch) | |
| tree | df0880f79e51a963ad55111419b36b55fea5d813 /tests | |
| parent | b53e47a1ec183896994b5dbbae5e27129fce6981 (diff) | |
| parent | ea7aa193960d42c0bdbc011ba3714ceebc6f189c (diff) | |
| download | mariadb-git-c988ef942fed9688fd2bd126af1e6946bbdd531d.tar.gz | |
Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.19983
libmysqld/lib_sql.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 94034141d81..7a87fc78ea5 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -12125,7 +12125,9 @@ static struct my_tests_st my_tests[]= { { "test_bug8378", test_bug8378 }, { "test_bug9735", test_bug9735 }, { "test_bug11183", test_bug11183 }, +#ifndef EMBEDDED_LIBRARY { "test_bug12744", test_bug12744 }, +#endif { "test_bug12001", test_bug12001 }, { "test_bug11718", test_bug11718 }, { "test_bug12925", test_bug12925 }, |