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

1 files changed, 100 insertions, 0 deletions

diff --git a/mysql-test/suite/sys_vars/t/ssl_capath_basic.test b/mysql-test/suite/sys_vars/t/ssl_capath_basic.test
new file mode 100644
index 00000000000..c32b572fb1b
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/ssl_capath_basic.test
@@ -0,0 +1,100 @@
+
+
+################## mysql-test\t\ssl_capath_basic.test #########################
+#                                                                             #
+# Variable Name: ssl_capath                                                   #
+# Scope: Global                                                               #
+# Access Type: Static                                                         #
+# Data Type: filename                                                         #
+#                                                                             #
+#                                                                             #
+# Creation Date: 2008-02-07                                                   #
+# Author : Sharique Abdullah                                                      #
+#                                                                             #
+#                                                                             #
+# Description:Test Cases of Dynamic System Variable ssl_capath                #
+#             that checks the behavior of this variable in the following ways #
+#              * Value Check                                                  #
+#              * Scope Check                                                  #
+#                                                                             #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
+#  server-system-variables.html                                               #
+#                                                                             #
+###############################################################################
+
+--echo '#---------------------BS_STVARS_046_01----------------------#'
+####################################################################
+#   Displaying default value                                       #
+####################################################################
+SELECT COUNT(@@GLOBAL.ssl_capath);
+--echo 1 Expected
+
+
+--echo '#---------------------BS_STVARS_046_02----------------------#'
+####################################################################
+#   Check if Value can set                                         #
+####################################################################
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET @@GLOBAL.ssl_capath=1;
+--echo Expected error 'Read only variable'
+
+SELECT COUNT(@@GLOBAL.ssl_capath);
+--echo 1 Expected
+
+
+
+
+--echo '#---------------------BS_STVARS_046_03----------------------#'
+#################################################################
+# Check if the value in GLOBAL Table matches value in variable  #
+#################################################################
+
+SELECT @@GLOBAL.ssl_capath = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='ssl_capath';
+--echo 1 Expected
+
+SELECT COUNT(@@GLOBAL.ssl_capath);
+--echo 1 Expected
+
+SELECT COUNT(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='ssl_capath';
+--echo 1 Expected
+
+
+
+--echo '#---------------------BS_STVARS_046_04----------------------#'
+################################################################################
+#  Check if accessing variable with and without GLOBAL point to same variable  #
+################################################################################
+SELECT @@ssl_capath = @@GLOBAL.ssl_capath;
+--echo 1 Expected
+
+
+
+--echo '#---------------------BS_STVARS_046_05----------------------#'
+################################################################################
+#   Check if ssl_capath can be accessed with and without @@ sign               #
+################################################################################
+
+SELECT COUNT(@@ssl_capath);
+--echo 1 Expected
+
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@local.ssl_capath);
+--echo Expected error 'Variable is a GLOBAL variable'
+
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@SESSION.ssl_capath);
+--echo Expected error 'Variable is a GLOBAL variable'
+
+SELECT COUNT(@@GLOBAL.ssl_capath);
+--echo 1 Expected
+
+--Error ER_BAD_FIELD_ERROR
+SELECT ssl_capath = @@SESSION.ssl_capath;
+--echo Expected error 'Readonly variable'
+
+