bk commit into 5.1 tree (hhunger:1.2589)

[horst]

Below is the list of changes that have just been committed into a local
5.1 repository of hhunger.  When hhunger does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-23 11:15:49+02:00, hhunger@stripped +6 -0
  Eightth set fixes for bug 35988

  mysql-test/r/group_concat_max_len_func.result@stripped, 2008-04-23 11:15:47+02:00, hhunger@stripped +2 -0
    Eightth set fixes for bug 35988

  mysql-test/r/timestamp_func.result@stripped, 2008-04-23 11:15:47+02:00, hhunger@stripped +6 -6
    Eightth set fixes for bug 35988

  mysql-test/t/disabled.def@stripped, 2008-04-23 11:15:47+02:00, hhunger@stripped +1 -0
    Eightth set fixes for bug 35988

  mysql-test/t/group_concat_max_len_func.test@stripped, 2008-04-23 11:15:47+02:00, hhunger@stripped +4 -0
    Eightth set fixes for bug 35988

  mysql-test/t/max_allowed_packet_func.test@stripped, 2008-04-23 11:15:47+02:00, hhunger@stripped +2 -0
    Eightth set fixes for bug 35988

  mysql-test/t/timestamp_func.test@stripped, 2008-04-23 11:15:47+02:00, hhunger@stripped +5 -5
    Eightth set fixes for bug 35988

diff -Nrup a/mysql-test/r/group_concat_max_len_func.result b/mysql-test/r/group_concat_max_len_func.result
--- a/mysql-test/r/group_concat_max_len_func.result	2008-04-10 15:12:45 +02:00
+++ b/mysql-test/r/group_concat_max_len_func.result	2008-04-23 11:15:47 +02:00
@@ -1,3 +1,4 @@
+SET @save = @@global.group_concat_max_len;
 drop table if exists t1;
 ## Creating new table t1 ##
 CREATE TABLE t1
@@ -75,3 +76,4 @@ id	rollno	group_concat(name)
 ## Dropping table t1 ##
 DROP table t1;
 ## Disconnecting both the connection ##
+SET @@group_concat_max_len = @save;
diff -Nrup a/mysql-test/r/timestamp_func.result b/mysql-test/r/timestamp_func.result
--- a/mysql-test/r/timestamp_func.result	2008-04-21 13:52:50 +02:00
+++ b/mysql-test/r/timestamp_func.result	2008-04-23 11:15:47 +02:00
@@ -7,18 +7,18 @@
 SET @ts_old = @@SESSION.timestamp;
 waiting 1 sec
 SET @ts_new = @@SESSION.timestamp;
-SELECT @ts_new - @ts_old AS 'Timestamp Difference';
+SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';
 Timestamp Difference
 1
-1 Expected
+1 means >=1 expected is true
 ** Connection con1 **
 SET @ts_old = @@SESSION.timestamp;
 waiting 4 sec
 SET @ts_new = @@SESSION.timestamp;
-SELECT @ts_new - @ts_old AS 'Timestamp Difference';
+SELECT @ts_new - @ts_old >= 4 AS 'Timestamp Difference';
 Timestamp Difference
-4
-4 Expected
+1
+1 means >=4 expected is true
 '#-----------------------------FN_DYNVARS_179_02---------------------#'
 SET @ts_old = @@SESSION.timestamp;
 Changing time zone
@@ -27,7 +27,7 @@ SET @ts_new = @@SESSION.timestamp;
 SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';
 Timestamp Difference
 1
->=1 Expected
+1 means >=1 expected is true
 ** Cleanup **
 ** Connection default **
 Disconnecting Connections con0, con1
diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2008-04-11 22:16:38 +02:00
+++ b/mysql-test/t/disabled.def	2008-04-23 11:15:47 +02:00
@@ -21,4 +21,5 @@ ps_ddl               : Bug#12093 2007-12
 csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
 event_scheduler_basic: BUG#35997 server seems to crash.
 event_scheduler_func: BUG#35997 server seems to crash.
+thread_cache_size_func: BUG#35988 Due to not deterministic results
 
diff -Nrup a/mysql-test/t/group_concat_max_len_func.test b/mysql-test/t/group_concat_max_len_func.test
--- a/mysql-test/t/group_concat_max_len_func.test	2008-04-10 15:13:52 +02:00
+++ b/mysql-test/t/group_concat_max_len_func.test	2008-04-23 11:15:47 +02:00
@@ -19,6 +19,7 @@
 #                                                                             #
 ###############################################################################
 
+SET @save = @@global.group_concat_max_len;
 
 --disable_warnings
 drop table if exists t1;
@@ -124,4 +125,7 @@ DROP table t1;
 DISCONNECT test_con2;
 DISCONNECT test_con1;
 
+connection default;
+
+SET @@group_concat_max_len = @save;
 
diff -Nrup a/mysql-test/t/max_allowed_packet_func.test b/mysql-test/t/max_allowed_packet_func.test
--- a/mysql-test/t/max_allowed_packet_func.test	2008-04-18 10:23:38 +02:00
+++ b/mysql-test/t/max_allowed_packet_func.test	2008-04-23 11:15:47 +02:00
@@ -19,6 +19,8 @@
 #                                                                             #
 ###############################################################################
 
+#due to lost connection on win64
+--source include/not_windows.inc
 
 let $start_global_value = `SELECT @@global.max_allowed_packet`;
 --echo $start_global_value
diff -Nrup a/mysql-test/t/timestamp_func.test b/mysql-test/t/timestamp_func.test
--- a/mysql-test/t/timestamp_func.test	2008-04-21 13:52:50 +02:00
+++ b/mysql-test/t/timestamp_func.test	2008-04-23 11:15:47 +02:00
@@ -38,8 +38,8 @@ SET @ts_old = @@SESSION.timestamp;
 --echo waiting 1 sec
 --sleep 1
 SET @ts_new = @@SESSION.timestamp;
-SELECT @ts_new - @ts_old AS 'Timestamp Difference';
---echo 1 Expected
+SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';
+--echo 1 means >=1 expected is true
 
 
 #
@@ -51,8 +51,8 @@ SET @ts_old = @@SESSION.timestamp;
 --echo waiting 4 sec
 --sleep 4
 SET @ts_new = @@SESSION.timestamp;
-SELECT @ts_new - @ts_old AS 'Timestamp Difference';
---echo 4 Expected
+SELECT @ts_new - @ts_old >= 4 AS 'Timestamp Difference';
+--echo 1 means >=4 expected is true
 
 --echo '#-----------------------------FN_DYNVARS_179_02---------------------#'
 #
@@ -65,7 +65,7 @@ SET @ts_old = @@SESSION.timestamp;
 SET time_zone = 'MET';
 SET @ts_new = @@SESSION.timestamp;
 SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';
---echo >=1 Expected
+--echo 1 means >=1 expected is true
 
 #
 # Cleanup