knielsen

$ ls inst/usr/support-files/
binary-configure   my-huge.cnf             mysqld_multi.server
config.huge.ini    my-innodb-heavy-4G.cnf  mysql-log-rotate
config.medium.ini  my-large.cnf            mysql.server
config.small.ini   my-medium.cnf           ndb-config-2-node.ini
magic              my-small.cnf            SELinux

knielsen

We get a crash:

#3  <signal handler called>
#4  0x0000000000d0aa44 in _db_flush_ () at /home/knielsen/my/10.0/work-10.0-mdev26/dbug/dbug.c:2139
#5  0x00000000005b3dd6 in next_event (rli=0x4820038) at /home/knielsen/my/10.0/work-10.0-mdev26/sql/slave.cc:5316
#6  0x00000000005ad98e in exec_relay_log_event (thd=0x4859480, rli=0x4820038) at /home/knielsen/my/10.0/work-10.0-mdev26/sql/slave.cc:3042
#7  0x00000000005b016f in handle_slave_sql (arg=0x481e940) at /home/knielsen/my/10.0/work-10.0-mdev26/sql/slave.cc:3965
#8  0x0000000000ca07fd in pfs_spawn_thread (arg=0x4915890) at /home/knielsen/my/10.0/work-10.0-mdev26/storage/perfschema/pfs.cc:1015
#9  0x00007f98cd89cb50 in start_thread (arg=<optimized out>) at pthread_create.c:304

knielsen

=== modified file 'include/my_dbug.h'
--- include/my_dbug.h	2012-02-21 21:15:44 +0000
+++ include/my_dbug.h	2013-03-26 12:48:43 +0000
@@ -89,7 +89,7 @@ extern  const char* _db_get_func_(void);
 #define DBUG_END()  _db_end_ ()
 #define DBUG_LOCK_FILE _db_lock_file_()
 #define DBUG_UNLOCK_FILE _db_unlock_file_()
-#define DBUG_ASSERT(A) do { _db_flush_(); assert(A); } while(0)
+#define DBUG_ASSERT(A) assert(A)
 #define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len))

knielsen

=== modified file 'mysql-test/suite/rpl/t/rpl_row_until.test'
--- mysql-test/suite/rpl/t/rpl_row_until.test	2011-05-05 23:50:31 +0000
+++ mysql-test/suite/rpl/t/rpl_row_until.test	2013-03-27 20:16:40 +0000
@@ -13,8 +13,8 @@ let $master_pos_drop_t1= query_get_value
 DROP TABLE t1;
 # Save master log position for query DROP TABLE t1
 save_master_pos;
-let $master_pos_drop_t1= query_get_value(SHOW BINLOG EVENTS, Pos, 7);
-let $master_log_file= query_get_value(SHOW BINLOG EVENTS, Log_name, 7);
+let $master_pos_drop_t1= query_get_value(SHOW BINLOG EVENTS, Pos, 8);

knielsen

    We keep a list of all the waiters that need to be processed in `list',
    linked through the next_subsequent_commit pointer. Initially this list
    contains only the entry passed into this function.

    We process entries in the list one by one. The element currently being
    processed is pointed to by `cur`, and the element at the end of the list
    is pointed to by `last` (we do not use NULL to terminate the list).

    As we process an element, it is first added to the group_commit_queue.

knielsen

=== modified file 'mysql-test/mysql-test-run.pl'
--- mysql-test/mysql-test-run.pl	2013-06-07 19:34:34 +0000
+++ mysql-test/mysql-test-run.pl	2013-09-11 22:54:26 +0000
@@ -5382,6 +5382,7 @@ sub start_servers($) {
 
     # Create the servers tmpdir
     my $tmpdir= $mysqld->value('tmpdir');
+    rmtree($tmpdir);
     mkpath($tmpdir) unless -d $tmpdir;
 

knielsen

=== modified file 'mysql-test/extra/rpl_tests/rpl_innodb.test'
--- mysql-test/extra/rpl_tests/rpl_innodb.test	2010-12-19 17:15:12 +0000
+++ mysql-test/extra/rpl_tests/rpl_innodb.test	2013-09-12 16:06:27 +0000
@@ -114,6 +114,11 @@ connection master;
 FLUSH LOGS;
 
 DROP DATABASE mysqltest1;
+# The temporary table mysqltest1.tmp2 is only dropped on the slave when the
+# owning connection on the master is closed. So do that now to not leave a
+# temporary table file around after this test terminates.

knielsen

1: begin; insert into t1 values (1,101);
2: begin; insert into t1 values (2,102);
3: begin; insert into t1 values (1,11);   # hangs
4: begin; insert into t1 values (2,12);   # hangs
5: begin; insert into t1 values (3,13);
2: rollback;                              # 4 wakes up
1: rollback;                              # 3 does not wake up!
5: rollback;
4: rollback;                              # now 3 wakes up!

knielsen

MariaDB [test]> SHOW INNODB ENGINE STATUS\G
ERROR 1064 (42000): You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INNODB ENGINE STATUS' at line 1
MariaDB [test]> SHOW ENGINE INNODB STATUS\G
*************************** 1. row ***************************
  Type: InnoDB
  Name: 
Status: 
=====================================
130918 13:48:14 INNODB MONITOR OUTPUT
=====================================

knielsen

=== modified file 'sql/slave.cc'
--- sql/slave.cc	2013-11-07 10:56:06 +0000
+++ sql/slave.cc	2013-11-08 11:34:13 +0000
@@ -4568,6 +4568,7 @@ log '%s' at position %s, relay log '%s'
   serial_rgi->thd= rli->sql_driver_thd= 0;
   mysql_mutex_lock(&LOCK_thread_count);
   THD_CHECK_SENTRY(thd);
+  thd->rgi_fake= thd->rgi_slave= NULL;
   delete serial_rgi;
   delete thd;