delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	lots of post-merge changes	Sergei Golubchik	2011-04-25	1	-2/+0
\|
*	manual merge from mysql-trunk-bugfixing	Jon Olav Hauglid	2010-06-06	1	-23/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Text conflict in mysql-test/r/archive.result Contents conflict in mysql-test/r/innodb_bug38231.result Text conflict in mysql-test/r/mdl_sync.result Text conflict in mysql-test/suite/binlog/t/disabled.def Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result Text conflict in mysql-test/t/archive.test Contents conflict in mysql-test/t/innodb_bug38231.test Text conflict in mysql-test/t/mdl_sync.test Text conflict in sql/sp_head.cc Text conflict in sql/sql_show.cc Text conflict in sql/table.cc Text conflict in sql/table.h
*	Improve the comment in innodb_bug38231.test	Vasil Dimov	2010-05-12	1	-2/+2
\|
*	Disable innodb.innodb_bug38231 in embedded mode	Vasil Dimov	2010-05-12	1	-0/+5
\| \| \| \| \|	The --send command does not seem to work as expected in that mode.
*	Fix typo in comment in innodb_bug38231.test	Vasil Dimov	2010-04-23	1	-1/+1
\|
*	Refactor the innodb_bug38231 mysql-test to conform with the	Vasil Dimov	2010-04-19	1	-59/+42
\| \| \| \| \| \| \| \| \| \| \| \| \|	newly introduced metadata locks. Previously the behavior was deterministic and if several LOCKs were waiting the first one of them was released by UNLOCK (in chronological order). Now (with MDLs) the behavior is undefined and since we do not know in what order to --reap the connections we simply disconnect them without reaping.
*	Fix typo in comment.	Vasil Dimov	2010-04-19	1	-1/+1
\|
*	Move InnoDB mysql-tests to the innodb suite.	Vasil Dimov	2010-04-16	1	-0/+112