bzr push into mysql-5.1 branch (hhunger:2679)

[Horst Hunger]

 2679 Horst Hunger	2008-07-10 [merge]
      merge from bugteam tree.
removed:
  mysql-test/suite/parts/r/ndb_blob_partition.result
  mysql-test/suite/parts/r/ndb_partition_error.result
  mysql-test/suite/parts/r/ndb_partition_key.result
  mysql-test/suite/parts/r/ndb_partition_list.result
  mysql-test/suite/parts/r/ndb_partition_range.result
  mysql-test/suite/parts/r/rpl_ndb_dd_partitions.result
  mysql-test/suite/parts/t/ndb_blob_partition.test
  mysql-test/suite/parts/t/ndb_partition_error.test
  mysql-test/suite/parts/t/ndb_partition_key.test
  mysql-test/suite/parts/t/ndb_partition_list.test
  mysql-test/suite/parts/t/ndb_partition_range.test
  mysql-test/suite/parts/t/rpl_ndb_dd_partitions.test
added:
  mysql-test/r/subselect_debug.result
  mysql-test/t/subselect_debug.test
modified:
  client/mysqltest.c
  mysql-test/include/have_big5.inc
  mysql-test/include/have_binlog_format_mixed.inc
  mysql-test/include/have_binlog_format_mixed_or_row.inc
  mysql-test/include/have_binlog_format_mixed_or_statement.inc
  mysql-test/include/have_binlog_format_row.inc
  mysql-test/include/have_binlog_format_row_or_statement.inc
  mysql-test/include/have_binlog_format_statement.inc
  mysql-test/include/have_bug25714.inc
  mysql-test/include/have_case_sensitive_file_system.inc
  mysql-test/include/have_community_features.inc
  mysql-test/include/have_compress.inc
  mysql-test/include/have_cp1250_ch.inc
  mysql-test/include/have_cp932.inc
  mysql-test/include/have_crypt.inc
  mysql-test/include/have_debug.inc
  mysql-test/include/have_eucjpms.inc
  mysql-test/include/have_euckr.inc
  mysql-test/include/have_example_plugin.inc
  mysql-test/include/have_gb2312.inc
  mysql-test/include/have_gbk.inc
  mysql-test/include/have_geometry.inc
  mysql-test/include/have_latin2_ch.inc
  mysql-test/include/have_log_bin.inc
  mysql-test/include/have_lowercase0.inc
  mysql-test/include/have_ndbapi_examples.inc
  mysql-test/include/have_outfile.inc
  mysql-test/include/have_partition.inc
  mysql-test/include/have_query_cache.inc
  mysql-test/include/have_sjis.inc
  mysql-test/include/have_ssl.inc
  mysql-test/include/have_symlink.inc
  mysql-test/include/have_tis620.inc
  mysql-test/include/have_ucs2.inc
  mysql-test/include/have_udf.inc
  mysql-test/include/have_ujis.inc
  mysql-test/r/comments.result
  mysql-test/r/func_misc.result
  mysql-test/r/group_min_max_innodb.result
  mysql-test/r/mysqltest.result
  mysql-test/r/parser.result
  mysql-test/r/partition.result
  mysql-test/r/partition_hash.result
  mysql-test/r/partition_pruning.result
  mysql-test/r/partition_range.result
  mysql-test/r/ps.result
  mysql-test/r/ps_ddl.result
  mysql-test/r/ps_ddl1.result
  mysql-test/r/sp-error.result
  mysql-test/r/subselect.result
  mysql-test/r/varbinary.result
  mysql-test/suite/funcs_1/r/innodb_storedproc.result
  mysql-test/suite/funcs_1/r/memory_storedproc.result
  mysql-test/suite/funcs_1/r/myisam_storedproc.result
  mysql-test/suite/funcs_1/r/ndb_storedproc.result
  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
  mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
  mysql-test/suite/funcs_2/charset/charset_master.test
  mysql-test/suite/funcs_2/t/innodb_charset.test
  mysql-test/suite/funcs_2/t/memory_charset.test
  mysql-test/suite/funcs_2/t/myisam_charset.test
  mysql-test/suite/funcs_2/t/ndb_charset.test
  mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc
  mysql-test/suite/parts/inc/partition_alter_11.inc
  mysql-test/suite/parts/inc/partition_bigint.inc
  mysql-test/suite/parts/inc/partition_check_drop.inc
  mysql-test/suite/parts/inc/partition_int.inc
  mysql-test/suite/parts/inc/partition_layout.inc
  mysql-test/suite/parts/inc/partition_layout_check1.inc
  mysql-test/suite/parts/inc/partition_layout_check2.inc
  mysql-test/suite/parts/inc/partition_mediumint.inc
  mysql-test/suite/parts/inc/partition_smallint.inc
  mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
  mysql-test/suite/parts/inc/partition_tinyint.inc
  mysql-test/suite/parts/r/ndb_dd_backuprestore.result
  mysql-test/suite/parts/r/part_supported_sql_func_ndb.result
  mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
  mysql-test/suite/parts/r/partition_alter1_1_innodb.result
  mysql-test/suite/parts/r/partition_alter1_1_myisam.result
  mysql-test/suite/parts/r/partition_alter1_2_innodb.result
  mysql-test/suite/parts/r/partition_alter1_2_myisam.result
  mysql-test/suite/parts/r/partition_alter2_innodb.result
  mysql-test/suite/parts/r/partition_alter2_myisam.result
  mysql-test/suite/parts/r/partition_alter3_innodb.result
  mysql-test/suite/parts/r/partition_alter3_myisam.result
  mysql-test/suite/parts/r/partition_basic_innodb.result
  mysql-test/suite/parts/r/partition_basic_myisam.result
  mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
  mysql-test/suite/parts/r/partition_engine_myisam.result
  mysql-test/suite/parts/r/partition_engine_ndb.result
  mysql-test/suite/parts/r/partition_int_innodb.result
  mysql-test/suite/parts/r/partition_int_myisam.result
  mysql-test/suite/parts/r/partition_int_ndb.result
  mysql-test/suite/parts/r/partition_syntax_myisam.result
  mysql-test/suite/parts/t/disabled.def
  mysql-test/suite/parts/t/ndb_dd_backuprestore.test
  mysql-test/suite/parts/t/part_supported_sql_func_ndb.test
  mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test
  mysql-test/suite/parts/t/partition_alter1_1_ndb.test
  mysql-test/suite/parts/t/partition_alter1_2_ndb.test
  mysql-test/suite/parts/t/partition_alter2_ndb.test
  mysql-test/suite/parts/t/partition_basic_ndb.test
  mysql-test/suite/parts/t/partition_bit_ndb.test
  mysql-test/suite/parts/t/partition_engine_ndb.test
  mysql-test/suite/parts/t/partition_int_ndb.test
  mysql-test/suite/parts/t/partition_syntax_ndb.test
  mysql-test/suite/parts/t/partition_value_ndb.test
  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
  mysql-test/t/func_misc.test
  mysql-test/t/group_min_max_innodb.test
  mysql-test/t/mysqltest.test
  mysql-test/t/parser.test
  mysql-test/t/ps_ddl.test
  mysql-test/t/ps_ddl1.test
  mysql-test/t/sp-error.test
  mysql-test/t/subselect.test
  mysql-test/t/varbinary.test
  mysys/default.c
  sql/ha_partition.cc
  sql/ha_partition.h
  sql/item.cc
  sql/item_strfunc.cc
  sql/item_subselect.cc
  sql/log_event.cc
  sql/sp_cache.cc
  sql/sp_cache.h
  sql/sql_lex.cc
  sql/sql_parse.cc
  sql/sql_prepare.cc
  sql/sql_select.cc
  sql/sql_yacc.yy

