Merge 5.1->5.1-rpl

Fix paths and name of a few files to make it work with new mtr.pl

1 files changed, 129 insertions, 0 deletions

diff --git a/mysql-test/r/max_prepared_stmt_count_basic.result b/mysql-test/r/max_prepared_stmt_count_basic.result
new file mode 100644
index 00000000000..ebc7da8c7f8
--- /dev/null
+++ b/mysql-test/r/max_prepared_stmt_count_basic.result
@@ -0,0 +1,129 @@
+SET @start_value = @@global.max_prepared_stmt_count;
+SELECT @start_value;
+@start_value
+16382
+'#--------------------FN_DYNVARS_081_01------------------------#'
+SET @@global.max_prepared_stmt_count = 5000;
+SET @@global.max_prepared_stmt_count = DEFAULT;
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+16382
+'#---------------------FN_DYNVARS_081_02-------------------------#'
+SET @@global.max_prepared_stmt_count = @start_value;
+SELECT @@global.max_prepared_stmt_count = 16382;
+@@global.max_prepared_stmt_count = 16382
+1
+'#--------------------FN_DYNVARS_081_03------------------------#'
+SET @@global.max_prepared_stmt_count = 0;
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+0
+SET @@global.max_prepared_stmt_count = 1;
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+1
+SET @@global.max_prepared_stmt_count = 1048576;
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+1048576
+SET @@global.max_prepared_stmt_count = 1048575;
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+1048575
+SET @@global.max_prepared_stmt_count = 65535;
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+65535
+'#--------------------FN_DYNVARS_081_04-------------------------#'
+SET @@global.max_prepared_stmt_count = -1;
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+0
+SET @@global.max_prepared_stmt_count = 100000000000;
+Warnings:
+Warning	1292	Truncated incorrect max_prepared_stmt_count value: '100000000000'
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+1048576
+SET @@global.max_prepared_stmt_count = 10000.01;
+ERROR 42000: Incorrect argument type to variable 'max_prepared_stmt_count'
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+1048576
+SET @@global.max_prepared_stmt_count = -1024;
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+0
+SET @@global.max_prepared_stmt_count = 1048577;
+Warnings:
+Warning	1292	Truncated incorrect max_prepared_stmt_count value: '1048577'
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+1048576
+SET @@global.max_prepared_stmt_count = 104857612;
+Warnings:
+Warning	1292	Truncated incorrect max_prepared_stmt_count value: '104857612'
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+1048576
+'Bug # 34837: Errors are not coming on assigning invalid values to variable';
+SET @@global.max_prepared_stmt_count = ON;
+ERROR 42000: Incorrect argument type to variable 'max_prepared_stmt_count'
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+1048576
+SET @@global.max_prepared_stmt_count = 'test';
+ERROR 42000: Incorrect argument type to variable 'max_prepared_stmt_count'
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+1048576
+'#-------------------FN_DYNVARS_081_05----------------------------#'
+SET @@session.max_prepared_stmt_count = 4096;
+ERROR HY000: Variable 'max_prepared_stmt_count' is a GLOBAL variable and should be set with SET GLOBAL
+SELECT @@session.max_prepared_stmt_count;
+ERROR HY000: Variable 'max_prepared_stmt_count' is a GLOBAL variable
+'#----------------------FN_DYNVARS_081_06------------------------#'
+SELECT @@global.max_prepared_stmt_count = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='max_prepared_stmt_count';
+@@global.max_prepared_stmt_count = VARIABLE_VALUE
+1
+SELECT @@max_prepared_stmt_count = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+WHERE VARIABLE_NAME='max_prepared_stmt_count';
+@@max_prepared_stmt_count = VARIABLE_VALUE
+1
+'#---------------------FN_DYNVARS_081_07----------------------#'
+SET @@global.max_prepared_stmt_count = TRUE;
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+1
+SET @@global.max_prepared_stmt_count = FALSE;
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+0
+'#---------------------FN_DYNVARS_081_08----------------------#'
+SET @@global.max_prepared_stmt_count = 5000;
+SELECT @@max_prepared_stmt_count = @@global.max_prepared_stmt_count;
+@@max_prepared_stmt_count = @@global.max_prepared_stmt_count
+1
+'#---------------------FN_DYNVARS_081_09----------------------#'
+SET max_prepared_stmt_count = 6000;
+ERROR HY000: Variable 'max_prepared_stmt_count' is a GLOBAL variable and should be set with SET GLOBAL
+SELECT @@max_prepared_stmt_count;
+@@max_prepared_stmt_count
+5000
+SET local.max_prepared_stmt_count = 7000;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_prepared_stmt_count = 7000' at line 1
+SELECT local.max_prepared_stmt_count;
+ERROR 42S02: Unknown table 'local' in field list
+SET global.max_prepared_stmt_count = 8000;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_prepared_stmt_count = 8000' at line 1
+SELECT global.max_prepared_stmt_count;
+ERROR 42S02: Unknown table 'global' in field list
+SELECT max_prepared_stmt_count = @@session.max_prepared_stmt_count;
+ERROR 42S22: Unknown column 'max_prepared_stmt_count' in 'field list'
+SET @@global.max_prepared_stmt_count = @start_value;
+SELECT @@global.max_prepared_stmt_count;
+@@global.max_prepared_stmt_count
+16382