mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
This commit is contained in:
kostja@bodhi.local
@ -50,7 +50,6 @@ static unsigned int opt_port;
|
||||
static my_bool tty_password= 0, opt_silent= 0;
|
||||
|
||||
static MYSQL *mysql= 0;
|
||||
static char query[MAX_TEST_QUERY_LENGTH];
|
||||
static char current_db[]= "client_test_db";
|
||||
static unsigned int test_count= 0;
|
||||
static unsigned int opt_count= 0;
|
||||
@ -270,6 +269,7 @@ mysql_simple_prepare(MYSQL *mysql, const char *query)
|
||||
static void client_connect(ulong flag)
|
||||
{
|
||||
int rc;
|
||||
static char query[MAX_TEST_QUERY_LENGTH];
|
||||
myheader_r("client_connect");
|
||||
|
||||
if (!opt_silent)
|
||||
@ -327,6 +327,8 @@ static void client_connect(ulong flag)
|
||||
|
||||
static void client_disconnect()
|
||||
{
|
||||
static char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader_r("client_disconnect");
|
||||
|
||||
if (mysql)
|
||||
@ -658,6 +660,7 @@ int my_stmt_result(const char *buff)
|
||||
static void verify_col_data(const char *table, const char *col,
|
||||
const char *exp_data)
|
||||
{
|
||||
static char query[MAX_TEST_QUERY_LENGTH];
|
||||
MYSQL_RES *result;
|
||||
MYSQL_ROW row;
|
||||
int rc, field= 1;
|
||||
@ -1363,6 +1366,7 @@ static void test_prepare_insert_update()
|
||||
|
||||
for (cur_query= testcase; *cur_query; cur_query++)
|
||||
{
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
printf("\nRunning query: %s", *cur_query);
|
||||
strmov(query, *cur_query);
|
||||
stmt= mysql_simple_prepare(mysql, query);
|
||||
@ -1397,6 +1401,7 @@ static void test_prepare_simple()
|
||||
{
|
||||
MYSQL_STMT *stmt;
|
||||
int rc;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_prepare_simple");
|
||||
|
||||
@ -1467,6 +1472,7 @@ static void test_prepare_field_result()
|
||||
MYSQL_STMT *stmt;
|
||||
MYSQL_RES *result;
|
||||
int rc;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_prepare_field_result");
|
||||
|
||||
@ -1518,6 +1524,7 @@ static void test_prepare_syntax()
|
||||
{
|
||||
MYSQL_STMT *stmt;
|
||||
int rc;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_prepare_syntax");
|
||||
|
||||
@ -1559,6 +1566,7 @@ static void test_prepare()
|
||||
my_bool is_null[7];
|
||||
char llbuf[22];
|
||||
MYSQL_BIND bind[7];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_prepare");
|
||||
|
||||
@ -1732,6 +1740,7 @@ static void test_double_compare()
|
||||
MYSQL_RES *result;
|
||||
MYSQL_BIND bind[3];
|
||||
ulong length[3];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_double_compare");
|
||||
|
||||
@ -1814,6 +1823,7 @@ static void test_null()
|
||||
uint nData;
|
||||
MYSQL_BIND bind[2];
|
||||
my_bool is_null[2];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_null");
|
||||
|
||||
@ -1960,6 +1970,7 @@ static void test_ps_null_param()
|
||||
/* Execute several queries, all returning NULL in result. */
|
||||
for(cur_query= queries; *cur_query; cur_query++)
|
||||
{
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
strmov(query, *cur_query);
|
||||
stmt= mysql_simple_prepare(mysql, query);
|
||||
check_stmt(stmt);
|
||||
@ -1991,6 +2002,7 @@ static void test_fetch_null()
|
||||
MYSQL_BIND bind[11];
|
||||
ulong length[11];
|
||||
my_bool is_null[11];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_fetch_null");
|
||||
|
||||
@ -2219,6 +2231,7 @@ static void test_select()
|
||||
int nData= 1;
|
||||
MYSQL_BIND bind[2];
|
||||
ulong length[2];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_select");
|
||||
|
||||
@ -2290,6 +2303,7 @@ static void test_ps_conj_select()
|
||||
int32 int_data;
|
||||
char str_data[32];
|
||||
unsigned long str_length;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
myheader("test_ps_conj_select");
|
||||
|
||||
rc= mysql_query(mysql, "drop table if exists t1");
|
||||
@ -2347,6 +2361,7 @@ static void test_bug1115()
|
||||
MYSQL_BIND bind[1];
|
||||
ulong length[1];
|
||||
char szData[11];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_bug1115");
|
||||
|
||||
@ -2458,6 +2473,7 @@ static void test_bug1180()
|
||||
MYSQL_BIND bind[1];
|
||||
ulong length[1];
|
||||
char szData[11];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_select_bug");
|
||||
|
||||
@ -2548,6 +2564,7 @@ static void test_bug1644()
|
||||
int num;
|
||||
my_bool isnull;
|
||||
int rc, i;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_bug1644");
|
||||
|
||||
@ -2647,6 +2664,7 @@ static void test_select_show()
|
||||
{
|
||||
MYSQL_STMT *stmt;
|
||||
int rc;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_select_show");
|
||||
|
||||
@ -2715,6 +2733,7 @@ static void test_simple_update()
|
||||
MYSQL_RES *result;
|
||||
MYSQL_BIND bind[2];
|
||||
ulong length[2];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_simple_update");
|
||||
|
||||
@ -2792,6 +2811,7 @@ static void test_long_data()
|
||||
char *data= NullS;
|
||||
MYSQL_RES *result;
|
||||
MYSQL_BIND bind[3];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_long_data");
|
||||
|
||||
@ -2878,6 +2898,7 @@ static void test_long_data_str()
|
||||
MYSQL_RES *result;
|
||||
MYSQL_BIND bind[2];
|
||||
my_bool is_null[2];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_long_data_str");
|
||||
|
||||
@ -2970,6 +2991,7 @@ static void test_long_data_str1()
|
||||
MYSQL_RES *result;
|
||||
MYSQL_BIND bind[2];
|
||||
MYSQL_FIELD *field;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_long_data_str1");
|
||||
|
||||
@ -3125,6 +3147,7 @@ static void test_long_data_bin()
|
||||
long length;
|
||||
MYSQL_RES *result;
|
||||
MYSQL_BIND bind[2];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
|
||||
myheader("test_long_data_bin");
|
||||
@ -3204,6 +3227,7 @@ static void test_simple_delete()
|
||||
MYSQL_RES *result;
|
||||
MYSQL_BIND bind[2];
|
||||
ulong length[2];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_simple_delete");
|
||||
|
||||
@ -3286,6 +3310,7 @@ static void test_update()
|
||||
MYSQL_RES *result;
|
||||
MYSQL_BIND bind[2];
|
||||
ulong length[2];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_update");
|
||||
|
||||
@ -3382,6 +3407,7 @@ static void test_prepare_noparam()
|
||||
MYSQL_STMT *stmt;
|
||||
int rc;
|
||||
MYSQL_RES *result;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_prepare_noparam");
|
||||
|
||||
@ -4238,6 +4264,7 @@ static void test_prepare_ext()
|
||||
short sData= 10;
|
||||
longlong bData= 20;
|
||||
MYSQL_BIND bind[6];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
myheader("test_prepare_ext");
|
||||
|
||||
rc= mysql_query(mysql, "DROP TABLE IF EXISTS test_prepare_ext");
|
||||
@ -4625,6 +4652,7 @@ static void test_stmt_close()
|
||||
MYSQL_RES *result;
|
||||
unsigned int count;
|
||||
int rc;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_stmt_close");
|
||||
|
||||
@ -5271,6 +5299,7 @@ static void test_manual_sample()
|
||||
ulonglong affected_rows;
|
||||
MYSQL_BIND bind[3];
|
||||
my_bool is_null;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_manual_sample");
|
||||
|
||||
@ -5625,6 +5654,7 @@ static void test_prepare_multi_statements()
|
||||
{
|
||||
MYSQL *mysql_local;
|
||||
MYSQL_STMT *stmt;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
myheader("test_prepare_multi_statements");
|
||||
|
||||
if (!(mysql_local= mysql_init(NULL)))
|
||||
@ -5842,6 +5872,7 @@ static void test_store_result2()
|
||||
int nData;
|
||||
ulong length;
|
||||
MYSQL_BIND bind[1];
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_store_result2");
|
||||
|
||||
@ -7121,6 +7152,7 @@ static void test_set_option()
|
||||
static void test_prepare_grant()
|
||||
{
|
||||
int rc;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_prepare_grant");
|
||||
|
||||
@ -8593,6 +8625,7 @@ static void test_sqlmode()
|
||||
MYSQL_BIND bind[2];
|
||||
char c1[5], c2[5];
|
||||
int rc;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_sqlmode");
|
||||
|
||||
@ -8736,6 +8769,7 @@ static void test_ts()
|
||||
ulong length;
|
||||
int rc, field_count;
|
||||
char name;
|
||||
char query[MAX_TEST_QUERY_LENGTH];
|
||||
|
||||
myheader("test_ts");
|
||||
|
||||
@ -15228,6 +15262,65 @@ static void test_bug20152()
|
||||
}
|
||||
}
|
||||
|
||||
/* Bug#15752 "Lost connection to MySQL server when calling a SP from C API" */
|
||||
|
||||
static void test_bug15752()
|
||||
{
|
||||
MYSQL mysql_local;
|
||||
int rc, i;
|
||||
const int ITERATION_COUNT= 100;
|
||||
char *query= "CALL p1()";
|
||||
|
||||
myheader("test_bug15752");
|
||||
|
||||
rc= mysql_query(mysql, "drop procedure if exists p1");
|
||||
myquery(rc);
|
||||
rc= mysql_query(mysql, "create procedure p1() select 1");
|
||||
myquery(rc);
|
||||
|
||||
mysql_init(&mysql_local);
|
||||
if (! mysql_real_connect(&mysql_local, opt_host, opt_user,
|
||||
opt_password, current_db, opt_port,
|
||||
opt_unix_socket,
|
||||
CLIENT_MULTI_STATEMENTS|CLIENT_MULTI_RESULTS))
|
||||
{
|
||||
printf("Unable connect to MySQL server: %s\n", mysql_error(&mysql_local));
|
||||
DIE_UNLESS(0);
|
||||
}
|
||||
rc= mysql_real_query(&mysql_local, query, strlen(query));
|
||||
myquery(rc);
|
||||
mysql_free_result(mysql_store_result(&mysql_local));
|
||||
|
||||
rc= mysql_real_query(&mysql_local, query, strlen(query));
|
||||
DIE_UNLESS(rc && mysql_errno(&mysql_local) == CR_COMMANDS_OUT_OF_SYNC);
|
||||
|
||||
if (! opt_silent)
|
||||
printf("Got error (as expected): %s\n", mysql_error(&mysql_local));
|
||||
|
||||
/* Check some other commands too */
|
||||
|
||||
DIE_UNLESS(mysql_next_result(&mysql_local) == 0);
|
||||
mysql_free_result(mysql_store_result(&mysql_local));
|
||||
DIE_UNLESS(mysql_next_result(&mysql_local) == -1);
|
||||
|
||||
/* The second problem is not reproducible: add the test case */
|
||||
for (i = 0; i < ITERATION_COUNT; i++)
|
||||
{
|
||||
if (mysql_real_query(&mysql_local, query, strlen(query)))
|
||||
{
|
||||
printf("\ni=%d %s failed: %s\n", i, query, mysql_error(&mysql_local));
|
||||
break;
|
||||
}
|
||||
mysql_free_result(mysql_store_result(&mysql_local));
|
||||
DIE_UNLESS(mysql_next_result(&mysql_local) == 0);
|
||||
mysql_free_result(mysql_store_result(&mysql_local));
|
||||
DIE_UNLESS(mysql_next_result(&mysql_local) == -1);
|
||||
|
||||
}
|
||||
mysql_close(&mysql_local);
|
||||
rc= mysql_query(mysql, "drop procedure p1");
|
||||
myquery(rc);
|
||||
}
|
||||
|
||||
/*
|
||||
Bug#21206: memory corruption when too many cursors are opened at once
|
||||
@ -15544,6 +15637,7 @@ static struct my_tests_st my_tests[]= {
|
||||
{ "test_bug20152", test_bug20152 },
|
||||
{ "test_bug14169", test_bug14169 },
|
||||
{ "test_bug17667", test_bug17667 },
|
||||
{ "test_bug15752", test_bug15752 },
|
||||
{ "test_mysql_insert_id", test_mysql_insert_id },
|
||||
{ "test_bug19671", test_bug19671},
|
||||
{ "test_bug21206", test_bug21206},
|
||||
|
||||
Reference in New Issue
Block a user