Merge kaamos.(none):/data/src/opt/mysql-5.0-opt

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Manual merge.

tests/mysql_client_test.c

@@ -15524,11 +15524,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;
@@ -15724,7 +15719,6 @@ 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
@@ -17712,7 +17706,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 }, Bug#34889 */
+  { "test_mysql_insert_id", test_mysql_insert_id },
   { "test_bug19671", test_bug19671 },
   { "test_bug21206", test_bug21206 },
   { "test_bug21726", test_bug21726 },