1
0
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.1-marvel

into  mysql.com:/home/my/mysql-5.1
This commit is contained in:
monty@nosik.monty.fi
2006-11-27 14:07:52 +02:00
306 changed files with 2190 additions and 1728 deletions

View File

@ -13695,7 +13695,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);
@ -14837,6 +14838,8 @@ static void test_opt_reconnect()
}
#ifndef EMBEDDED_LIBRARY
static void test_bug12744()
{
MYSQL_STMT *prep_stmt = NULL;
@ -14868,6 +14871,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()