1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge (update of local branch before push)

Browse Source
This commit is contained in:
Mattias Jonsson 2008-09-20 09:53:23 +03:00
commit 9fcdc6baea
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/compare.result
View File

@ -90,4 +90,9 @@ Note 1276 Field or reference 'test.t2.a' of SELECT #2 was resolved in SELECT #1
Note 1276 Field or reference 'test.t2.a' of SELECT #2 was resolved in SELECT #1 Note 1276 Field or reference 'test.t2.a' of SELECT #2 was resolved in SELECT #1
Note 1003 select `test`.`t2`.`a` AS `a`,(select count(0) AS `COUNT(*)` from `test`.`t1` where ((`test`.`t1`.`b` = `test`.`t2`.`a`) and (concat(`test`.`t1`.`b`,`test`.`t1`.`c`) = concat('0',`test`.`t2`.`a`,'01')))) AS `x` from `test`.`t2` order by `test`.`t2`.`a` Note 1003 select `test`.`t2`.`a` AS `a`,(select count(0) AS `COUNT(*)` from `test`.`t1` where ((`test`.`t1`.`b` = `test`.`t2`.`a`) and (concat(`test`.`t1`.`b`,`test`.`t1`.`c`) = concat('0',`test`.`t2`.`a`,'01')))) AS `x` from `test`.`t2` order by `test`.`t2`.`a`
DROP TABLE t1,t2; DROP TABLE t1,t2;
CREATE TABLE t1 (a TIMESTAMP);
INSERT INTO t1 VALUES (NOW()),(NOW()),(NOW());
SELECT * FROM t1 WHERE a > '2008-01-01' AND a = '0000-00-00';
a
DROP TABLE t1;
End of 5.0 tests End of 5.0 tests

9
mysql-test/t/compare.test
View File

@ -76,4 +76,13 @@ FROM t2 ORDER BY a;
DROP TABLE t1,t2; DROP TABLE t1,t2;
#
# Bug #39353: Multiple conditions on timestamp column crashes server
#
CREATE TABLE t1 (a TIMESTAMP);
INSERT INTO t1 VALUES (NOW()),(NOW()),(NOW());
SELECT * FROM t1 WHERE a > '2008-01-01' AND a = '0000-00-00';
DROP TABLE t1;
--echo End of 5.0 tests --echo End of 5.0 tests

6
mysql-test/t/mysqldump-max.test
View File

@ -1114,9 +1114,9 @@ CREATE VIEW v1 AS SELECT * FROM t1;
INSERT INTO t1 VALUES(); INSERT INTO t1 VALUES();
SELECT COUNT(*) FROM v1; SELECT COUNT(*) FROM v1;
--exec $MYSQL_DUMP --allow-keywords --single-transaction --quick --verbose test --result-file $MYSQL_TEST_DIR/var/tmp/bug31434.sql --exec $MYSQL_DUMP --allow-keywords --single-transaction --quick --verbose test --result-file $MYSQLTEST_VARDIR/tmp/bug31434.sql
--exec $MYSQL test < $MYSQL_TEST_DIR/var/tmp/bug31434.sql --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug31434.sql
--remove_file $MYSQL_TEST_DIR/var/tmp/bug31434.sql --remove_file $MYSQLTEST_VARDIR/tmp/bug31434.sql
SELECT COUNT(*) FROM v1; SELECT COUNT(*) FROM v1;

7
sql/item.cc
View File

@ -4342,7 +4342,12 @@ Item *Item_field::equal_fields_propagator(uchar *arg)
item= this; item= this;
else if (field && (field->flags & ZEROFILL_FLAG) && IS_NUM(field->type())) else if (field && (field->flags & ZEROFILL_FLAG) && IS_NUM(field->type()))
{ {
if (item && cmp_context != INT_RESULT) /*
We don't need to zero-fill timestamp columns here because they will be
first converted to a string (in date/time format) and compared as such if
compared with another string.
*/
if (item && field->type() != FIELD_TYPE_TIMESTAMP && cmp_context != INT_RESULT)
convert_zerofill_number_to_string(&item, (Field_num *)field); convert_zerofill_number_to_string(&item, (Field_num *)field);
else else
item= this; item= this;