mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge

Browse source
This commit is contained in:
Vladislav Vaintroub 2009-11-25 15:20:14 +01:00
commit 68cfabcc10
162 changed files with 1608 additions and 1372 deletions
Download patch file Download diff file Expand all files Collapse all files

45
tests/mysql_client_test.c
View file

@ -18392,9 +18392,51 @@ static void test_wl4166_4()
}
/**
Bug#38486 Crash when using cursor protocol
Bug#36004 mysql_stmt_prepare resets the list of warnings
*/
static void test_bug36004()
{
int rc, warning_count= 0;
MYSQL_STMT *stmt;
DBUG_ENTER("test_bug36004");
myheader("test_bug36004");
rc= mysql_query(mysql, "drop table if exists inexistant");
myquery(rc);
DIE_UNLESS(mysql_warning_count(mysql) == 1);
query_int_variable(mysql, "@@warning_count", &warning_count);
DIE_UNLESS(warning_count);
stmt= mysql_simple_prepare(mysql, "select 1");
check_stmt(stmt);
DIE_UNLESS(mysql_warning_count(mysql) == 0);
query_int_variable(mysql, "@@warning_count", &warning_count);
DIE_UNLESS(warning_count);
rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc);
DIE_UNLESS(mysql_warning_count(mysql) == 0);
mysql_stmt_close(stmt);
query_int_variable(mysql, "@@warning_count", &warning_count);
DIE_UNLESS(warning_count);
stmt= mysql_simple_prepare(mysql, "drop table if exists inexistant");
check_stmt(stmt);
query_int_variable(mysql, "@@warning_count", &warning_count);
DIE_UNLESS(warning_count == 0);
mysql_stmt_close(stmt);
DBUG_VOID_RETURN;
}
static void test_bug38486(void)
{
MYSQL_STMT *stmt;
@ -19154,6 +19196,7 @@ static struct my_tests_st my_tests[]= {
{ "test_wl4166_2", test_wl4166_2 },
{ "test_wl4166_3", test_wl4166_3 },
{ "test_wl4166_4", test_wl4166_4 },
{ "test_bug36004", test_bug36004 },
{ "test_wl4435", test_wl4435 },
{ "test_wl4435_2", test_wl4435_2 },
{ "test_bug38486", test_bug38486 },

2
tests/thread_test.c
View file

@ -77,7 +77,7 @@ end:
mysql_close(mysql);
pthread_mutex_lock(&LOCK_thread_count);
thread_count--;
VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */
pthread_cond_signal(&COND_thread_count); /* Tell main we are ready */
pthread_mutex_unlock(&LOCK_thread_count);
pthread_exit(0);
return 0;