summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorunknown <anozdrin/alik@quad.>2008-02-27 22:58:42 +0300
committerunknown <anozdrin/alik@quad.>2008-02-27 22:58:42 +0300
commitb3cc07838d46cd31dbaab1220161f60a6f69f95d (patch)
treefe45a8afe656725e2bf48eb509e30943ecd048dc /tests
parentda413e421730946eff1fe2b6ea4fe1eb391f644e (diff)
parentb43f8f695c152849f47b1a33e54ba0009144bc10 (diff)
downloadmariadb-git-b3cc07838d46cd31dbaab1220161f60a6f69f95d.tar.gz
Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-build tests/mysql_client_test.c: Manually merged.
Diffstat (limited to 'tests')
-rw-r--r--tests/mysql_client_test.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 188a051f874..d86de9a4179 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -15525,6 +15525,10 @@ static void test_bug14169()
Test that mysql_insert_id() behaves as documented in our manual
*/
+#if 0
+
+ Commented out because of Bug#34889.
+
static void test_mysql_insert_id()
{
my_ulonglong res;
@@ -15704,6 +15708,7 @@ static void test_mysql_insert_id()
rc= mysql_query(mysql, "drop table t1,t2");
myquery(rc);
}
+#endif
/*
Bug#20152: mysql_stmt_execute() writes to MYSQL_TYPE_DATE buffer
@@ -17691,7 +17696,7 @@ static struct my_tests_st my_tests[]= {
{ "test_bug14169", test_bug14169 },
{ "test_bug17667", test_bug17667 },
{ "test_bug15752", test_bug15752 },
- { "test_mysql_insert_id", test_mysql_insert_id },
+ /* { "test_mysql_insert_id", test_mysql_insert_id }, Bug#34889 */
{ "test_bug19671", test_bug19671 },
{ "test_bug21206", test_bug21206 },
{ "test_bug21726", test_bug21726 },