Viewing all changes in revision 1819.5.265.
- Committer: Stewart Smith
- Date: 2010-10-15 06:47:31 UTC
- mto: (2021.1.2 build) (1953.1.1 build) (1819.7.43 update-innobase)
- mto: This revision was merged to the branch mainline in revision 1924.
- Revision ID: stewart@flamingspork.com-20101015064731-njshn3boiul33i5j
Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6925 from MySQL InnoDB
Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6925
Also fix wait_condition for drizzle, and queries in the test.
Original Authors: mmakela
Original commit message:
branches/zip: Merge revisions 6921:6924 from branches/5.1:
------------------------------------------------------------------------
r6924 | mmakela | 2010-03-31 15:28:25 +0300 (Wed, 31 Mar 2010) | 1 line
Changed paths:
M /branches/5.1/mysql-test/innodb_bug51920.test
branches/5.1: innodb_bug51920.test: Fix a race condition.
------------------------------------------------------------------------
Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6925
Also fix wait_condition for drizzle, and queries in the test.
Original Authors: mmakela
Original commit message:
branches/zip: Merge revisions 6921:6924 from branches/5.1:
------------------------------------------------------------------------
r6924 | mmakela | 2010-03-31 15:28:25 +0300 (Wed, 31 Mar 2010) | 1 line
Changed paths:
M /branches/5.1/mysql-test/innodb_bug51920.test
branches/5.1: innodb_bug51920.test: Fix a race condition.
------------------------------------------------------------------------
expand all
collapse all
added
removed
