- 27 Oct, 2009 7 commits
-
-
Vladislav Vaintroub authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Dmitry Lenev authored
Disabled execution of this test for embedded server until fix for bug 41971 'Thread state on embedded server is always "Writing to net"' is back-ported to this tree.
-
He Zhenxing authored
-
- 26 Oct, 2009 3 commits
-
-
Dmitry Lenev authored
Concurrent execution of statements which require non-table-level write locks on several instances of the same table (such as SELECT ... FOR UPDATE which uses same InnoDB table twice or a DML statement which invokes trigger which tries to update same InnoDB table directly and through stored function) and statements which required table-level locks on this table (e.g. LOCK TABLE ... WRITE, ALTER TABLE, ...) might have resulted in a deadlock. The problem occured when a thread tried to acquire write lock (TL_WRITE_ALLOW_WRITE) on the table but had to wait since there was a pending write lock (TL_WRITE, TL_WRITE_ALLOW_READ) on this table and we failed to detect that this thread already had another instance of write lock on it (so in fact we were trying to acquire recursive lock) because there was also another thread holding write lock on the table (also TL_WRITE_ALLOW_WRITE). When the latter thread released its lock neither the first thread nor the thread trying to acquire TL_WRITE/TL_WRITE_ALLOW_READ were woken up (as table was still write locked by the first thread) so we ended up with a deadlock. This patch solves this problem by ensuring that thread which already has write lock on the table won't wait when it tries to acquire second write lock on the same table.
-
Vladislav Vaintroub authored
The problem here is that the latest innodb push contains both MYSQL_STORAGE_ENGINE(INNOBASE) and MYSQL_STORAGE_ENGINE(INNOBASE) in the same CMakeLists.txt, to make the resulting library ha_innodb.dll, instead of ha_innobase.dll. Using multiple MYSQL_STORAGE_ENGINE within the same CMakeLists.txt conflicts with the fix for the bug Bug #47795 "CMake, storage engine name different from directory name". Top-level CMakeLists.txt now parses storage engine's CMakeLists.txt to extract engines name from MYSQL_STORAGE_ENGINE(). For innodb, it concludes that there is not storage engine named INNOBASE, hence WITH_INNOBASE_STORAGE_ENGINE has no effect. The fix is to use SET_TARGET_PROPERTIES(... PROPERTIES OUTPUT_NAME ...), instead of renaming the engine to have plugins named ha_innodb.dll.
-
Sergey Glukhov authored
additional fix(Betony)
-
- 25 Oct, 2009 1 commit
-
-
Luis Soares authored
-
- 23 Oct, 2009 15 commits
-
-
Luis Soares authored
Disabled rpl_cross_version (instead of setting it experimental). Fixed outstanding warning fix in main.debug_sync.
-
He Zhenxing authored
-
He Zhenxing authored
-
Sergey Glukhov authored
-
Sergey Glukhov authored
backport to betony
-
Horst.Hunger authored
-
Luis Soares authored
-
Luis Soares authored
result files. Warnings affected: - WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED - ER_TOO_LONG_FIELD_COMMENT
-
Sergey Glukhov authored
backport to Betony
-
Alexander Nozdrin authored
Original revision: ------------------------------------------------------------ revno: 2801.10.16 committer: Vladislav Vaintroub <vvaintroub@mysql.com> branch nick: mysql-azalea-bugfixing timestamp: Mon 2009-08-10 13:26:23 +0200 message: Bug #46267 Shutdown with idle connection crash the server. The crash happens when mysqld logs a warning. The macro ER() used in sql_print_warning references thread local storage variable via current_thd(), to output the warning in "current user language". However, for the shutdown thread, current_thd() will return NULL, and mysqld will crash while derefencing NULL pointer. Solution: get error mesage text with ER_DEFAULT() macro instead of ER(), this does not current_thd() and will output errors in default language. ------------------------------------------------------------
-
He Zhenxing authored
-
Sergey Glukhov authored
backport to Betony
-
Sergey Glukhov authored
backport to Betony
-
Sergey Glukhov authored
-
He Zhenxing authored
-
- 22 Oct, 2009 14 commits
-
-
Luis Soares authored
rpl.rpl_heartbeat_basic and rpl.rpl_cross_version set as experimental.
-
Luis Soares authored
Conflicts ========= Text conflict in .bzr-mysql/default.conf Text conflict in libmysqld/CMakeLists.txt Text conflict in libmysqld/Makefile.am Text conflict in mysql-test/collections/default.experimental Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/CMakeLists.txt Text conflict in sql/Makefile.am Text conflict in sql/log_event_old.cc Text conflict in sql/rpl_rli.cc Text conflict in sql/slave.cc Text conflict in sql/sql_binlog.cc Text conflict in sql/sql_lex.h 21 conflicts encountered. NOTE ==== mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr: - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr" This is the first cset (merge/...) committed after pulling from mysql-next-mr.
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Jonathan Perkin authored
-
Jonathan Perkin authored
-
Bjorn Munch authored
-
Bjorn Munch authored
-