mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime
This commit is contained in:
@ -13686,7 +13686,8 @@ static void test_bug11172()
|
||||
hired.year, hired.month, hired.day);
|
||||
}
|
||||
DIE_UNLESS(rc == MYSQL_NO_DATA);
|
||||
mysql_stmt_free_result(stmt) || mysql_stmt_reset(stmt);
|
||||
if (!mysql_stmt_free_result(stmt))
|
||||
mysql_stmt_reset(stmt);
|
||||
}
|
||||
mysql_stmt_close(stmt);
|
||||
mysql_rollback(mysql);
|
||||
@ -14828,6 +14829,8 @@ static void test_opt_reconnect()
|
||||
}
|
||||
|
||||
|
||||
#ifndef EMBEDDED_LIBRARY
|
||||
|
||||
static void test_bug12744()
|
||||
{
|
||||
MYSQL_STMT *prep_stmt = NULL;
|
||||
@ -14859,6 +14862,8 @@ static void test_bug12744()
|
||||
client_connect(0);
|
||||
}
|
||||
|
||||
#endif /* EMBEDDED_LIBRARY */
|
||||
|
||||
/* Bug #16143: mysql_stmt_sqlstate returns an empty string instead of '00000' */
|
||||
|
||||
static void test_bug16143()
|
||||
|
Reference in New Issue
Block a user