mariadb

Tree: cd03a4625f

Author	SHA1	Message	Date
Alexander Nozdrin	b0e2a9b2d5	Auto-merge (empty) from mysql-trunk-bugfixing.	16 years ago
Alexander Nozdrin	043f39e060	Auto-merge from mysql-next-mr.	16 years ago
Luis Soares	735aac91e3	Manual merge from mysql-5.1-rep+2.	16 years ago
vvaintroub	cb31d4ccfe	remove /MAP option for good.Noone needs it	16 years ago
Alexander Nozdrin	f5311bba7e	Auto-merge from mysql-trunk.	16 years ago
Luis Soares	87c0c9cfe8	Automerge from mysql-next-mr.	16 years ago
Alexander Nozdrin	7dc5666c6b	Auto-merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	6dd9375726	1. Disable ndb_condition_pushdown.test due to Bug 49746. 2. Update test result files.	16 years ago
Alexander Nozdrin	4f9a1f49c8	Manual merge from mysql-trunk. Conflicts: - mysql-test/suite/ndb/r/ndb_dd_ddl.result	16 years ago
Alexander Nozdrin	06ce01bace	Fix ndb_dd_ddl.test: drop created database after use.	16 years ago
Alexander Nozdrin	542b661de9	Auto-merge from mysql-trunk.	16 years ago
Joerg Bruehe	5d115bbe0c	Upmerge "configure.in" text change from 5.1 to 5.5 ("trunk"), fixing bug#50950.	16 years ago
Joerg Bruehe	ed75cda355	Upmerge "configure.in" text change from 5.0 to 5.1, fixing bug#50950.	16 years ago
Dmitry Lenev	8018ec5adb	Fix for bug #50913 "Deadlock between open_and_lock_tables_derived and MDL". Concurrent execution of a multi-DELETE statement and ALTER TABLE statement which affected one of the tables used in the multi-DELETE sometimes led to deadlock. Similar deadlocks might have occured when one performed INSERT/UPDATE/DELETE on a view and concurrently executed ALTER TABLE for the view's underlying table, or when one concurrently executed TRUNCATE TABLE for InnoDB table and ALTER TABLE for the same table. These deadlocks were caused by a discrepancy between types of metadata and thr_lock.cc locks acquired by those statements. What happened was that multi-DELETE/TRUNCATE/DML-through-the- view statement in the first connection acquired SR lock on a table, then ALTER TABLE would come in in the second connection and acquire SNW metadata lock and TL_WRITE_ALLOW_READ thr_lock.c lock and then would start waiting for the first connection during lock upgrade. After that the statement in the first connection would try to acquire TL_WRITE lock on table and would start waiting for the second connection, creating a deadlock. This patch solves this problem by ensuring that we acquire SW metadata lock in all cases in which we acquiring write thr_lock.c lock. This guarantees that deadlocks like the one described above won't occur since all lock conflicts in such situation are resolved within MDL subsystem. This patch also adds assert which should guarantee that such situations won't arise in future. mysql-test/r/lock_multi.result: Added main test for bug #50913 "Deadlock between open_and_lock_tables_derived and MDL". mysql-test/r/mdl_sync.result: Added additional coverage for bug #50913 "Deadlock between open_and_lock_tables_derived and MDL". mysql-test/t/lock_multi.test: Added main test for bug #50913 "Deadlock between open_and_lock_tables_derived and MDL". mysql-test/t/mdl_sync.test: Added additional coverage for bug #50913 "Deadlock between open_and_lock_tables_derived and MDL". sql/lock.cc: Added assert that enforces that when we are locking a non-temporary table we have an appropriate type of metadata lock on this table. sql/mysql_priv.h: Added separate flag for open_tables() to be able specify that SH metadata locks on table to be open should be acquired. We can no longer use MYSQL_LOCK_IGNORE_FLUSH flag for this as in addition to use in I_S implementation it is also used for opening system tables. Since in the latter case we also acquire thr_lock.c locks using SH metadata lock in it instead of SR or SW locks may lead to deadlock. sql/sql_base.cc: When opening tables don't interpret MYSQL_LOCK_IGNORE_FLUSH flag as request to acquire SH metadata locks. This flag is also used for opening system tables for which we also take thr_lock.c locks and thus proper metadata lock to take in this case is SR or SW lock (otherwise deadlocks can occur). In cases when SH lock is really required (e.g. when tables are open by I_S implementation) we rely on that newly introduced MYSQL_OPEN_FORCE_SHARED_HIGH_PRIO_MDL flag is used. sql/sql_delete.cc: mysql_truncate_by_delete(): Adjust type of metadata lock to be requested after changing type of thr_lock.c lock for table list element from one which was set in parser to TL_WRITE. This removes discrepancy between types of these locks which allowed deadlocks to creep in. sql/sql_handler.cc: When closing table which was open by HANDLER statement clear TABLE::open_by_handler flag. This allows to use this flag as a reliable indication that TABLE instance was open by HANDLER statement in assert which was added to mysql_lock_tables(). sql/sql_parse.cc: multi_delete_set_locks_and_link_aux_tables(): Adjust type of metadata lock to be requested after changing type of thr_lock.c lock for table list element from one which was set in parser to TL_WRITE. This removes discrepancy between types of these locks which allowed deadlocks to creep in. sql/sql_show.cc: Use newly introduced MYSQL_OPEN_FORCE_SHARED_HIGH_PRIO_MDL flag in order to acquire SH metadata locks when opening tables in I_S implementation. sql/sql_update.cc: Added comment explaining why in multi-update after deciding that we need weaker thr_lock.c lock on a table we don't downgrade metadata lock on it. sql/sql_view.cc: When merging view into main statement adjust type of metadata lock to be requested after changing type of thr_lock.c lock for table. This removes discrepancy between types of these locks which allowed deadlocks to creep in.	16 years ago
Joerg Bruehe	72da6b3185	Bug#50950 Obsolete reference to www.mysql.com in message printed at end of configure New text for the success message of "configure". configure.in: The message must be changed to drop the "www.mysql.com" URL.	16 years ago
Horst.Hunger	2d58a95bb9	Patch to fix bug#50981. Replace now the result ::1 by localhost for Windows. Both is valid.	16 years ago
Bjorn Munch	162f69babc	null upmerge	16 years ago
Bjorn Munch	067a89e293	merge from next-mr	16 years ago
Bjorn Munch	66f33d13b8	null upmerge	16 years ago
Bjorn Munch	b95dc4717d	merge from mysql-trunk	16 years ago
Bjorn Munch	97219cb9ef	merge from 5.1 main	16 years ago
Vladislav Vaintroub	784d4a4718	merge	16 years ago
Vladislav Vaintroub	7257047dce	merge	16 years ago
Konstantin Osipov	4d4eed6514	Merge next-4284 -> next-4284-merge	16 years ago
Konstantin Osipov	a72f90bc43	Merge next-mr -> next-4284. mysql-test/t/disabled.def: Restore disabled ssl tests: SSL certificates were updated. Disable sp_sync.test, the test case can't work in next-4284. mysql-test/t/partition_innodb.test: Disable parsing of the test case for Bug#47343, the test can not work in next-4284. mysql-test/t/ps_ddl.test: Update results (CREATE TABLE IF NOT EXISTS takes into account existence of the temporary table).	16 years ago
Jon Olav Hauglid	95c2386148	Bug #50912 Assertion `ticket->m_type >= mdl_request->type' failed on HANDLER + I_S This assert was triggered when an I_S query tried to acquire a metadata lock on a table which was already locked by a HANDLER statement in the same connection. First the HANDLER took a MDL_SHARED lock. Afterwards, the I_S query requested a MDL_SHARED_HIGH_PRIO lock. The existing MDL_SHARED ticket is found in find_ticket() since it satisfies ticket->has_stronger_or_equal_type(mdl_request->type) as MDL_SHARED and MDL_SHARED_HIGH_PRIO have equal strengths, just different priority. However, two asserts later check lock type strengths using relational operators (>= and <=) rather than MDL_ticket::has_stronger_or_equal_type(). These asserts are triggered since MDL_SHARED >= MDL_SHARED_HIGH_PRIORITY is false (mapped to 1 and 2 respectively). This patch updates the asserts to use MDL_ticket::has_stronger_or_equal_type() rather than relational operators to check lock type strength. Test case added to include/handler.inc.	16 years ago
Konstantin Osipov	ba678eef7d	Merge next-4284 -> next-4284-merge.	16 years ago
Konstantin Osipov	dad4caa9de	next-mr -> next-4284 merge. After merge fixes. Adjust replication test cases. mysql-test/suite/rpl/r/rpl_mixed_row_innodb.result: Update results with a new test. mysql-test/suite/rpl/r/rpl_stm_loadfile.result: Add a warning, which I believe is an expected one. mysql-test/suite/rpl/t/rpl_killed_ddl.test: Sort results to avoid test failurs under load. mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result: Update results (next-4284 merge). mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test: Adjust test output to the new table opening scheme: decide_logging_format() is now called in CREATE/DROP trigger.	16 years ago
Vladislav Vaintroub	7391f5f6c5	merge	16 years ago
Vladislav Vaintroub	5d034c00f3	merge	16 years ago
Marc Alff	d935204240	Merge mysql-next-mr-marc --> mysql-next-mr-bugfixing	16 years ago
Vladislav Vaintroub	a129a22873	Bug#50057: SHOW PROFILE CPU for Windows On QA request, adding test that causes new code to be called. Even if we cannot validate the result, this will at least increase the code coverage.	16 years ago
Marc Alff	238d78d090	merge from mysql-next-mr	16 years ago
Alexander Nozdrin	96f3134269	Auto-merge (empty) from mysql-trunk-bugfixing.	16 years ago
Alexander Nozdrin	6c72fce890	Auto-merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	eb71316090	Auto-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	b38ef2b5f7	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	7e0d0dd040	Cherry-pick merge from mysql-5.1-bugteam. Original revision: ------------------------------------------------------------ revision-id: kent.boortz@sun.com-20100204182709-dw1dwpglkd5qrehb committer: Kent Boortz <kent.boortz@sun.com> branch nick: mysql-5.1-bugteam timestamp: Thu 2010-02-04 19:27:09 +0100 message: LT_INIT and LT_PREREQ was added in libtool 2.2 2008, a bit too recent, switched back to the older AC_PROG_LIBTOOL ------------------------------------------------------------	16 years ago
Alexander Nozdrin	d9c4234bc9	Auto-merge (empty) from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	b6d1b25d50	Manual merge (empty) from mysql-5.1.	16 years ago
Alexander Nozdrin	5aebe20843	Auto-merge (empty) from mysql-trunk-bugfixing.	16 years ago
Marc Alff	ae7615c091	Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marc	16 years ago
Alexander Nozdrin	23899d6d6b	Auto-merge from mysql-next-mr.	16 years ago
Konstantin Osipov	f1d4c59da2	Add a suppression for use of functions unsafe in statement format. mysql-test/suite/rpl/t/rpl_view_multi.test: Add a suppression (fix a failing test).	16 years ago
Konstantin Osipov	a009a4e518	next-mr -> next-4284 merge: Change the error code for ER_WARN_I_S_SKIPPED_TABLE, to not upset the tests that rely on ER_SLAVE_CONVERSION_ERROR error code = 1667. Fix a merge bug with binlogging of CREATE TABLE (temporary tables).	16 years ago
Jon Olav Hauglid	82f4494125	Bug #50907 Assertion `hash_tables->table->next == __null' on HANDLER OPEN The problem was a too restrictive assert in the code for HANDLER ... OPEN and HANDLER ... READ that checked table->next to verify that we didn't open views or merge tables. This pointer is also used to link temporary tables together (see thd->temporary_tables). In this case TABLE::next can be set even if we're trying to open a single table. This patch adjust the two asserts to also check for the presence of temporary tables. Test case added to handler_myisam.test.	16 years ago
Alexander Nozdrin	f53d591e9f	Remove errmsg.txt and errmsg-cnv.sh. Use errmsg-utf8.txt instead.	16 years ago
Vladislav Vaintroub	e6cba2be35	Bug#50057: 'SHOW PROFILE CPU' port for Windows. Patch contributed by Alex Budovski.	16 years ago
Alexander Nozdrin	a45ea00b32	Manual merge from mysql-next-mr. Conflicts: - sql/sys_vars.cc	16 years ago
Alexander Nozdrin	44c3e5fc45	Auto-merge from mysql-trunk.	16 years ago

... 3 4 5 6 7 ...

61167 Commits (cd03a4625fbf481deeb6c32c8cb6ff74d900098b) All Branches Search

61167 Commits (cd03a4625fbf481deeb6c32c8cb6ff74d900098b)

All Branches