Commit 64818ead authored by andrey@lmy004's avatar andrey@lmy004

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into lmy004.:/work/mysql-5.1-new-clean
parents af43c2a4 7d0ca81d
...@@ -14708,8 +14708,7 @@ static void test_bug12744() ...@@ -14708,8 +14708,7 @@ static void test_bug12744()
rc= mysql_stmt_prepare(prep_stmt, "SELECT 1", 8); rc= mysql_stmt_prepare(prep_stmt, "SELECT 1", 8);
DIE_UNLESS(rc==0); DIE_UNLESS(rc==0);
rc= mysql_kill(mysql, mysql_thread_id(mysql)); mysql_close(mysql);
DIE_UNLESS(rc==0);
if (rc= mysql_stmt_execute(prep_stmt)) if (rc= mysql_stmt_execute(prep_stmt))
{ {
...@@ -14727,6 +14726,7 @@ static void test_bug12744() ...@@ -14727,6 +14726,7 @@ static void test_bug12744()
DIE_UNLESS(1==0); DIE_UNLESS(1==0);
} }
rc= mysql_stmt_close(prep_stmt); rc= mysql_stmt_close(prep_stmt);
client_connect(0);
} }
/* Bug #16144: mysql_stmt_attr_get type error */ /* Bug #16144: mysql_stmt_attr_get type error */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment