diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-29 18:42:50 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-29 18:42:50 +0500 |
| commit | d812bcb9551856e872a3232ebbe6a2cd8c376005 (patch) | |
| tree | cc7620ed1a2c650710f867868996b3131a503f1e /tests | |
| parent | 56c184503cdbcbbdca808b178bb0861c055c6d9c (diff) | |
| parent | 7eb77da33a7da7c56053164793012f1091048350 (diff) | |
| download | mariadb-git-d812bcb9551856e872a3232ebbe6a2cd8c376005.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
CMakeLists.txt:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/r/innodb_mysql.result:
merging
mysql-test/t/innodb_mysql.test:
merging
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index ae332edcdd8..38346ad0dbc 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -8785,7 +8785,9 @@ static void test_ts() int rc, field_count; char name; char query[MAX_TEST_QUERY_LENGTH]; - + const char *queries [3]= {"SELECT a, b, c FROM test_ts WHERE %c=?", + "SELECT a, b, c FROM test_ts WHERE %c=?", + "SELECT a, b, c FROM test_ts WHERE %c=CAST(? AS DATE)"}; myheader("test_ts"); rc= mysql_query(mysql, "DROP TABLE IF EXISTS test_ts"); @@ -8857,7 +8859,7 @@ static void test_ts() { int row_count= 0; - sprintf(query, "SELECT a, b, c FROM test_ts WHERE %c=?", name); + sprintf(query, queries[field_count], name); if (!opt_silent) fprintf(stdout, "\n %s", query); |