mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/innodb_plugin
History
Vasil Dimov 56586334f1 Merge from mysql-trunk-innodb into mysql-5.1-innodb/storage/innodb_plugin: 
------------------------------------------------------------
  revno: 3094
  revision-id: vasil.dimov@oracle.com-20100513074652-0cvlhgkesgbb2bfh
  parent: vasil.dimov@oracle.com-20100512173700-byf8xntxjur1hqov
  committer: Vasil Dimov <vasil.dimov@oracle.com>
  branch nick: mysql-trunk-innodb
  timestamp: Thu 2010-05-13 10:46:52 +0300
  message:
    Followup to Bug#51920, fix binlog.binlog_killed
    
    This is a followup to the fix of
    
    Bug#51920 Innodb connections in row lock wait ignore KILL until lock wait
    timeout
    
    in that fix (rb://279) the behavior was changed to honor when a trx is
    interrupted during lock wait, but the returned error code was still
    "lock wait timeout" when it should be "interrupted".
    
    This change fixes the non-deterministically failing test binlog.binlog_killed,
    that failed like this:
    
    binlog.binlog_killed 'stmt'              [ fail ]
            Test ended at 2010-05-12 11:39:08
    
    CURRENT_TEST: binlog.binlog_killed
    mysqltest: At line 208: query 'reap' failed with wrong errno 1205: 'Lock wait timeout exceeded; try restarting transaction', instead of 0...
    
    Approved by:	Sunny Bains (rb://344)
  ------------------------------------------------------------
2010-05-20 10:50:07 +03:00
..
btr Add Valgrind checks to compressed BLOB access. 2010-05-19 10:58:43 +03:00
buf Silence some more bogus Valgrind warnings on non-32-bit systems. (Bug #53307) 2010-05-19 11:01:52 +03:00
data dtuple_convert_big_rec(): Store locally any fields whose maximum length 2010-04-21 12:50:33 +03:00
dict Make the InnoDB FOREIGN KEY parser understand multi-statements. (Bug #48024) 2010-05-14 16:08:15 +03:00
dyn
eval
fil Applying InnoDB snapshot 2010-04-01 17:01:22 +04:00
fsp fsp_init_file_page_low(): Zero out the page. (Bug #53306) 2010-05-04 16:09:17 +03:00
fut
ha Merge from innodb-branches-zip 2010-04-07 22:42:25 +03:00
handler Make the InnoDB FOREIGN KEY parser understand multi-statements. (Bug #48024) 2010-05-14 16:08:15 +03:00
ibuf Applying InnoDB snapshot 2010-04-01 15:17:10 +04:00
include Make UNIV_DEBUG Valgrind friendly. Use | instead of +, 2010-05-19 11:07:43 +03:00
lock Reduce the next-key locking of READ UNCOMMITTED to match that of 2010-04-29 15:27:43 +02:00
log recv_sys_init(), recv_sys_empty_hash(): Shrink recv_sys->addr_hash. 2010-04-29 15:37:50 +02:00
mach
mem Applying InnoDB snapshot 2010-04-01 15:59:25 +04:00
mtr
mysql-test/patches Move the InnoDB Plugin tests from storage/innodb_plugin/mysql-test/ where 2010-04-09 15:56:51 +03:00
os Applying InnoDB snapshot 2010-04-01 16:27:53 +04:00
page Silence some more bogus Valgrind warnings on non-32-bit systems. (Bug #53307) 2010-05-19 11:01:52 +03:00
pars Applying InnoDB Plugin 1.0.6 snapshot,part 1. Fixes BUG#45992 and BUG#46656 2009-11-30 17:02:05 +05:30
que Applying InnoDB Plugin 1.0.6 snapshot,part 1. Fixes BUG#45992 and BUG#46656 2009-11-30 17:02:05 +05:30
read
rem Merge a contribution from Ryan Mack at Facebook: 2010-05-05 15:39:01 +03:00
row Merge from mysql-trunk-innodb into mysql-5.1-innodb/storage/innodb_plugin: 2010-05-20 10:50:07 +03:00
scripts Applying Innodb Plugin 1.0.5 snapshot, part 14 2009-10-12 18:26:02 +05:30
srv Merge from mysql-trunk-innodb into mysql-5.1-innodb/storage/innodb_plugin: 2010-05-20 10:50:07 +03:00
sync Applying InnoDB snapshot 2010-04-01 15:59:25 +04:00
thr Applying InnoDB Plugin 1.0.6 snapshot,part 1. Fixes BUG#45992 and BUG#46656 2009-11-30 17:02:05 +05:30
trx Make the InnoDB FOREIGN KEY parser understand multi-statements. (Bug #48024) 2010-05-14 16:08:15 +03:00
usr Applying InnoDB Plugin 1.0.6 snapshot,part 1. Fixes BUG#45992 and BUG#46656 2009-11-30 17:02:05 +05:30
ut Applying InnoDB snapshot 2010-04-01 16:56:22 +04:00
ChangeLog Document Bug #48024 and Bug #53644 in the ChangeLog 2010-05-14 16:10:50 +03:00
CMakeLists.txt Reapply changes to storage/innodb_plugin/CMakeLists.txt that were made by MySQL 2010-04-07 20:21:15 +03:00
compile-innodb
compile-innodb-debug
COPYING
COPYING.Google
COPYING.Percona
COPYING.Sun_Microsystems
Doxyfile
ha_innodb.def
Makefile.am Repply changes to storage/innodb_plugin/Makefile.am that were made by MySQL 2010-04-07 20:24:43 +03:00
plug.in Repply changes to storage/innodb_plugin/plug.in that were made by MySQL 2010-04-07 21:33:36 +03:00
revert_gen.sh Applying Innodb Plugin 1.0.5 snapshot, part 14 2009-10-12 18:26:02 +05:30
setup.sh