diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-16 07:45:07 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-16 07:45:07 -0200 |
| commit | 0d0b3f8aca8afd10268b1305e94b87f17f07d3b2 (patch) | |
| tree | 8bb3c24e83c5645c346086318667a4d0cdb7b6a2 /tests | |
| parent | d6d16303cd5e2ba623f51a115f12954fe4a0ce2c (diff) | |
| parent | cd1c6e220de1730615c145b5337f7cce554dfdae (diff) | |
| download | mariadb-git-0d0b3f8aca8afd10268b1305e94b87f17f07d3b2.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
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 5ddf428602b..2030e128c04 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; |