=== modified file 'mysql-test/r/max_user_connections_func.result'
--- a/mysql-test/r/max_user_connections_func.result	2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/max_user_connections_func.result	2008-07-10 14:03:49 +0000
@@ -1,6 +1,6 @@
 ** Setup **
 
-SET @default_max_user_connections = @@max_user_connections;
+SET @default_max_user_connections = @@global.max_user_connections;
 Set Global max_user_connections=2;
 '#--------------------FN_DYNVARS_114_01-------------------------#'
 ** Connecting conn1 using username 'root' **
@@ -9,10 +9,11 @@ Set Global max_user_connections=2;
 ERROR 42000: User root already has more than 'max_user_connections' active connections
 Expected error "too many connections"
 ** Disconnecting conn1 **
+** Poll till disconnected conn1 disappears from processlist
 '#--------------------FN_DYNVARS_114_02-------------------------#'
 Set Global max_user_connections=3;
 ** Connecting conn5 using username 'root' **
 ** Connecting conn6 using username 'root' **
 ** Connection default **
 ** Disconnecting conn5, conn6 **
-SET GLOBAL max_user_connections = @default_max_user_connections;
+SET @@global.max_user_connections = @default_max_user_connections;

=== modified file 'mysql-test/t/max_user_connections_func.test'
--- a/mysql-test/t/max_user_connections_func.test	2008-04-11 19:59:33 +0000
+++ b/mysql-test/t/max_user_connections_func.test	2008-07-10 14:03:49 +0000
@@ -9,15 +9,18 @@
 #                                                                            #
 #                                                                            #
 # Creation Date: 2008-03-02                                                  #
