merge: 5.1 -> 5.1-rpl-merge

conflicts:
  Text conflict in mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
  Text conflict in mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test

mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc

@@ -36,7 +36,6 @@
 ############################################################################### 
 
 SET @start_value = @@global.query_cache_size;
-SELECT @start_value;
 
 --echo '#--------------------FN_DYNVARS_133_01------------------------#'
 ############################################################################### 
@@ -53,7 +52,7 @@ SELECT @@global.query_cache_size;
 ############################################### 
 
 SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size = 0;
+SELECT @@global.query_cache_size = @start_value; 
 
 --echo '#--------------------FN_DYNVARS_133_03------------------------#'
 ################################################################################ 
@@ -167,7 +166,6 @@ SELECT query_cache_size = @@session.query_cache_size;
 ##############################
 
 SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size;
 
 ######################################################################## 
 #              END OF query_cache_size TESTS                   #

mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc

@@ -74,8 +74,8 @@ SELECT @@session.query_prealloc_size   = 8192;
 SET @@global.query_prealloc_size   = 8192;
 SELECT @@global.query_prealloc_size  ;
 
-SET @@global.query_prealloc_size   = 4294967295;
+#SET @@global.query_prealloc_size   = 4294967295;
-SELECT @@global.query_prealloc_size  ;
+#SELECT @@global.query_prealloc_size  ;
 
 SET @@global.query_prealloc_size   = 655354;
 SELECT @@global.query_prealloc_size  ;
@@ -89,8 +89,8 @@ SELECT @@global.query_prealloc_size  ;
 SET @@session.query_prealloc_size   = 8192;
 SELECT @@session.query_prealloc_size  ;
 
-SET @@session.query_prealloc_size   = 4294967295;
+#SET @@session.query_prealloc_size   = 4294967295;
-SELECT @@session.query_prealloc_size  ;
+#SELECT @@session.query_prealloc_size  ;
 
 SET @@session.query_prealloc_size   = 655345;
 SELECT @@session.query_prealloc_size  ;
@@ -106,11 +106,11 @@ SELECT @@session.query_prealloc_size  ;
 SET @@global.query_prealloc_size   = 0;
 SELECT @@global.query_prealloc_size  ;
 
-SET @@global.query_prealloc_size   = -1024;
+#SET @@global.query_prealloc_size   = -1024;
-SELECT @@global.query_prealloc_size  ;
+#SELECT @@global.query_prealloc_size  ;
 
-SET @@global.query_prealloc_size   = 429496729533;
+#SET @@global.query_prealloc_size   = 429496729533;
-SELECT @@global.query_prealloc_size  ;
+#SELECT @@global.query_prealloc_size  ;
 
 
 --Error ER_PARSE_ERROR
@@ -137,8 +137,8 @@ SELECT @@global.query_prealloc_size  ;
 SET @@session.query_prealloc_size   = 0;
 SELECT @@session.query_prealloc_size  ;
 
-SET @@session.query_prealloc_size   = -2;
+#SET @@session.query_prealloc_size   = -2;
-SELECT @@session.query_prealloc_size  ;
+#SELECT @@session.query_prealloc_size  ;
 
 --Error ER_PARSE_ERROR
 

mysql-test/suite/sys_vars/inc/timestamp_basic.inc

@@ -18,8 +18,8 @@
 #              * Scope & Access method                                        #
 #              * Data Integrity                                               #
 #                                                                             #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
+# Reference:                                                                  #
-#  server-system-variables.html                                               #
+# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html         #
 #                                                                             #
 ###############################################################################
 
@@ -102,9 +102,10 @@ SET @@timestamp = 9999999999999999999999;
 #     Check if the value in SESSION Table matches value in variable     #
 #########################################################################
 
-SELECT @@timestamp = VARIABLE_VALUE 
+# disabled due to bug#41584
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+#SELECT @@timestamp = VARIABLE_VALUE 
-WHERE VARIABLE_NAME='timestamp';
+#FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+#WHERE VARIABLE_NAME='timestamp';
 
 --echo '#---------------------FN_DYNVARS_001_08-------------------------#'
 #############################################################################