diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-17 17:42:28 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-17 17:42:28 +0100 |
| commit | b23c19e82f4762aff7ddc32c3e61379908d16f4f (patch) | |
| tree | 762cc277bfc28d7e965b69131fc67ef23d9775d8 /tests | |
| parent | ed928b14be3689926b11c5482ce76cd5d3537163 (diff) | |
| parent | 0654c94ca231a7817369056697ed13e9a2ad5b87 (diff) | |
| download | mariadb-git-b23c19e82f4762aff7ddc32c3e61379908d16f4f.tar.gz | |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index c7dec17e231..327c3b5cad0 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -1199,7 +1199,7 @@ my_bool fetch_n(const char **query_list, unsigned query_count, /* Separate thread query to test some cases */ -static my_bool thread_query(char *query) +static my_bool thread_query(const char *query) { MYSQL *l_mysql; my_bool error; @@ -1221,7 +1221,7 @@ static my_bool thread_query(char *query) goto end; } l_mysql->reconnect= 1; - if (mysql_query(l_mysql, (char *)query)) + if (mysql_query(l_mysql, query)) { fprintf(stderr, "Query failed (%s)\n", mysql_error(l_mysql)); error= 1; @@ -6447,7 +6447,7 @@ static void test_prepare_alter() rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); - if (thread_query((char *)"ALTER TABLE test_prep_alter change id id_new varchar(20)")) + if (thread_query("ALTER TABLE test_prep_alter change id id_new varchar(20)")) exit(1); is_null= 1; |