Merge remote-tracking branch 'origin/5.5-galera' into bb-sachin-10.0-galera-mergebb-sachin-10.0-galera-merge

12 files changed, 54 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index f1c300a89c6..a328a85b8cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,6 +114,7 @@ scripts/mytop
 scripts/wsrep_sst_common
 scripts/wsrep_sst_mysqldump
 scripts/wsrep_sst_rsync
+scripts/wsrep_sst_rsync_wan
 scripts/wsrep_sst_xtrabackup
 scripts/wsrep_sst_xtrabackup-v2
 sql-bench/bench-count-distinct
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake
index a8b1bea3bbb..1bd1ca51b35 100644
--- a/cmake/wsrep.cmake
+++ b/cmake/wsrep.cmake
@@ -18,7 +18,7 @@
 # so WSREP_VERSION is produced regardless
 
 # Set the patch version
-SET(WSREP_PATCH_VERSION "19")
+SET(WSREP_PATCH_VERSION "20")
 
 # MariaDB addition: Revision number of the last revision merged from
 # codership branch visible in @@visible_comment.
diff --git a/debian/dist/Ubuntu/mariadb-galera-server-10.0.files.in b/debian/dist/Ubuntu/mariadb-galera-server-10.0.files.in
index 7fa0dd05cfb..8abb1e2818e 100644
--- a/debian/dist/Ubuntu/mariadb-galera-server-10.0.files.in
+++ b/debian/dist/Ubuntu/mariadb-galera-server-10.0.files.in
@@ -50,6 +50,7 @@ usr/bin/resolveip
 usr/bin/wsrep_sst_common
 usr/bin/wsrep_sst_mysqldump
 usr/bin/wsrep_sst_rsync
+usr/bin/wsrep_sst_rsync_wan
 usr/bin/wsrep_sst_xtrabackup
 usr/bin/wsrep_sst_xtrabackup-v2
 usr/share/doc/mariadb-galera-server-10.0/mysqld.sym.gz
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index d96eb005eed..d7470b3269d 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -48,3 +48,5 @@ galera.galera_wan : MDEV-12319 #Failed to start mysqld
 galera.rpl_row_annotate : MDEV-12319 #Failed to start mysqld
 galera.MW-44 : MDEV-12319
 galera.galera_var_slave_threads : MDEV-12319
+galera_var_dirty_reads :  MDEV-12539
+query_cache : MDEV-12539
diff --git a/mysql-test/suite/galera/t/galera_concurrent_ctas.test b/mysql-test/suite/galera/t/galera_concurrent_ctas.test
index f0dcf8e4900..8b9b461d0fd 100644
--- a/mysql-test/suite/galera/t/galera_concurrent_ctas.test
+++ b/mysql-test/suite/galera/t/galera_concurrent_ctas.test
@@ -43,10 +43,10 @@ let $run=10;
 while($run)
 {
   --error 0,1
-  exec $MYSQL --user=root --host=127.0.0.1 --port=$NODE_MYPORT_1 test
-         < $MYSQLTEST_VARDIR/tmp/galera_concurrent.sql &
-       $MYSQL --user=root --host=127.0.0.1 --port=$NODE_MYPORT_2 test
-         < $MYSQLTEST_VARDIR/tmp/galera_concurrent.sql;
+  exec $MYSQL --user=root --host=127.0.0.1 --port=$NODE_MYPORT_1 test \
+    < $MYSQLTEST_VARDIR/tmp/galera_concurrent.sql & \
+    $MYSQL --user=root --host=127.0.0.1 --port=$NODE_MYPORT_2 test \
+    < $MYSQLTEST_VARDIR/tmp/galera_concurrent.sql;
   dec $run;
 }
 
diff --git a/policy/selinux/mariadb-server.fc b/policy/selinux/mariadb-server.fc
index 1a69ecc2c40..409f72923aa 100644
--- a/policy/selinux/mariadb-server.fc
+++ b/policy/selinux/mariadb-server.fc
@@ -1,4 +1,4 @@
-# This SELinux file contexts (.fc) file has been copied under BSD License from
+# This SELinux file contexts (.fc) file has been copied under New BSD License from
 # Percona XtraDB Cluster.
 
 /etc/init\.d/rc\.d/mysql -- gen_context(system_u:object_r:mysqld_initrc_exec_t,s0)
