Loading Docs/manual.texi +13 −3 Original line number Diff line number Diff line Loading @@ -46013,10 +46013,22 @@ not yet 100% confident in this code. @appendixsubsec Changes in release 3.23.45 @itemize @bullet @item @code{(UPDATE|DELETE) ...WHERE MATCH} bugfix @item shutdown should now work on Darwin (Mac OS X). @item Fixed core-dump when repairing corrupted packed MyISAM files. @item @code{--core-file} now works on Solaris. @item Fix a bug which could cause InnoDB to complain if it cannot find free blocks from the buffer cache during recovery. @item Fixed a bug in InnoDB insert buffer B-tree handling that could cause crashes. Fixed bug in InnoDB insert buffer B-tree handling that could cause crashes. @item Fixed bug in InnoDB lock timeout handling. @item Fixed core dump bug in @code{ALTER TABLE} on a @code{TEMPORARY} InnoDB table. @item Fixed bug in @code{OPTIMIZE TABLE} that reset index cardinality if it was up to date. Loading @@ -46029,8 +46041,6 @@ Fixed bug with BDB tables and keys on @code{BLOB}'s. Fixed bug in @code{MERGE} tables on OS with 32 bit file pointers. @item Fixed bug in @code{TIME_TO_SEC()} when using negative values. @item Fixed core dump bug in @code{ALTER TABLE} on a @code{TEMPORARY} InnoDB table. @end itemize @node News-3.23.44, News-3.23.43, News-3.23.45, News-3.23.x innobase/srv/srv0srv.c +8 −4 Original line number Diff line number Diff line Loading @@ -2153,13 +2153,17 @@ srv_lock_timeout_and_monitor_thread( /* Timeout exceeded or a wrap-around in system time counter: cancel the lock request queued by the transaction and release possible other transactions waiting behind */ other transactions waiting behind; it is possible that the lock has already been granted: in that case do nothing */ if (thr_get_trx(slot->thr)->wait_lock) { lock_cancel_waiting_and_release( thr_get_trx(slot->thr)->wait_lock); } } } } os_event_reset(srv_lock_timeout_thread_event); Loading mysql-test/t/fulltext.test +3 −0 Original line number Diff line number Diff line Loading @@ -23,6 +23,9 @@ select * from t1 where MATCH(a,b) AGAINST("+search +(support vector)" IN BOOLEAN select * from t1 where MATCH(a,b) AGAINST("+search -(support vector)" IN BOOLEAN MODE); select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t1; delete from t1 where a like "MySQL%"; update t1 set a='some test foobar' where MATCH a,b AGAINST ('model'); delete from t1 where MATCH(a,b) AGAINST ("indexes"); select * from t1; drop table t1; # Loading mysys/my_seek.c +2 −1 Original line number Diff line number Diff line Loading @@ -20,7 +20,8 @@ /* Seek to position in file */ /*ARGSUSED*/ my_off_t my_seek(File fd, my_off_t pos, int whence, myf MyFlags __attribute__((unused))) my_off_t my_seek(File fd, my_off_t pos, int whence, myf MyFlags __attribute__((unused))) { reg1 os_off_t newpos; DBUG_ENTER("my_seek"); Loading sql/mysql_priv.h +2 −2 Original line number Diff line number Diff line Loading @@ -327,7 +327,6 @@ int setup_order(THD *thd,TABLE_LIST *tables, List<Item> &fields, int handle_select(THD *thd, LEX *lex, select_result *result); int mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &list,COND *conds, List<Item_func_match> &ftfuncs, ORDER *order, ORDER *group,Item *having,ORDER *proc_param, ulong select_type,select_result *result); int mysql_union(THD *thd,LEX *lex,select_result *result); Loading Loading @@ -450,7 +449,8 @@ int setup_fields(THD *thd,TABLE_LIST *tables,List<Item> &item, bool set_query_id,List<Item> *sum_func_list, bool allow_sum_func); int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds); int setup_ftfuncs(THD *thd,TABLE_LIST *tables, List<Item_func_match> &ftfuncs); int setup_ftfuncs(THD *thd); int init_ftfuncs(THD *thd, bool no_order); void wait_for_refresh(THD *thd); int open_tables(THD *thd,TABLE_LIST *tables); int open_and_lock_tables(THD *thd,TABLE_LIST *tables); Loading Loading
Docs/manual.texi +13 −3 Original line number Diff line number Diff line Loading @@ -46013,10 +46013,22 @@ not yet 100% confident in this code. @appendixsubsec Changes in release 3.23.45 @itemize @bullet @item @code{(UPDATE|DELETE) ...WHERE MATCH} bugfix @item shutdown should now work on Darwin (Mac OS X). @item Fixed core-dump when repairing corrupted packed MyISAM files. @item @code{--core-file} now works on Solaris. @item Fix a bug which could cause InnoDB to complain if it cannot find free blocks from the buffer cache during recovery. @item Fixed a bug in InnoDB insert buffer B-tree handling that could cause crashes. Fixed bug in InnoDB insert buffer B-tree handling that could cause crashes. @item Fixed bug in InnoDB lock timeout handling. @item Fixed core dump bug in @code{ALTER TABLE} on a @code{TEMPORARY} InnoDB table. @item Fixed bug in @code{OPTIMIZE TABLE} that reset index cardinality if it was up to date. Loading @@ -46029,8 +46041,6 @@ Fixed bug with BDB tables and keys on @code{BLOB}'s. Fixed bug in @code{MERGE} tables on OS with 32 bit file pointers. @item Fixed bug in @code{TIME_TO_SEC()} when using negative values. @item Fixed core dump bug in @code{ALTER TABLE} on a @code{TEMPORARY} InnoDB table. @end itemize @node News-3.23.44, News-3.23.43, News-3.23.45, News-3.23.x
innobase/srv/srv0srv.c +8 −4 Original line number Diff line number Diff line Loading @@ -2153,13 +2153,17 @@ srv_lock_timeout_and_monitor_thread( /* Timeout exceeded or a wrap-around in system time counter: cancel the lock request queued by the transaction and release possible other transactions waiting behind */ other transactions waiting behind; it is possible that the lock has already been granted: in that case do nothing */ if (thr_get_trx(slot->thr)->wait_lock) { lock_cancel_waiting_and_release( thr_get_trx(slot->thr)->wait_lock); } } } } os_event_reset(srv_lock_timeout_thread_event); Loading
mysql-test/t/fulltext.test +3 −0 Original line number Diff line number Diff line Loading @@ -23,6 +23,9 @@ select * from t1 where MATCH(a,b) AGAINST("+search +(support vector)" IN BOOLEAN select * from t1 where MATCH(a,b) AGAINST("+search -(support vector)" IN BOOLEAN MODE); select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t1; delete from t1 where a like "MySQL%"; update t1 set a='some test foobar' where MATCH a,b AGAINST ('model'); delete from t1 where MATCH(a,b) AGAINST ("indexes"); select * from t1; drop table t1; # Loading
mysys/my_seek.c +2 −1 Original line number Diff line number Diff line Loading @@ -20,7 +20,8 @@ /* Seek to position in file */ /*ARGSUSED*/ my_off_t my_seek(File fd, my_off_t pos, int whence, myf MyFlags __attribute__((unused))) my_off_t my_seek(File fd, my_off_t pos, int whence, myf MyFlags __attribute__((unused))) { reg1 os_off_t newpos; DBUG_ENTER("my_seek"); Loading
sql/mysql_priv.h +2 −2 Original line number Diff line number Diff line Loading @@ -327,7 +327,6 @@ int setup_order(THD *thd,TABLE_LIST *tables, List<Item> &fields, int handle_select(THD *thd, LEX *lex, select_result *result); int mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &list,COND *conds, List<Item_func_match> &ftfuncs, ORDER *order, ORDER *group,Item *having,ORDER *proc_param, ulong select_type,select_result *result); int mysql_union(THD *thd,LEX *lex,select_result *result); Loading Loading @@ -450,7 +449,8 @@ int setup_fields(THD *thd,TABLE_LIST *tables,List<Item> &item, bool set_query_id,List<Item> *sum_func_list, bool allow_sum_func); int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds); int setup_ftfuncs(THD *thd,TABLE_LIST *tables, List<Item_func_match> &ftfuncs); int setup_ftfuncs(THD *thd); int init_ftfuncs(THD *thd, bool no_order); void wait_for_refresh(THD *thd); int open_tables(THD *thd,TABLE_LIST *tables); int open_and_lock_tables(THD *thd,TABLE_LIST *tables); Loading