database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Additional fix for the bug#27590.

Browse Source 
tests/mysql_client_test.c:
  Fixed failing build on the windows platform.
mysql-test/r/ps_7ndb.result:
  The result of the adjusted test case after fix for bug#27590.
mysql-test/r/ps_6bdb.result:
  The result of the adjusted test case after fix for bug#27590.
sql/item_cmpfunc.cc:
  A warning is fixed.
This commit is contained in:
unknown
2007-04-28 00:04:50 +04:00
parent 17fbe3b209
commit 51d19e3242
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/ps_6bdb.result
View File

@@ -3053,7 +3053,7 @@ found
true true
set @arg00= CAST('1991-01-01 01:01:01' as datetime) ; set @arg00= CAST('1991-01-01 01:01:01' as datetime) ;
select 'true' as found from t9 select 'true' as found from t9
where c1= 20 and c13= CAST('1991-01-01 01:01:01' as datetime) and where c1= 20 and c13= CAST('1991-01-01 00:00:00' as datetime) and
c14= CAST('1991-01-01 01:01:01' as datetime) and c14= CAST('1991-01-01 01:01:01' as datetime) and
c15= CAST('1991-01-01 01:01:01' as datetime) and c15= CAST('1991-01-01 01:01:01' as datetime) and
c16= CAST('1991-01-01 01:01:01' as datetime) and c16= CAST('1991-01-01 01:01:01' as datetime) and
@@ -3066,7 +3066,7 @@ and c17= @arg00 ;
found found
true true
prepare stmt1 from "select 'true' as found from t9 prepare stmt1 from "select 'true' as found from t9
where c1= 20 and c13= CAST('1991-01-01 01:01:01' as datetime) and where c1= 20 and c13= CAST('1991-01-01 00:00:00' as datetime) and
c14= CAST('1991-01-01 01:01:01' as datetime) and c14= CAST('1991-01-01 01:01:01' as datetime) and
c15= CAST('1991-01-01 01:01:01' as datetime) and c15= CAST('1991-01-01 01:01:01' as datetime) and
c16= CAST('1991-01-01 01:01:01' as datetime) and c16= CAST('1991-01-01 01:01:01' as datetime) and

4
mysql-test/r/ps_7ndb.result
View File

@@ -3053,7 +3053,7 @@ found
true true
set @arg00= CAST('1991-01-01 01:01:01' as datetime) ; set @arg00= CAST('1991-01-01 01:01:01' as datetime) ;
select 'true' as found from t9 select 'true' as found from t9
where c1= 20 and c13= CAST('1991-01-01 01:01:01' as datetime) and where c1= 20 and c13= CAST('1991-01-01 00:00:00' as datetime) and
c14= CAST('1991-01-01 01:01:01' as datetime) and c14= CAST('1991-01-01 01:01:01' as datetime) and
c15= CAST('1991-01-01 01:01:01' as datetime) and c15= CAST('1991-01-01 01:01:01' as datetime) and
c16= CAST('1991-01-01 01:01:01' as datetime) and c16= CAST('1991-01-01 01:01:01' as datetime) and
@@ -3066,7 +3066,7 @@ and c17= @arg00 ;
found found
true true
prepare stmt1 from "select 'true' as found from t9 prepare stmt1 from "select 'true' as found from t9
where c1= 20 and c13= CAST('1991-01-01 01:01:01' as datetime) and where c1= 20 and c13= CAST('1991-01-01 00:00:00' as datetime) and
c14= CAST('1991-01-01 01:01:01' as datetime) and c14= CAST('1991-01-01 01:01:01' as datetime) and
c15= CAST('1991-01-01 01:01:01' as datetime) and c15= CAST('1991-01-01 01:01:01' as datetime) and
c16= CAST('1991-01-01 01:01:01' as datetime) and c16= CAST('1991-01-01 01:01:01' as datetime) and

4
sql/item_cmpfunc.cc
View File

@@ -544,7 +544,7 @@ static ulonglong
get_date_from_str(THD *thd, String *str, timestamp_type warn_type, get_date_from_str(THD *thd, String *str, timestamp_type warn_type,
char *warn_name, bool *error_arg) char *warn_name, bool *error_arg)
{ {
ulonglong value; ulonglong value= 0;
int error; int error;
MYSQL_TIME l_time; MYSQL_TIME l_time;
enum_mysql_timestamp_type ret; enum_mysql_timestamp_type ret;
@@ -748,7 +748,7 @@ static ulonglong
get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg, get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
Item *warn_item, bool *is_null) Item *warn_item, bool *is_null)
{ {
ulonglong value; ulonglong value= 0;
String buf, *str= 0; String buf, *str= 0;
Item *item= **item_arg; Item *item= **item_arg;

8
tests/mysql_client_test.c
View File

@@ -8785,7 +8785,9 @@ static void test_ts()
int rc, field_count; int rc, field_count;
char name; char name;
char query[MAX_TEST_QUERY_LENGTH]; 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"); myheader("test_ts");
rc= mysql_query(mysql, "DROP TABLE IF EXISTS test_ts"); rc= mysql_query(mysql, "DROP TABLE IF EXISTS test_ts");
@@ -8852,9 +8854,7 @@ static void test_ts()
mysql_free_result(prep_res); mysql_free_result(prep_res);
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
char queries [3][60]= {"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)"};
for (name= 'a'; field_count--; name++) for (name= 'a'; field_count--; name++)
{ {
int row_count= 0; int row_count= 0;