mariadb

Tree: 20f9d908bf

mmakela 20f9d908bf branches/innodb+: Merge revisions r6897:6925 from branches/zip. Skip r6900, which was backported from branches/innodb+ 6899. ------------------------------------------------------------------------ r6919 \| mmakela \| 2010-03-31 11:34:22 +0300 (Wed, 31 Mar 2010) \| 54 lines Changed paths: M /branches/zip/ChangeLog M /branches/zip/handler/ha_innodb.cc M /branches/zip/mysql-test/innodb_bug38231.test A /branches/zip/mysql-test/innodb_bug51920.result A /branches/zip/mysql-test/innodb_bug51920.test M /branches/zip/row/row0sel.c M /branches/zip/srv/srv0srv.c branches/zip: Merge revisions 6788:6918 from branches/5.1: ------------------------------------------------------------------------ r6822 \| vasil \| 2010-03-15 10:17:31 +0200 (Mon, 15 Mar 2010) \| 12 lines Changed paths: M /branches/5.1/row/row0sel.c branches/5.1: Typecast to silence a compiler warning: row/row0sel.c: 4548 C4244: '=' : conversion from 'float' to 'ib_ulonglong', possible loss of data row/row0sel.c: 4553 C4244: '=' : conversion from 'double' to 'ib_ulonglong', possible loss of data Reported by: Jonas Oreland <Jonas.Oreland@Sun.COM> Discussed with: Sunny Bains <sunny.bains@oracle.com> ------------------------------------------------------------------------ r6884 \| vdimov \| 2010-03-26 13:05:03 +0200 (Fri, 26 Mar 2010) \| 6 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug38231.test branches/5.1: Fix a non-determinism in innodb_bug38231. Reported by: Sergey Vojtovich <svoj@Sun.COM> ------------------------------------------------------------------------ r6911 \| vdimov \| 2010-03-30 11:39:02 +0300 (Tue, 30 Mar 2010) \| 2 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Whitespace fixup ------------------------------------------------------------------------ r6912 \| vdimov \| 2010-03-30 12:18:46 +0300 (Tue, 30 Mar 2010) \| 2 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Whitespace fixup on line 354 ------------------------------------------------------------------------ r6918 \| mmakela \| 2010-03-31 11:14:51 +0300 (Wed, 31 Mar 2010) \| 6 lines Changed paths: A /branches/5.1/mysql-test/innodb_bug51920.result A /branches/5.1/mysql-test/innodb_bug51920.test M /branches/5.1/srv/srv0srv.c branches/5.1: Obey KILL during a lock wait (Bug #51920). srv_suspend_mysql_thread(), srv_lock_timeout_and_monitor_thread(): Check trx_is_interrupted() in addition to checking the lock wait timeout. rb://279 approved by Sunny Bains ------------------------------------------------------------------------ ------------------------------------------------------------------------ r6920 \| mmakela \| 2010-03-31 11:49:08 +0300 (Wed, 31 Mar 2010) \| 1 line Changed paths: M /branches/zip/row/row0sel.c branches/zip: Fix a compilation error that sneaked in in r6919. ------------------------------------------------------------------------ r6922 \| mmakela \| 2010-03-31 14:54:30 +0300 (Wed, 31 Mar 2010) \| 11 lines Changed paths: M /branches/zip/mysql-test/innodb_bug51920.result M /branches/zip/mysql-test/innodb_bug51920.test branches/zip: Merge revisions 6918:6921 from branches/5.1: ------------------------------------------------------------------------ r6921 \| mmakela \| 2010-03-31 14:33:04 +0300 (Wed, 31 Mar 2010) \| 2 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug51920.result M /branches/5.1/mysql-test/innodb_bug51920.test branches/5.1: innodb_bug51920.test: Make the test quicker and more deterministic. Suggested by Vasil Dimov. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r6925 \| mmakela \| 2010-03-31 15:30:56 +0300 (Wed, 31 Mar 2010) \| 9 lines 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. ------------------------------------------------------------------------ ------------------------------------------------------------------------		16 years ago
..
ha_innodb.cc	branches/innodb+: Merge revisions r6897:6925 from branches/zip.	16 years ago
ha_innodb.h	Non-functional change: update copyright year to 2010 of the files	16 years ago
handler0alter.cc	branches/innodb+: Merge revisions 6773:6801 from branches/zip:	16 years ago
i_s.cc	branches/innodb+: Merged revisions 5525:5971 from branches/zip	16 years ago
i_s.h	branches/innodb+: Merge revisions 5091:5143 from branches/zip:	17 years ago
mysql_addons.cc	branches/innodb+: Merge revisions 5091:5143 from branches/zip:	17 years ago