- 26 Nov, 2007 5 commits
-
-
unknown authored
into mysql.com:/Users/davi/mysql/bugs/29592-5.1 include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged libmysql/libmysql.def: Auto merged libmysqld/libmysqld.def: Auto merged include/mysql_h.ic: Update ABI check file.
-
unknown authored
Remove the mysql_odbc_escape_string() function. The function has multi-byte character escaping issues, doesn't honor the NO_BACKSLASH_ESCAPES mode and is not used anymore by the Connector/ODBC as of 3.51.17. include/mysql.h: Remove mysql_odbc_escape_string() prototype. include/mysql_h.ic: Update abi check file, mostly line changes and mysql_odbc_escape_string removal. libmysql/libmysql.c: Remove mysql_odbc_escape_string() body. libmysql/libmysql.def: Remove mysql_odbc_escape_string() libmysqld/libmysqld.def: Remove mysql_odbc_escape_string()
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime sql/item_func.cc: Auto merged
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/bug32436/my51-bug32436 sql/item_func.cc: Auto merged
-
unknown authored
Sending several "KILL QUERY" statements to target a connection running "SELECT SLEEP" could freeze the server. The locking order in Item_func_sleep was wrong and this could lead to a dead lock. This patch solves the issue by resolving the locking order properly. sql/item_func.cc: - Moved LOCK_user_locks critical region so that it doesn't share space with mysys_var->mutex region; this can lead to deadlock.
-
- 23 Nov, 2007 2 commits
- 22 Nov, 2007 10 commits
-
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
-
unknown authored
into endora.local:/Users/davi/mysql/mysql-5.1-runtime
-
unknown authored
into endora.local:/Users/davi/mysql/mysql-5.1-runtime sql/sql_parse.cc: Auto merged mysql-test/r/flush.result: SCCS merged mysql-test/t/flush.test: SCCS merged
-
unknown authored
into endora.local:/Users/davi/mysql/mysql-5.0-runtime
-
unknown authored
FLUSH TABLES WITH READ LOCK fails to properly detect write locked tables when running under low priority updates. The problem is that when trying to aspire a global read lock, the reload_acl_and_cache() function fails to properly check if the thread has a low priority write lock, which later my cause a server crash or deadlock. The solution is to simple check if the thread has any type of the possible exclusive write locks. mysql-test/r/flush.result: Add test case result for Bug#32528 mysql-test/t/flush.test: Add test case for Bug#32528 sql/sql_parse.cc: Although it should not matter under LOCK TABLES, use TL_WRITE_ALLOW_WRITE to emphasize that it should fail in case of any write lock.
-
unknown authored
into bodhi.(none):/opt/local/work/mysql-5.1-runtime mysql-test/r/skip_grants.result: Manual merge. mysql-test/t/skip_grants.test: Manual merge.
-
unknown authored
Bug#28318. mysql-test/r/skip_grants.result: Add a test case for Bug#29817 mysql-test/t/skip_grants.test: Add a test case for Bug#29817
-
unknown authored
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge mysql-test/r/events_bugs.result: Auto merged mysql-test/t/information_schema.test: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
mysql-test/r/kill.result: Update the broken result (kill.test fails in the team tree). mysql-test/t/kill.test: Fix the broken test (team tree)
-
- 21 Nov, 2007 15 commits
-
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build support-files/compiler_warnings.supp: merge fix
-
unknown authored
support-files/compiler_warnings.supp: we want that.
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build support-files/compiler_warnings.supp: merge fix
-
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
into five.local.lan:/work/merge/mysql-5.1-build-31610 mysql-test/suite/funcs_1/datadict/datadict_master.inc: Auto merged mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc: Auto merged mysql-test/suite/funcs_1/datadict/datadict_tables.inc: Auto merged mysql-test/suite/funcs_1/r/innodb__datadict.result: Auto merged mysql-test/suite/funcs_1/r/memory__datadict.result: Auto merged mysql-test/suite/funcs_1/r/myisam__datadict.result: Auto merged
-
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 adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153 sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_yacc.yy: Null merge. sql/sql_base.cc: Manual merge sql/sql_lex.h: Manual merge
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_yacc.yy: Manual merge.
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/build/51 client/mysql.cc: Auto merged
-
unknown authored
into endora.local:/Users/davi/mysql/mysql-5.1-runtime
-
unknown authored
In several cases, an error when processing the query would cause mysql to return to the top level without printing warnings. Fix is to always print any available warnings before returning to the top level. client/mysql.cc: In com_go(), ensure that warnings are printed even if an error occurred when processing the query. Before this patch, an error in several places would return to the top level without printing associated warnings. Attempt to avoid printing the warning, though, if it's a duplicate of mysql_error() for the connection handle. mysql-test/r/mysql.result: Add test for bug 25146 mysql-test/t/mysql.test: Add test for bug 25146
-
- 20 Nov, 2007 8 commits
-
-
unknown authored
into endora.local:/Users/davi/mysql/mysql-5.1-runtime
-
unknown authored
mysql-test/lib/mtr_report.pl: Update 'allowed errors' list to match re-formatted InnoDB error message.
-
unknown authored
mysql-test/t/sp_notembedded.test: Remove test case, it's not needed any more.
-
unknown authored
Fixes the following bug: - 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. storage/innobase/dict/dict0dict.c: Applied InnoDB snapshot innodb-5.1-ss2093 Revision r2092: Remove the unused function innobase_convert_from_filename() that was inadvertently added in r590. storage/innobase/handler/ha_innodb.cc: Applied InnoDB snapshot innodb-5.1-ss2093 Revision 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 (via IM) Revision r2093: convert_search_mode_to_innobase(): Add the missing case label HA_READ_MBR_EQUAL that was forgotten in r2088. Revision r2089: Non-functional change: convert the switch in convert_search_mode_to_innobase() to the InnoDB coding style. Revision r2092: Remove the unused function innobase_convert_from_filename() that was inadvertently added in r590. storage/innobase/include/page0cur.h: Applied InnoDB snapshot innodb-5.1-ss2093 Revision 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 (via IM)
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/inno/nov19/51
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/inno/nov19/51 storage/innobase/handler/ha_innodb.cc: Use local (null merge) storage/innobase/include/db0err.h: Use local (null merge) storage/innobase/include/os0sync.h: Use local (null merge) storage/innobase/include/page0cur.h: Use local (null merge) storage/innobase/include/sync0rw.h: Use local (null merge) storage/innobase/include/sync0rw.ic: Use local (null merge) storage/innobase/include/sync0sync.ic: Use local (null merge) storage/innobase/os/os0sync.c: Use local (null merge) storage/innobase/srv/srv0srv.c: Use local (null merge) storage/innobase/sync/sync0arr.c: Use local (null merge) storage/innobase/sync/sync0rw.c: Use local (null merge) storage/innobase/sync/sync0sync.c: Use local (null merge)
-
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 endora.local:/Users/davi/mysql/mysql-5.1-runtime sql/sql_class.cc: Auto merged
-