-# Author:  Sharique Abdullah                                                     #
+# Author:  Sharique Abdullah                                                 #
 #                                                                            #
 # Description: Test Cases of Dynamic System Variable "max_user_connections   #
 #              that checks behavior of this variable in the following ways   #
 #              * Functionality based on different values                     #
 #                                                                            #
-#Reference:http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html
+# Reference:                                                                 #
+#    http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html     #
 # option_mysqld_max_user_connections                                         #
 #                                                                            #
+# Modified: 2008-07-10 HHUNGER: Inserted wait condition                      #
+#                                                                            #
 ##############################################################################
 
 --echo ** Setup **
@@ -28,8 +31,7 @@
 
 --source include/not_embedded.inc
 
-SET @default_max_user_connections = @@max_user_connections;
-
+SET @default_max_user_connections = @@global.max_user_connections;
 
 ###################################
 #Setting value max_user_connection#
@@ -37,13 +39,10 @@ SET @default_max_user_connections = @@ma
 
 Set Global max_user_connections=2;
 
-
-
 --echo '#--------------------FN_DYNVARS_114_01-------------------------#'
-#######################################
-#should not make more then 2 connection#
-#######################################
-
+########################################
+#Should not make more then 2 connection#
+########################################
 
 --echo ** Connecting conn1 using username 'root' **
 CONNECT (conn1,localhost,root,,);
@@ -61,22 +60,22 @@ CONNECT (conn3,localhost,root,,);
 --echo ** Disconnecting conn1 **
 DISCONNECT conn1;
 
-
-
+--echo ** Poll till disconnected conn1 disappears from processlist
+let $wait_condition= SELECT count(id) <= 2
+   FROM information_schema.processlist WHERE user = 'root';
+--source include/wait_condition.inc
 
 --echo '#--------------------FN_DYNVARS_114_02-------------------------#'
 #####################################################
-#set value to 3 and see if 3 connections can be made#
+#Set value to 3 and see if 3 connections can be made#
 #####################################################
 
-
 Set Global max_user_connections=3;
 --echo ** Connecting conn5 using username 'root' **
 CONNECT (conn5,localhost,root,,);
 --echo ** Connecting conn6 using username 'root' **
 CONNECT (conn6,localhost,root,,);
 
-
 #
 # Cleanup
 #
@@ -89,7 +88,5 @@ DISCONNECT conn2;
 DISCONNECT conn5;
 DISCONNECT conn6;
 
-SET GLOBAL max_user_connections = @default_max_user_connections;
+SET @@global.max_user_connections = @default_max_user_connections;
 
---disable_info
---enable_warnings