- 29 Nov, 2007 3 commits
-
-
unknown authored
into mysql.com:/home/ram/work/b32726/b32726.5.0 mysql-test/r/ctype_euckr.result: Auto merged mysql-test/r/ctype_uca.result: Auto merged
-
unknown authored
into mysql.com:/home/ram/work/b32559/b32559.5.0
-
unknown authored
into mysql.com:/home/ram/work/b32676/b32676.5.0 mysql-test/r/delayed.result: Auto merged mysql-test/t/delayed.test: Auto merged sql/sql_insert.cc: Auto merged
-
- 28 Nov, 2007 2 commits
-
-
unknown authored
Disabled test case.
-
unknown authored
- fix for #31070 (missed during merging) applied for cp932 charset. - tests/results adjusted. mysql-test/include/ctype_common.inc: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/r/ctype_big5.result: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/r/ctype_cp932.result: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/r/ctype_euckr.result: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/r/ctype_gb2312.result: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/r/ctype_gbk.result: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/r/ctype_uca.result: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/t/ctype_cp932.test: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. strings/ctype-cp932.c: Fix for bug #32726: crash with cast in order by clause and cp932 charset - fix for #31070 (missed during merging) applied for cp932.
-
- 27 Nov, 2007 8 commits
-
-
unknown authored
into stella.local:/home2/mydev/mysql-5.0-axmrg
-
unknown authored
-
unknown authored
into stella.local:/home2/mydev/mysql-5.0-axmrg
-
unknown authored
Disabled the test case.
-
unknown authored
into mysql.com:/home/ram/work/b30495/b30495.5.0
-
unknown authored
into stella.local:/home2/mydev/mysql-5.0-axmrg sql/item_cmpfunc.cc: Auto merged
-
unknown authored
into mysql.com:/home/ram/work/b30495/b30495.5.0
-
unknown authored
Problem: passing a non-constant name to the NAME_CONST function results in a crash. Fix: check the NAME_CONST name argument; return fake item type if we got non-constant argument(s). mysql-test/r/func_misc.result: Fix for bug #32559: connection hangs on query with name_const - test result. mysql-test/t/func_misc.test: Fix for bug #32559: connection hangs on query with name_const - test case. sql/item.cc: Fix for bug #32559: connection hangs on query with name_const - Item_name_const::type() now returns NULL_ITEM if non-constant arguments were used to create the item to avoid wrong type casting. sql/item.h: Fix for bug #32559: connection hangs on query with name_const - NAME_CONST name argument checked for invariability.
-
- 26 Nov, 2007 4 commits
-
-
unknown authored
Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables Fixed wrong variable assignment.
-
unknown authored
Disabled test case
-
unknown authored
Another try to fix a compiler warning on win64.
-
unknown authored
Problem: using wrong local lock type value in the mysql_insert() results in a crash. Fix: use a proper value. mysql-test/r/delayed.result: Fix for bug #32676: insert delayed crash with wrong column and function specified - test result. mysql-test/t/delayed.test: Fix for bug #32676: insert delayed crash with wrong column and function specified - test case. sql/sql_insert.cc: Fix for bug #32676: insert delayed crash with wrong column and function specified - the local lock_type var assigment displaced just after the line where the table_list->lock_type is filnally defined in the mysql_insert() to avoid using its old value.
-
- 25 Nov, 2007 1 commit
-
-
unknown authored
into stella.local:/home2/mydev/mysql-5.0-axmrg
-
- 23 Nov, 2007 8 commits
-
-
unknown authored
into mysql.com:/home/ram/work/b32560/b32560.5.0
-
unknown authored
Problem: INTERVAL function implementation doesn't handle NULL range values. Fix: skip NULL ranges looking for a proper one. mysql-test/r/func_set.result: Fix for bug #32560: crash with interval function and count(*) - test result. mysql-test/t/func_set.test: Fix for bug #32560: crash with interval function and count(*) - test case. sql/item_cmpfunc.cc: Fix for bug #32560: crash with interval function and count(*) - skip NULL ranges calculating INTERVAL(...). -
unknown authored
into stella.local:/home2/mydev/mysql-5.0-axmrg
-
unknown authored
Disabled test case
-
unknown authored
Disabled test case
-
unknown authored
Fixed a compiler warning on win64. Backport from 5.1.
-
unknown authored
Disabled test case
-
unknown authored
into mysql.com:/home/ram/work/b32558/b32558.5.0
-
- 21 Nov, 2007 12 commits
-
-
unknown authored
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge client/mysql.cc: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_uca.test: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/subselect.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged
-
unknown authored
into stella.local:/home2/mydev/mysql-5.0-axmrg
-
unknown authored
into stella.local:/home2/mydev/mysql-5.0-axmrg
-
unknown authored
into stella.local:/home2/mydev/mysql-4.1-axmrg
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
-
unknown authored
support-files/compiler_warnings.supp: we want that.
-
unknown authored
into five.local.lan:/work/trees/mysql-5.0-build-src-clean
-
unknown authored
support-files/compiler_warnings.supp: readline is not maintained by us
-
unknown authored
Problem: setting Item_func_rollup_const::null_value property to argument's null_value before (without) the argument evaluation may result in a crash due to wrong null_value. Fix: use is_null() to set Item_func_rollup_const::null_value instead as it evaluates the argument if necessary and returns a proper value. mysql-test/r/olap.result: Fix for bug #32558: group by null-returning expression with rollup causes crash - test result. mysql-test/t/olap.test: Fix for bug #32558: group by null-returning expression with rollup causes crash - test case. sql/item_func.h: Fix for bug #32558: group by null-returning expression with rollup causes crash - use args[0]->is_null() to obtain Item_func_rollup_const::null_value instead of args[0]->null_value as it's not set in advance in case of constant functions. -
unknown authored
Bug#31567 "datadict" tests (all engines) fail: Reference protocol is non-standard build Bug#30418 "datadict" tests (all engines) fail: Dependency on the host name for ordering Modifications: 1. The standard builds (build team) do not contain the collation 'utf8_general_cs'. The common developer builds (compuile-....-max) contain this collation. Solution fitting to both build variants: Exclude the collation 'utf8_general_cs' from result sets. 2. Use mysqltest builtin sorting of result set for the statement where the hostname affects the row order. mysql-test/suite/funcs_1/datadict/datadict_master.inc: Exclude collation 'utf8_general_cs' from result set. mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc: Use mysqltest builtin sorting of result set. mysql-test/suite/funcs_1/datadict/datadict_tables.inc: Exclude collation 'utf8_general_cs' from result set. mysql-test/suite/funcs_1/r/innodb__datadict.result: Updated results mysql-test/suite/funcs_1/r/memory__datadict.result: Updated results mysql-test/suite/funcs_1/r/myisam__datadict.result: Updated results -
unknown authored
into stella.local:/home2/mydev/mysql-5.0-axmrg
-
unknown authored
Problem: we have CHECK TABLE options allowed (by accident?) for ANALYZE/OPTIMIZE TABLE. Fix: disable them. Note: it might require additional fixes in 5.1/6.0 mysql-test/r/analyze.result: Fix for bug #30495: optimize table t1,t2,t3 extended errors - test result. mysql-test/t/analyze.test: Fix for bug #30495: optimize table t1,t2,t3 extended errors - test case. sql/sql_yacc.yy: Fix for bug #30495: optimize table t1,t2,t3 extended errors - opt_mi_check_type (CHECK TABLE options) removed from analyze: and optimize:
-
- 20 Nov, 2007 2 commits
-
-
unknown authored
Fixes the following bugs: - Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock' Fixed a race condition in the rw_lock where an os_event_reset() can overwrite an earlier os_event_set() triggering an indefinite wait. NOTE: This fix for windows is different from that for other platforms. NOTE2: This bug is introduced in the scalability fix to the sync0arr which was applied to 5.0 only. Therefore, it need not be applied to the 5.1 tree. If we decide to port the scalability fix to 5.1 then this fix should be ported as well. - Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase When unknown find_flag is encountered in convert_search_mode_to_innobase() do not call assert(0); instead queue a MySQL error using my_error() and return the error code PAGE_CUR_UNSUPP. Change the functions that call convert_search_mode_to_innobase() to handle that error code by "canceling" execution and returning appropriate error code further upstream. innobase/include/db0err.h: Applied InnoDB snapshot innodb-5.0-ss2095 Revision r2091: branches/5.0: Merge r2088 from trunk: log for r2088: Fix Bug#32125 (http://bugs.mysql.com/32125) "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase": When unknown find_flag is encountered in convert_search_mode_to_innobase() do not call assert(0); instead queue a MySQL error using my_error() and return the error code PAGE_CUR_UNSUPP. Change the functions that call convert_search_mode_to_innobase() to handle that error code by "canceling" execution and returning appropriate error code further upstream. Approved by: Heikki innobase/include/os0sync.h: Applied InnoDB snapshot innodb-5.0-ss2095 Revision r2082: branches/5.0: bug#29560 Fixed a race condition in the rw_lock where an os_event_reset() can overwrite an earlier os_event_set() triggering an indefinite wait. NOTE: This fix for windows is different from that for other platforms. NOTE2: This bug is introduced in the scalability fix to the sync0arr which was applied to 5.0 only. Therefore, it need not be applied to the 5.1 tree. If we decide to port the scalability fix to 5.1 then this fix should be ported as well. Reviewed by: Heikki innobase/include/page0cur.h: Applied InnoDB snapshot innodb-5.0-ss2095 Revision r2091: branches/5.0: Merge r2088 from trunk: log for r2088: Fix Bug#32125 (http://bugs.mysql.com/32125) "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase": When unknown find_flag is encountered in convert_search_mode_to_innobase() do not call assert(0); instead queue a MySQL error using my_error() and return the error code PAGE_CUR_UNSUPP. Change the functions that call convert_search_mode_to_innobase() to handle that error code by "canceling" execution and returning appropriate error code further upstream. Approved by: Heikki innobase/include/sync0rw.h: Applied InnoDB snapshot innodb-5.0-ss2095 Revision r2082: branches/5.0: bug#29560 Fixed a race condition in the rw_lock where an os_event_reset() can overwrite an earlier os_event_set() triggering an indefinite wait. NOTE: This fix for windows is different from that for other platforms. NOTE2: This bug is introduced in the scalability fix to the sync0arr which was applied to 5.0 only. Therefore, it need not be applied to the 5.1 tree. If we decide to port the scalability fix to 5.1 then this fix should be ported as well. Reviewed by: Heikki innobase/include/sync0rw.ic: Applied InnoDB snapshot innodb-5.0-ss2095 Revision r2082: branches/5.0: bug#29560 Fixed a race condition in the rw_lock where an os_event_reset() can overwrite an earlier os_event_set() triggering an indefinite wait. NOTE: This fix for windows is different from that for other platforms. NOTE2: This bug is introduced in the scalability fix to the sync0arr which was applied to 5.0 only. Therefore, it need not be applied to the 5.1 tree. If we decide to port the scalability fix to 5.1 then this fix should be ported as well. Reviewed by: Heikki innobase/include/sync0sync.ic: Applied InnoDB snapshot innodb-5.0-ss2095 Revision r2082: branches/5.0: bug#29560 Fixed a race condition in the rw_lock where an os_event_reset() can overwrite an earlier os_event_set() triggering an indefinite wait. NOTE: This fix for windows is different from that for other platforms. NOTE2: This bug is introduced in the scalability fix to the sync0arr which was applied to 5.0 only. Therefore, it need not be applied to the 5.1 tree. If we decide to port the scalability fix to 5.1 then this fix should be ported as well. Reviewed by: Heikki innobase/os/os0sync.c: Applied InnoDB snapshot innodb-5.0-ss2095 Revision r2082: branches/5.0: bug#29560 Fixed a race condition in the rw_lock where an os_event_reset() can overwrite an earlier os_event_set() triggering an indefinite wait. NOTE: This fix for windows is different from that for other platforms. NOTE2: This bug is introduced in the scalability fix to the sync0arr which was applied to 5.0 only. Therefore, it need not be applied to the 5.1 tree. If we decide to port the scalability fix to 5.1 then this fix should be ported as well. Reviewed by: Heikki innobase/srv/srv0srv.c: Applied InnoDB snapshot innodb-5.0-ss2095 Revision r2082: branches/5.0: bug#29560 Fixed a race condition in the rw_lock where an os_event_reset() can overwrite an earlier os_event_set() triggering an indefinite wait. NOTE: This fix for windows is different from that for other platforms. NOTE2: This bug is introduced in the scalability fix to the sync0arr which was applied to 5.0 only. Therefore, it need not be applied to the 5.1 tree. If we decide to port the scalability fix to 5.1 then this fix should be ported as well. Reviewed by: Heikki innobase/sync/sync0arr.c: Applied InnoDB snapshot innodb-5.0-ss2095 Revision r2082: branches/5.0: bug#29560 Fixed a race condition in the rw_lock where an os_event_reset() can overwrite an earlier os_event_set() triggering an indefinite wait. NOTE: This fix for windows is different from that for other platforms. NOTE2: This bug is introduced in the scalability fix to the sync0arr which was applied to 5.0 only. Therefore, it need not be applied to the 5.1 tree. If we decide to port the scalability fix to 5.1 then this fix should be ported as well. Reviewed by: Heikki innobase/sync/sync0rw.c: Applied InnoDB snapshot innodb-5.0-ss2095 Revision r2082: branches/5.0: bug#29560 Fixed a race condition in the rw_lock where an os_event_reset() can overwrite an earlier os_event_set() triggering an indefinite wait. NOTE: This fix for windows is different from that for other platforms. NOTE2: This bug is introduced in the scalability fix to the sync0arr which was applied to 5.0 only. Therefore, it need not be applied to the 5.1 tree. If we decide to port the scalability fix to 5.1 then this fix should be ported as well. Reviewed by: Heikki innobase/sync/sync0sync.c: Applied InnoDB snapshot innodb-5.0-ss2095 Revision r2082: branches/5.0: bug#29560 Fixed a race condition in the rw_lock where an os_event_reset() can overwrite an earlier os_event_set() triggering an indefinite wait. NOTE: This fix for windows is different from that for other platforms. NOTE2: This bug is introduced in the scalability fix to the sync0arr which was applied to 5.0 only. Therefore, it need not be applied to the 5.1 tree. If we decide to port the scalability fix to 5.1 then this fix should be ported as well. Reviewed by: Heikki sql/ha_innodb.cc: Applied InnoDB snapshot innodb-5.0-ss2095 Revision r2091: branches/5.0: Merge r2088 from trunk: log for r2088: Fix Bug#32125 (http://bugs.mysql.com/32125) "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase": When unknown find_flag is encountered in convert_search_mode_to_innobase() do not call assert(0); instead queue a MySQL error using my_error() and return the error code PAGE_CUR_UNSUPP. Change the functions that call convert_search_mode_to_innobase() to handle that error code by "canceling" execution and returning appropriate error code further upstream. Approved by: Heikki Revision r2095: branches/5.0: Merge r2093 from trunk: convert_search_mode_to_innobase(): Add the missing case label HA_READ_MBR_EQUAL that was forgotten in r2088.
-
unknown authored
into mysql.com:/home/kent/bk/tmpmerge/mysql-5.0-build
-
