nirbhayc

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 6c8f79b..9b99798 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5194,6 +5194,7 @@ static int init_server_components()
 
   tc_log= 0; // ha_initialize_handlerton() needs that
 
+  printf("======> plugin_init() called..\n");
   if (plugin_init(&remaining_argc, remaining_argv,

nirbhayc

diff --git a/mysql-test/r/reopen_temp_table.result b/mysql-test/r/reopen_temp_table.result
index 6d85703..08affaa 100644
--- a/mysql-test/r/reopen_temp_table.result
+++ b/mysql-test/r/reopen_temp_table.result
@@ -151,5 +151,18 @@ SELECT COUNT(*) FROM t4;
 COUNT(*)
 4
 DROP TABLE t4;
+CREATE TABLE t5 (a INT) ENGINE=INNODB;
+CREATE TEMPORARY TABLE t6 (a INT) ENGINE=INNODB;

nirbhayc

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index c5510d9..87e6788 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1337,6 +1337,9 @@ TABLE_LIST* find_dup_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list,
   DBUG_ENTER("find_dup_table");
   DBUG_PRINT("enter", ("table alias: %s", table->alias));
 
+  if (table_list == 0)
+    DBUG_RETURN(0);

nirbhayc

From 0da548438fbf7dd399a2a73d4fcc7ddf7b9d8472 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <[email protected]>
Date: Mon, 13 Jun 2016 16:21:41 -0400
Subject: [PATCH] MDEV-10216: Assertion
 `strcmp(share->unique_file_name,filename) ||

.. share->last_version' failed in myisam/mi_open.c:67: test_if_reopen

During the RENAME operation since the renamed temporary table
is also opened and added to myisam_open_list/ maria_open_list,

nirbhayc

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 0be329e..dcf6ab8 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -8151,12 +8151,15 @@ static bool fk_prepare_copy_alter_table(THD *thd, TABLE *table,
 
   if (keys_onoff != Alter_info::LEAVE_AS_IS)
   {
-    if (wait_while_table_is_used(thd, table, extra_func))
-      DBUG_RETURN(true);

nirbhayc

diff --git a/sql/log.cc b/sql/log.cc
index a938dcb..953990f 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -3690,7 +3690,10 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
     new_xid_list_entry->binlog_id= current_binlog_id;
     /* Remove any initial entries with no pending XIDs.  */
     while ((b= binlog_xid_count_list.head()) && b->xid_count == 0)
+    {
       my_free(binlog_xid_count_list.get());

nirbhayc

=== modified file 'conf/galera/galera_stress.yy'
--- conf/galera/galera_stress.yy	2013-06-21 23:07:00 +0000
+++ conf/galera/galera_stress.yy	2016-07-12 21:52:35 +0000
@@ -67,8 +67,7 @@
 	i_r INTO _table ( _field_no_pk ) SELECT _field_key FROM _table AS X where ORDER BY _field_list LIMIT large_digit;
 
 i_r:
-	INSERT ignore |
-	REPLACE;
+	INSERT ignore;

nirbhayc

--- /tmp/test.sh	2016-07-15 17:13:27.034322105 -0400
+++ MDEV-10314.sh	2016-07-15 17:10:15.862781840 -0400
@@ -14,27 +14,26 @@
 ###################################################
 ### Create test table ############################
 ###################################################
-mysql -h $SOURCE -u root -ppass123 -e "CREATE TABLE test.t1 (id INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;commit;"
-mysql -h $SOURCE -u root -ppass123 -e "INSERT INTO test.t1 VALUES (DEFAULT);commit;"
+mysql -h $SOURCE -u root -ppass123 -e "CREATE TABLE test.t1 (id INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;"
+mysql -h $SOURCE -u root -ppass123 -e "INSERT INTO test.t1 VALUES (DEFAULT);"

nirbhayc

--- /tmp/simplified.java	2016-07-15 17:13:07.444531838 -0400
+++ MDEV-10314.java	2016-07-15 17:12:21.665653332 -0400
@@ -85,7 +85,7 @@
         String url = "jdbc:mysql://" + nodeAddr + "/" + simplified.cfg.dbName;
         System.out.println("Getting connection from " + url);
         Connection conn = DriverManager.getConnection(url, simplified.cfg.user, simplified.cfg.pass);
-        conn.setAutoCommit(false);
+        conn.setAutoCommit(true);
         conn.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
         Statement stmt = conn.createStatement();

nirbhayc

#!/bin/bash

if [ "$#" -ne 2 ]; then
  echo "Usage: ./test.sh <IP-Address-MariaDB-Server-1> <IP-Address-MariaDB-Server-2>"
  echo "We will be writing to server-1 and checking if replication is synchronous on server-2" 
  exit 1
fi

SOURCE=$1
REPLICA=$2