Merge kaamos.(none):/data/src/opt/bug34889/my50

into  kaamos.(none):/data/src/opt/bug34889/my51


sql/sql_insert.cc:
  Null merge.
tests/mysql_client_test.c:
  Manual merge.
This commit is contained in:
unknown 2008-03-08 11:21:11 +03:00
commit 92e0fbbe84

View file

@ -15550,6 +15550,22 @@ static void test_mysql_insert_id()
myquery(rc);
res= mysql_insert_id(mysql);
DIE_UNLESS(res == 0);
/*
Test for bug #34889: mysql_client_test::test_mysql_insert_id test fails
sporadically
*/
rc= mysql_query(mysql, "create table t2 (f1 int not null primary key auto_increment, f2 varchar(255))");
myquery(rc);
rc= mysql_query(mysql, "insert into t2 values (null,'b')");
myquery(rc);
rc= mysql_query(mysql, "insert into t1 select 5,'c'");
myquery(rc);
res= mysql_insert_id(mysql);
DIE_UNLESS(res == 0);
rc= mysql_query(mysql, "drop table t2");
myquery(rc);
rc= mysql_query(mysql, "insert into t1 select null,'d'");
myquery(rc);
res= mysql_insert_id(mysql);