From: Sergei Golubchik Date: October 19 2009 2:48pm Subject: bzr push into mysql-5.5.0-next-mr-bugfixing branch (serg:2901 to 2903) Bug#34374 List-Archive: http://lists.mysql.com/commits/87346 X-Bug: 34374 Message-Id: <20091019144839.19065.qmail@janus.mylan> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3002604196121206119==" --===============3002604196121206119== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 2903 Sergei Golubchik 2009-10-19 Bug#34374 mysql generates incorrect warning backport to next-mr modified: mysql-test/r/fulltext.result mysql-test/t/fulltext.test sql/sql_select.cc 2902 Sergei Golubchik 2009-10-19 bug#34741 prepared show master logs without binlogging debug assert s/return/DBUG_RETURN/ modified: sql/sql_repl.cc 2901 Evgeny Potemkin 2009-10-19 [merge] Auto-merged fix for the bug#30302. modified: mysql-test/r/explain.result mysql-test/r/func_default.result mysql-test/r/func_regexp.result mysql-test/r/func_test.result mysql-test/r/having.result mysql-test/r/select.result mysql-test/r/subselect.result mysql-test/r/subselect3.result mysql-test/r/type_datetime.result mysql-test/t/explain.test sql/sql_select.cc sql/table.h === modified file 'mysql-test/r/fulltext.result' --- a/mysql-test/r/fulltext.result 2009-07-15 10:13:45 +0000 +++ b/mysql-test/r/fulltext.result 2009-10-19 13:13:45 +0000 @@ -494,6 +494,14 @@ SELECT a FROM t1 WHERE MATCH a AGAINST ( a City Of God DROP TABLE t1; +create table t1(a text,b date,fulltext index(a))engine=myisam; +insert into t1 set a='water',b='2008-08-04'; +select 1 from t1 where match(a) against ('water' in boolean mode) and b>='2008-08-01'; +1 +1 +drop table t1; +show warnings; +Level Code Message CREATE TABLE t1 (a VARCHAR(255), b INT, FULLTEXT(a), KEY(b)); INSERT INTO t1 VALUES('test', 1),('test', 1),('test', 1),('test', 1), ('test', 1),('test', 2),('test', 3),('test', 4); === modified file 'mysql-test/t/fulltext.test' --- a/mysql-test/t/fulltext.test 2009-07-15 10:13:45 +0000 +++ b/mysql-test/t/fulltext.test 2009-10-19 13:13:45 +0000 @@ -420,6 +420,15 @@ DROP TABLE t1; # End of 4.1 tests # +# bug#34374 - mysql generates incorrect warning +# +create table t1(a text,b date,fulltext index(a))engine=myisam; +insert into t1 set a='water',b='2008-08-04'; +select 1 from t1 where match(a) against ('water' in boolean mode) and b>='2008-08-01'; +drop table t1; +show warnings; + +# # BUG#38842 - Fix for 25951 seems incorrect # CREATE TABLE t1 (a VARCHAR(255), b INT, FULLTEXT(a), KEY(b)); === modified file 'sql/sql_repl.cc' --- a/sql/sql_repl.cc 2009-09-10 09:18:29 +0000 +++ b/sql/sql_repl.cc 2009-10-19 13:04:27 +0000 @@ -1609,7 +1609,7 @@ bool show_binlogs(THD* thd) if (!mysql_bin_log.is_open()) { my_message(ER_NO_BINARY_LOGGING, ER(ER_NO_BINARY_LOGGING), MYF(0)); - return 1; + DBUG_RETURN(TRUE); } field_list.push_back(new Item_empty_string("Log_name", 255)); === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2009-10-19 11:13:26 +0000 +++ b/sql/sql_select.cc 2009-10-19 13:13:45 +0000 @@ -3613,16 +3613,16 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array, Item_func *arg0=(Item_func *)(func->arguments()[0]), *arg1=(Item_func *)(func->arguments()[1]); if (arg1->const_item() && - ((functype == Item_func::GE_FUNC && arg1->val_real() > 0) || - (functype == Item_func::GT_FUNC && arg1->val_real() >=0)) && arg0->type() == Item::FUNC_ITEM && - arg0->functype() == Item_func::FT_FUNC) + arg0->functype() == Item_func::FT_FUNC && + ((functype == Item_func::GE_FUNC && arg1->val_real() > 0) || + (functype == Item_func::GT_FUNC && arg1->val_real() >=0))) cond_func=(Item_func_match *) arg0; else if (arg0->const_item() && - ((functype == Item_func::LE_FUNC && arg0->val_real() > 0) || - (functype == Item_func::LT_FUNC && arg0->val_real() >=0)) && arg1->type() == Item::FUNC_ITEM && - arg1->functype() == Item_func::FT_FUNC) + arg1->functype() == Item_func::FT_FUNC && + ((functype == Item_func::LE_FUNC && arg0->val_real() > 0) || + (functype == Item_func::LT_FUNC && arg0->val_real() >=0))) cond_func=(Item_func_match *) arg1; } } --===============3002604196121206119== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/serg@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: serg@stripped # target_branch: file:///usr/home/serg/Abk/mysql/next-mr-bugfixing/ # testament_sha1: 55cb932099d4e760f8fe6d3b871e1d210cddf5f3 # timestamp: 2009-10-19 16:48:39 +0200 # source_branch: file:///usr/home/serg/Abk/mysql/6.0-codebase-\ # bugfixing/ # base_revision_id: epotemkin@stripped\ # 25qby4ekxy3womvr # # Begin bundle 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 nkL3wA== --===============3002604196121206119==--