diff --git a/policy/selinux/mariadb-server.te b/policy/selinux/mariadb-server.te
index 34d79326b10..45ef40f4153 100644
--- a/policy/selinux/mariadb-server.te
+++ b/policy/selinux/mariadb-server.te
@@ -1,4 +1,4 @@
-# This SELinux type enforcement (.te) file has been copied under BSD License
+# This SELinux type enforcement (.te) file has been copied under New BSD License
 # from Percona XtraDB Cluster, along with some additions.
 
 module mariadb-server 1.0;
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 06a6a206297..597f9a4a3f2 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -371,6 +371,22 @@ ELSE()
       COMPONENT ${${file}_COMPONENT}
      )
   ENDFOREACH()
+  SET (wsrep_sst_rsync_wan ${CMAKE_CURRENT_BINARY_DIR}/wsrep_sst_rsync_wan)
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${wsrep_sst_rsync_wan}
+    COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink
+      wsrep_sst_rsync
+      wsrep_sst_rsync_wan
+  )
+  ADD_CUSTOM_TARGET(symlink_wsrep_sst_rsync
+      ALL
+      DEPENDS ${wsrep_sst_rsync_wan}
+  )
+  INSTALL(
+    FILES  ${wsrep_sst_rsync_wan}
+    DESTINATION ${INSTALL_BINDIR}
+    COMPONENT Server
+  )
 ENDIF()
 
 # Install libgcc as  mylibgcc.a
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index d044992a02a..99d5e7154aa 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -961,6 +961,9 @@ max_fast_restarts=5
 # flag whether a usable sleep command exists
 have_sleep=1
 
+# maximum number of wsrep restarts
+max_wsrep_restarts=0
+
 # close stdout and stderr, everything goes to $logging now
 if expr "${-}" : '.*x' > /dev/null
 then
@@ -970,9 +973,6 @@ else
   exec 2>&-
 fi
 
-# maximum number of wsrep restarts
-max_wsrep_restarts=0
-
 while true
 do
   rm -f "$pid_file"	# Some extra safety
@@ -993,6 +993,12 @@ do
     eval_log_error "$cmd $wsrep_start_position_opt --wsrep_cluster_address=$url $nohup_redir"
   fi
 
+  if [ $want_syslog -eq 0 -a ! -f "$err_log" ]; then
+    touch "$err_log"                    # hypothetical: log was renamed but not
+    chown $user "$err_log"              # flushed yet. we'd recreate it with
+    chmod "$fmode" "$err_log"           # wrong owner next time we log, so set
+  fi                                    # it up correctly while we can!
+
   end_time=`date +%M%S`
 
   if test ! -f "$pid_file"		# This is removed if normal shutdown
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 353911dcfde..d1ed403aa76 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -204,8 +204,7 @@ wsrep_view_handler_cb (void*                    app_ctx,
 
   if (memcmp(&cluster_uuid, &view->state_id.uuid, sizeof(wsrep_uuid_t)))
   {
-    memcpy((wsrep_uuid_t*)&cluster_uuid, &view->state_id.uuid,
-           sizeof(cluster_uuid));
+    memcpy(&cluster_uuid, &view->state_id.uuid, sizeof(cluster_uuid));
 
     wsrep_uuid_print (&cluster_uuid, cluster_uuid_str,
                       sizeof(cluster_uuid_str));
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/disabled.def b/storage/tokudb/mysql-test/tokudb_bugs/disabled.def
index d0d1a47e006..70b62525c87 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/disabled.def
+++ b/storage/tokudb/mysql-test/tokudb_bugs/disabled.def
@@ -1,2 +1,16 @@
+memcache_dirty : #4609 memcache patch from facebook not ported to mysql 5.5
+4472 : #4521 MDL for alter table in 5.5 prohibits this test from having any chance of working
+
+tokudb_drop_part_table_668:
+tokudb_drop_simple_table_668:
 5585: times out, too many huge insert...selects
+2952: Not for 5.5
+fileops-2: Not for 5.5
+fileops-3: Not for 5.5
+fileops-4: Not for 5.5
+xa-2: Not for 5.5
+6053: N/A
+
+checkpoint_lock_2: test can not work when the checkpoint_safe_lock is a fair rwlock
+xa-3 : failed in 5.5.56-galera
 db233: different execution path in mariadb, debug_sync point is not hit
diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh
index a5390855ca1..51ce3dca2dd 100644
--- a/support-files/wsrep.cnf.sh
+++ b/support-files/wsrep.cnf.sh
@@ -30,6 +30,9 @@ bind-address=0.0.0.0
 ## WSREP options
 ##
 
+# Enable wsrep
+wsrep_on=1
+
 # Full path to wsrep provider library or 'none'
 wsrep_provider=none