bk commit into 5.0 tree (kaa:1.2596)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.0 repository of kaa.  When kaa does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-12 12:13:41+03:00, kaa@kaamos.(none) +1 -0
  Re-enabled the test for mysql_insert_id() after merging from main.

  tests/mysql_client_test.c@stripped, 2008-03-12 12:13:40+03:00, kaa@kaamos.(none) +1 -7
    Re-enabled the test for mysql_insert_id() after merging from main.

diff -Nrup a/tests/mysql_client_test.c b/tests/mysql_client_test.c
--- a/tests/mysql_client_test.c	2008-03-12 10:54:55 +03:00
+++ b/tests/mysql_client_test.c	2008-03-12 12:13:40 +03:00
@@ -15214,11 +15214,6 @@ 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;
@@ -15410,7 +15405,6 @@ static void test_mysql_insert_id()
   rc= mysql_query(mysql, "drop table t1,t2");
   myquery(rc);
 }
-#endif
 
 
 /*
@@ -16548,7 +16542,7 @@ static struct my_tests_st my_tests[]= {
   { "test_bug17667", test_bug17667 },
   { "test_bug19671", test_bug19671 },
   { "test_bug15752", test_bug15752 },
-  /* { "test_mysql_insert_id", test_mysql_insert_id }, Bug#34889 */
+  { "test_mysql_insert_id", test_mysql_insert_id },
   { "test_bug21206", test_bug21206 },
   { "test_bug21726", test_bug21726 },
   { "test_bug15518", test_bug15518 },