From e6f15deb9c90c520df05d20e3741fbf519520666 Mon Sep 17 00:00:00 2001
From: Luis Soares <luis.soares@sun.com>
Date: Wed, 3 Jun 2009 15:14:18 +0100
Subject: [PATCH 01/25] BUG#44270: RESET SLAVE does not reset Last_IO_Error or
 Last_IO_Errno

The server was not cleaning the last IO error and error number when
resetting slave.

This patch addresses this issue by backporting into 5.1 part of the
patch in BUG 34654. A fix for this issue had already been pushed into
6.0 as part of the aforementioned bug, however the patch also included
some refactoring. The fix for 5.1 does not take into account the
refactoring part.
---
 .../extra/rpl_tests/rpl_reset_slave.test      | 54 +++++++++++++++++++
 .../suite/rpl/r/rpl_row_reset_slave.result    | 23 ++++++++
 .../suite/rpl/r/rpl_stm_reset_slave.result    | 23 ++++++++
 sql/slave.cc                                  |  3 ++
 sql/sql_repl.cc                               |  1 +
 5 files changed, 104 insertions(+)

diff --git a/mysql-test/extra/rpl_tests/rpl_reset_slave.test b/mysql-test/extra/rpl_tests/rpl_reset_slave.test
index 2cc041a35e1..49a142f10c2 100644
--- a/mysql-test/extra/rpl_tests/rpl_reset_slave.test
+++ b/mysql-test/extra/rpl_tests/rpl_reset_slave.test
@@ -41,3 +41,57 @@ reset slave;
 start slave;
 sync_with_master;
 show status like 'slave_open_temp_tables';
+
+#
+#Bug#34654  	RESET SLAVE does not clear LAST_IO_Err* 
+#
+
+# clearing the status
+stop slave;
+reset slave;
+let $last_io_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
+echo *** errno must be zero: $last_io_errno ***;
+
+#
+# verifying start slave resets Last_IO_Error and Last_IO_Errno.
+#
+
+change master to master_user='impossible_user_name';
+start slave;
+source include/wait_for_slave_io_to_stop.inc;
+let $last_io_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
+--disable_query_log
+eval SELECT $last_io_errno > 0 as ONE;
+--enable_query_log
+
+source include/stop_slave.inc;
+change master to master_user='root';
+source include/start_slave.inc;
+let $last_io_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
+let $last_io_error= query_get_value(SHOW SLAVE STATUS, Last_IO_Error, 1);
+--echo *** last errno must be  zero: $last_io_errno ***
+--echo *** last error must be blank: $last_io_error ***
+
+#
+# verifying reset slave resets Last_{IO,SQL}_Err{or,no}
+#
+
+source include/stop_slave.inc;
+change master to master_user='impossible_user_name';
+start slave;
+source include/wait_for_slave_io_to_stop.inc;
+let $last_io_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
+--disable_query_log
+eval SELECT $last_io_errno > 0 as ONE;
+--enable_query_log
+
+source include/stop_slave.inc;
+reset slave;
+let $last_io_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
+let $last_io_error= query_get_value(SHOW SLAVE STATUS, Last_IO_Error, 1);
+let $last_sql_errno= query_get_value(SHOW SLAVE STATUS, Last_SQL_Errno, 1);
+let $last_sql_error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1);
+--echo *** io  last errno must be  zero: $last_io_errno  ***
+--echo *** io  last error must be blank: $last_io_error  ***
+--echo *** sql last errno must be  zero: $last_sql_errno ***
+--echo *** sql last error must be blank: $last_sql_error ***
diff --git a/mysql-test/suite/rpl/r/rpl_row_reset_slave.result b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result
index 6126ec4bacc..fa40d8760a8 100644
--- a/mysql-test/suite/rpl/r/rpl_row_reset_slave.result
+++ b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result
@@ -174,3 +174,26 @@ start slave;
 show status like 'slave_open_temp_tables';
 Variable_name	Value
 Slave_open_temp_tables	0
+stop slave;
+reset slave;
+*** errno must be zero: 0 ***
+change master to master_user='impossible_user_name';
+start slave;
+ONE
+1
+include/stop_slave.inc
+change master to master_user='root';
+include/start_slave.inc
+*** last errno must be  zero: 0 ***
+*** last error must be blank:  ***
+include/stop_slave.inc
+change master to master_user='impossible_user_name';
+start slave;
+ONE
+1
+include/stop_slave.inc
+reset slave;
+*** io  last errno must be  zero: 0  ***
+*** io  last error must be blank:   ***
+*** sql last errno must be  zero: 0 ***
+*** sql last error must be blank:  ***
diff --git a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
index bb89d150af7..78d9d7c41eb 100644
--- a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
+++ b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
@@ -174,3 +174,26 @@ start slave;
 show status like 'slave_open_temp_tables';
 Variable_name	Value
 Slave_open_temp_tables	1
+stop slave;
+reset slave;
+*** errno must be zero: 0 ***
+change master to master_user='impossible_user_name';
+start slave;
+ONE
+1
+include/stop_slave.inc
+change master to master_user='root';
+include/start_slave.inc
+*** last errno must be  zero: 0 ***
+*** last error must be blank:  ***
+include/stop_slave.inc
+change master to master_user='impossible_user_name';
+start slave;
+ONE
+1
+include/stop_slave.inc
+reset slave;
+*** io  last errno must be  zero: 0  ***
+*** io  last error must be blank:   ***
+*** sql last errno must be  zero: 0 ***
+*** sql last error must be blank:  ***
diff --git a/sql/slave.cc b/sql/slave.cc
index c379a67201a..679de890801 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2397,6 +2397,7 @@ pthread_handler_t handle_slave_io(void *arg)
 
   pthread_detach_this_thread();
   thd->thread_stack= (char*) &thd; // remember where our stack is
+  mi->clear_error();
   if (init_slave_thread(thd, SLAVE_THD_IO))
   {
     pthread_cond_broadcast(&mi->start_cond);
@@ -2511,6 +2512,7 @@ requesting master dump") ||
         goto connected;
       });
 
+    DBUG_ASSERT(mi->last_error().number == 0);
     while (!io_slave_killed(thd,mi))
     {
       ulong event_len;
@@ -3710,6 +3712,7 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi,
 
   if (!slave_was_killed)
   {
+    mi->clear_error(); // clear possible left over reconnect error
     if (reconnect)
     {
       if (!suppress_warnings && global_system_variables.log_warnings)
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 06c6c022780..b34b3aef51f 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -1043,6 +1043,7 @@ int reset_slave(THD *thd, Master_info* mi)
      Reset errors (the idea is that we forget about the
      old master).
   */
+  mi->clear_error();
   mi->rli.clear_error();
   mi->rli.clear_until_condition();
 

From 26f88fa1d7aa485eed10be7df9e93794d059eabc Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <gkodinov@mysql.com>
Date: Tue, 16 Jun 2009 10:27:53 +0200
Subject: [PATCH 02/25] fixed version

---
 .bzr-mysql/default.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf
index 557df1b1ffe..f79c1cd6319 100644
--- a/.bzr-mysql/default.conf
+++ b/.bzr-mysql/default.conf
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@lists.mysql.com"
 post_push_to = "commits@lists.mysql.com"
-tree_name = "mysql-5.0-bugteam"
+tree_name = "mysql-5.0"

From b660e14b04afc54bd88921332d4a76e26b61740d Mon Sep 17 00:00:00 2001
From: Jonathan Perkin <jperkin@sun.com>
Date: Tue, 16 Jun 2009 14:00:04 +0200
Subject: [PATCH 03/25] Raise version number after cloning 5.1.36

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index d323ce9f726..6867ea8bd92 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.1.36)
+AM_INIT_AUTOMAKE(mysql, 5.1.37)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10

From 7a512334e96fcc0e47daec05bc18f9f60ed40ac0 Mon Sep 17 00:00:00 2001
From: Alexey Kopytov <Alexey.Kopytov@Sun.com>
Date: Thu, 18 Jun 2009 17:11:47 +0400
Subject: [PATCH 04/25] Bug #41710: MySQL 5.1.30 crashes on the latest
 OpenSolaris 10

Change the default optimization level for Sun Studio to "-O1".
This is a workaround for a Sun Studio bug (see bug #41710
comments for details):

1. Use $GCC instead of $ac_cv_prog_gcc to check for gcc, since
the first one is the only documented way to do it.

2. Use $GXX instead of $ac_cv_prog_cxx_g to check for g++,
since the latter is set to "yes" when the C++ compiler accepts
"-g" which is the case for both g++ and CC.

3. When building with Sun Studio, set the default values for
CFLAGS/CXXFLAGS to "-O1", since unlike GCC, Sun Studio
interprets "-O" as "-xO3" (see the manual pages for cc and CC).
---
 configure.in | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 4fcb1f13f35..ec432e19ce3 100644
--- a/configure.in
+++ b/configure.in
@@ -1756,7 +1756,7 @@ esac
 
 # Build optimized or debug version ?
 # First check for gcc and g++
-if test "$ac_cv_prog_gcc" = "yes"
+if test "$GCC" = "yes"
 then
   DEBUG_CFLAGS="-g"
   DEBUG_OPTIMIZE_CC="-O"
@@ -1764,9 +1764,16 @@ then
 else
   DEBUG_CFLAGS="-g"
   DEBUG_OPTIMIZE_CC=""
-  OPTIMIZE_CFLAGS="-O"
+  case $SYSTEM_TYPE in                               
+    *solaris*)
+      OPTIMIZE_CFLAGS="-O1"
+      ;;
+    *)
+      OPTIMIZE_CFLAGS="-O"
+      ;;
+  esac
 fi
-if test "$ac_cv_prog_cxx_g" = "yes"
+if test "$GXX" = "yes"
 then
   DEBUG_CXXFLAGS="-g"
   DEBUG_OPTIMIZE_CXX="-O"
@@ -1774,7 +1781,14 @@ then
 else
   DEBUG_CXXFLAGS="-g"
   DEBUG_OPTIMIZE_CXX=""
-  OPTIMIZE_CXXFLAGS="-O"
+  case $SYSTEM_TYPE in
+    *solaris*)
+      OPTIMIZE_CXXFLAGS="-O1"
+      ;;
+    *)
+      OPTIMIZE_CXXFLAGS="-O"
+      ;;
+  esac
 fi
 
 if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then

From 5289e1a9e2c0d9332d3620fbe26bfb5fa74fb6dc Mon Sep 17 00:00:00 2001
From: Alfranio Correia <alfranio.correia@sun.com>
Date: Fri, 19 Jun 2009 12:27:24 +0100
Subject: [PATCH 05/25] Post-fix for BUG#43929.

---
 mysql-test/include/commit.inc      | 2 +-
 mysql-test/r/commit_1innodb.result | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc
index 5ff9d409e27..d412eae8364 100644
--- a/mysql-test/include/commit.inc
+++ b/mysql-test/include/commit.inc
@@ -669,7 +669,7 @@ call p_verify_status_increment(1, 0, 1, 0);
 insert t1 set a=3;
 call p_verify_status_increment(2, 2, 2, 2);
 savepoint a;
-call p_verify_status_increment(1, 0, 0, 0);
+call p_verify_status_increment(1, 0, 1, 0);
 insert t1 set a=4;
 call p_verify_status_increment(2, 2, 2, 2);
 release savepoint a;
diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result
index 5f300468499..cabd4c29c1d 100644
--- a/mysql-test/r/commit_1innodb.result
+++ b/mysql-test/r/commit_1innodb.result
@@ -766,7 +766,7 @@ call p_verify_status_increment(2, 2, 2, 2);
 SUCCESS
 
 savepoint a;
-call p_verify_status_increment(1, 0, 0, 0);
+call p_verify_status_increment(1, 0, 1, 0);
 SUCCESS
 
 insert t1 set a=4;

From 728d3c39de931d268db9218fbbf1028d90154758 Mon Sep 17 00:00:00 2001
From: V Narayanan <v.narayanan@sun.com>
Date: Fri, 19 Jun 2009 17:29:21 +0530
Subject: [PATCH 06/25] Bug#43572 Handle failures from hash_init

Failure to allocate memory for the hash->array element,
caused hash_init to return without initializing the other
members of the hash. Thus although the dynamic array
buffer may be allocated at a later point in the code, the
incompletely initialized hash caused fatal failures.

This patch moves the initialization of the other members
of the hash above the array allocation, so that the usage
of this hash will not result in fatal failures.
---
 include/hash.h |  2 +-
 mysys/hash.c   | 35 +++++++++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/include/hash.h b/include/hash.h
index 97e947d7c6a..56b54a15a8c 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -63,7 +63,7 @@ void hash_replace(HASH *hash, HASH_SEARCH_STATE *state, byte *new_row);
 my_bool hash_check(HASH *hash);			/* Only in debug library */
 
 #define hash_clear(H) bzero((char*) (H),sizeof(*(H)))
-#define hash_inited(H) ((H)->array.buffer != 0)
+#define hash_inited(H) ((H)->blength != 0)
 #define hash_init_opt(A,B,C,D,E,F,G,H) \
           (!hash_inited(A) && _hash_init(A,B,C,D,E,F,G, H CALLER_INFO))
 
diff --git a/mysys/hash.c b/mysys/hash.c
index 9e8404248eb..4aab75609f4 100644
--- a/mysys/hash.c
+++ b/mysys/hash.c
@@ -45,6 +45,32 @@ static uint calc_hash(const HASH *hash, const byte *key, uint length)
   return nr1;
 }
 
+/**
+  @brief Initialize the hash
+  
+  @details
+
+  Initialize the hash, by defining and giving valid values for
+  its elements. The failure to allocate memory for the
+  hash->array element will not result in a fatal failure. The
+  dynamic array that is part of the hash will allocate memory
+  as required during insertion.
+
+  @param[in,out] hash         The hash that is initialized
+  @param[in]     charset      The charater set information
+  @param[in]     size         The hash size
+  @param[in]     key_offest   The key offset for the hash
+  @param[in]     key_length   The length of the key used in
+                              the hash
+  @param[in]     get_key      get the key for the hash
+  @param[in]     free_element pointer to the function that
+                              does cleanup
+  @param[in]     CALLER_INFO_PROTO flag that define the behaviour 
+                                   of the hash
+  @return        inidicates success or failure of initialization
+    @retval 0 success
+    @retval 1 failure
+*/
 my_bool
 _hash_init(HASH *hash,CHARSET_INFO *charset,
 	   uint size,uint key_offset,uint key_length,
@@ -55,11 +81,6 @@ _hash_init(HASH *hash,CHARSET_INFO *charset,
   DBUG_PRINT("enter",("hash: 0x%lx  size: %d", (long) hash, size));
 
   hash->records=0;
-  if (my_init_dynamic_array_ci(&hash->array,sizeof(HASH_LINK),size,0))
-  {
-    hash->free=0;				/* Allow call to hash_free */
-    DBUG_RETURN(1);
-  }
   hash->key_offset=key_offset;
   hash->key_length=key_length;
   hash->blength=1;
@@ -67,7 +88,8 @@ _hash_init(HASH *hash,CHARSET_INFO *charset,
   hash->free=free_element;
   hash->flags=flags;
   hash->charset=charset;
-  DBUG_RETURN(0);
+  DBUG_RETURN(my_init_dynamic_array_ci(&hash->array, 
+                                       sizeof(HASH_LINK), size, 0));
 }
 
 
@@ -113,6 +135,7 @@ void hash_free(HASH *hash)
   hash_free_elements(hash);
   hash->free= 0;
   delete_dynamic(&hash->array);
+  hash->blength= 0;
   DBUG_VOID_RETURN;
 }
 

From c5d904ebbe274453a39f145522d6af9a792f61e7 Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Fri, 19 Jun 2009 15:52:20 +0300
Subject: [PATCH 07/25] Bug #36654: mysqld_multi cannot start instances with
 different versions occasionally.

mysql_multi can call mysqld_safe. In doing this it's not changing the
current working directory. This may cause confusion in the case where
mysqld_multi is handling instances of servers of different versions
and the current working directory is the installation directory of one
of these servers.

Fixed by enhancing the meaning of basedir in [mysqldN] sections of
mysqld_multi. If specified, mysqld_multi will change the current
working directory to the basedir directory before starting the server
in mysqld_multi ... start ... and then change it back to what it was.
---
 scripts/mysqld_multi.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 3cb4665eb1c..a6330055f99 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 use Getopt::Long;
-use POSIX qw(strftime);
+use POSIX qw(strftime getcwd);
 
 $|=1;
 $VER="2.16";
@@ -295,6 +295,7 @@ sub start_mysqlds()
   {
     @options = defaults_for_group($groups[$i]);
 
+    $basedir_found= 0; # The default
     $mysqld_found= 1; # The default
     $mysqld_found= 0 if (!length($mysqld));
     $com= "$mysqld";
@@ -310,6 +311,14 @@ sub start_mysqlds()
 	$com= $options[$j];
         $mysqld_found= 1;
       }
+      elsif ("--basedir=" eq substr($options[$j], 0, 10))
+      {
+        $basedir= $options[$j];
+        $basedir =~ s/^--basedir=//;
+        $basedir_found= 1;
+        $options[$j]= quote_shell_word($options[$j]);
+        $tmp.= " $options[$j]";
+      }
       else
       {
 	$options[$j]= quote_shell_word($options[$j]);
@@ -337,7 +346,16 @@ sub start_mysqlds()
       print "group [$groups[$i]] separately.\n";
       exit(1);
     }
+    if ($basedir_found)
+    {
+      $curdir=getcwd();
+      chdir($basedir) or die "Can't change to datadir $basedir";
+    }
     system($com);
+    if ($basedir_found)
+    {
+      chdir($curdir) or die "Can't change back to original dir $curdir";
+    }
   }
   if (!$i && !$opt_no_log)
   {

From eb910845404bdd867ec5501580fddf16681e957e Mon Sep 17 00:00:00 2001
From: Matthias Leich <Matthias.Leich@sun.com>
Date: Fri, 19 Jun 2009 17:04:25 +0200
Subject: [PATCH 08/25] Fix for Bug#40545, Bug#40209, Bug#40618, Bug#38346

  Details:
  - Limit the queries to character sets and collations
    which are most probably available in all build types.
    But try to preserve the intention of the tests.
  - Remove the variants adjusted to some build types.

  Note:
  1. The results of the review by Bar are included.
  2. I am not able to check the correctness of this patch
     on any existing build type and any MySQL version.
     So it could happen that the new test fails somewhere.
---
 .../suite/funcs_1/r/charset_collation.result  |  40 +++
 .../funcs_1/r/charset_collation_1.result      | 309 -----------------
 .../funcs_1/r/charset_collation_2.result      | 311 ------------------
 .../funcs_1/r/charset_collation_3.result      | 309 -----------------
 .../charset_collation.test}                   |  91 ++---
 .../suite/funcs_1/t/charset_collation_1.test  |  32 --
 .../suite/funcs_1/t/charset_collation_2.test  |  24 --
 .../suite/funcs_1/t/charset_collation_3.test  |  25 --
 8 files changed, 72 insertions(+), 1069 deletions(-)
 create mode 100644 mysql-test/suite/funcs_1/r/charset_collation.result
 delete mode 100644 mysql-test/suite/funcs_1/r/charset_collation_1.result
 delete mode 100644 mysql-test/suite/funcs_1/r/charset_collation_2.result
 delete mode 100644 mysql-test/suite/funcs_1/r/charset_collation_3.result
 rename mysql-test/suite/funcs_1/{datadict/charset_collation.inc => t/charset_collation.test} (54%)
 delete mode 100644 mysql-test/suite/funcs_1/t/charset_collation_1.test
 delete mode 100644 mysql-test/suite/funcs_1/t/charset_collation_2.test
 delete mode 100644 mysql-test/suite/funcs_1/t/charset_collation_3.test

diff --git a/mysql-test/suite/funcs_1/r/charset_collation.result b/mysql-test/suite/funcs_1/r/charset_collation.result
new file mode 100644
index 00000000000..b3183ba48e1
--- /dev/null
+++ b/mysql-test/suite/funcs_1/r/charset_collation.result
@@ -0,0 +1,40 @@
+DROP USER dbdict_test@localhost;
+CREATE USER dbdict_test@localhost;
+# Establish connection con (user=dbdict_test)
+
+SELECT *
+FROM information_schema.character_sets
+WHERE character_set_name IN ('utf8','latin1','binary')
+ORDER BY character_set_name;
+CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
+binary	binary	Binary pseudo charset	1
+latin1	latin1_swedish_ci	cp1252 West European	1
+utf8	utf8_general_ci	UTF-8 Unicode	3
+
+SELECT *
+FROM information_schema.collations
+WHERE character_set_name IN ('utf8','latin1','binary')
+AND (collation_name LIKE CONCAT(character_set_name,'_general_ci')
+OR
+collation_name LIKE CONCAT(character_set_name,'_bin'))
+ORDER BY collation_name;
+COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
+latin1_bin	latin1	47		Yes	1
+latin1_general_ci	latin1	48		Yes	1
+utf8_bin	utf8	83		Yes	1
+utf8_general_ci	utf8	33	Yes	Yes	1
+
+SELECT *
+FROM information_schema.collation_character_set_applicability
+WHERE character_set_name IN ('utf8','latin1','binary')
+AND (collation_name LIKE CONCAT(character_set_name,'_general_ci')
+OR
+collation_name LIKE CONCAT(character_set_name,'_bin'))
+ORDER BY collation_name, character_set_name;
+COLLATION_NAME	CHARACTER_SET_NAME
+latin1_bin	latin1
+latin1_general_ci	latin1
+utf8_bin	utf8
+utf8_general_ci	utf8
+# Switch to connection default + disconnect con
+DROP USER dbdict_test@localhost;
diff --git a/mysql-test/suite/funcs_1/r/charset_collation_1.result b/mysql-test/suite/funcs_1/r/charset_collation_1.result
deleted file mode 100644
index d397c671321..00000000000
--- a/mysql-test/suite/funcs_1/r/charset_collation_1.result
+++ /dev/null
@@ -1,309 +0,0 @@
-DROP USER dbdict_test@localhost;
-CREATE USER dbdict_test@localhost;
-# Establish connection con (user=dbdict_test)
-
-SELECT *
-FROM information_schema.character_sets
-ORDER BY character_set_name;
-CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
-armscii8	armscii8_general_ci	ARMSCII-8 Armenian	1
-ascii	ascii_general_ci	US ASCII	1
-big5	big5_chinese_ci	Big5 Traditional Chinese	2
-binary	binary	Binary pseudo charset	1
-cp1250	cp1250_general_ci	Windows Central European	1
-cp1251	cp1251_general_ci	Windows Cyrillic	1
-cp1256	cp1256_general_ci	Windows Arabic	1
-cp1257	cp1257_general_ci	Windows Baltic	1
-cp850	cp850_general_ci	DOS West European	1
-cp852	cp852_general_ci	DOS Central European	1
-cp866	cp866_general_ci	DOS Russian	1
-cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
-dec8	dec8_swedish_ci	DEC West European	1
-eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
-euckr	euckr_korean_ci	EUC-KR Korean	2
-gb2312	gb2312_chinese_ci	GB2312 Simplified Chinese	2
-gbk	gbk_chinese_ci	GBK Simplified Chinese	2
-geostd8	geostd8_general_ci	GEOSTD8 Georgian	1
-greek	greek_general_ci	ISO 8859-7 Greek	1
-hebrew	hebrew_general_ci	ISO 8859-8 Hebrew	1
-hp8	hp8_english_ci	HP West European	1
-keybcs2	keybcs2_general_ci	DOS Kamenicky Czech-Slovak	1
-koi8r	koi8r_general_ci	KOI8-R Relcom Russian	1
-koi8u	koi8u_general_ci	KOI8-U Ukrainian	1
-latin1	latin1_swedish_ci	cp1252 West European	1
-latin2	latin2_general_ci	ISO 8859-2 Central European	1
-latin5	latin5_turkish_ci	ISO 8859-9 Turkish	1
-latin7	latin7_general_ci	ISO 8859-13 Baltic	1
-macce	macce_general_ci	Mac Central European	1
-macroman	macroman_general_ci	Mac West European	1
-sjis	sjis_japanese_ci	Shift-JIS Japanese	2
-swe7	swe7_swedish_ci	7bit Swedish	1
-tis620	tis620_thai_ci	TIS620 Thai	1
-ucs2	ucs2_general_ci	UCS-2 Unicode	2
-ujis	ujis_japanese_ci	EUC-JP Japanese	3
-utf8	utf8_general_ci	UTF-8 Unicode	3
-
-SELECT *
-FROM information_schema.collations
-ORDER BY collation_name;
-COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
-armscii8_bin	armscii8	64			0
-armscii8_general_ci	armscii8	32	Yes		0
-ascii_bin	ascii	65			0
-ascii_general_ci	ascii	11	Yes		0
-big5_bin	big5	84		Yes	1
-big5_chinese_ci	big5	1	Yes	Yes	1
-binary	binary	63	Yes	Yes	1
-cp1250_bin	cp1250	66		Yes	1
-cp1250_croatian_ci	cp1250	44		Yes	1
-cp1250_czech_cs	cp1250	34		Yes	2
-cp1250_general_ci	cp1250	26	Yes	Yes	1
-cp1251_bin	cp1251	50			0
-cp1251_bulgarian_ci	cp1251	14			0
-cp1251_general_ci	cp1251	51	Yes		0
-cp1251_general_cs	cp1251	52			0
-cp1251_ukrainian_ci	cp1251	23			0
-cp1256_bin	cp1256	67			0
-cp1256_general_ci	cp1256	57	Yes		0
-cp1257_bin	cp1257	58			0
-cp1257_general_ci	cp1257	59	Yes		0
-cp1257_lithuanian_ci	cp1257	29			0
-cp850_bin	cp850	80			0
-cp850_general_ci	cp850	4	Yes		0
-cp852_bin	cp852	81			0
-cp852_general_ci	cp852	40	Yes		0
-cp866_bin	cp866	68			0
-cp866_general_ci	cp866	36	Yes		0
-cp932_bin	cp932	96		Yes	1
-cp932_japanese_ci	cp932	95	Yes	Yes	1
-dec8_bin	dec8	69			0
-dec8_swedish_ci	dec8	3	Yes		0
-eucjpms_bin	eucjpms	98		Yes	1
-eucjpms_japanese_ci	eucjpms	97	Yes	Yes	1
-euckr_bin	euckr	85		Yes	1
-euckr_korean_ci	euckr	19	Yes	Yes	1
-gb2312_bin	gb2312	86		Yes	1
-gb2312_chinese_ci	gb2312	24	Yes	Yes	1
-gbk_bin	gbk	87		Yes	1
-gbk_chinese_ci	gbk	28	Yes	Yes	1
-geostd8_bin	geostd8	93			0
-geostd8_general_ci	geostd8	92	Yes		0
-greek_bin	greek	70			0
-greek_general_ci	greek	25	Yes		0
-hebrew_bin	hebrew	71			0
-hebrew_general_ci	hebrew	16	Yes		0
-hp8_bin	hp8	72			0
-hp8_english_ci	hp8	6	Yes		0
-keybcs2_bin	keybcs2	73			0
-keybcs2_general_ci	keybcs2	37	Yes		0
-koi8r_bin	koi8r	74			0
-koi8r_general_ci	koi8r	7	Yes		0
-koi8u_bin	koi8u	75			0
-koi8u_general_ci	koi8u	22	Yes		0
-latin1_bin	latin1	47		Yes	1
-latin1_danish_ci	latin1	15		Yes	1
-latin1_general_ci	latin1	48		Yes	1
-latin1_general_cs	latin1	49		Yes	1
-latin1_german1_ci	latin1	5		Yes	1
-latin1_german2_ci	latin1	31		Yes	2
-latin1_spanish_ci	latin1	94		Yes	1
-latin1_swedish_ci	latin1	8	Yes	Yes	1
-latin2_bin	latin2	77		Yes	1
-latin2_croatian_ci	latin2	27		Yes	1
-latin2_czech_cs	latin2	2		Yes	4
-latin2_general_ci	latin2	9	Yes	Yes	1
-latin2_hungarian_ci	latin2	21		Yes	1
-latin5_bin	latin5	78			0
-latin5_turkish_ci	latin5	30	Yes		0
-latin7_bin	latin7	79			0
-latin7_estonian_cs	latin7	20			0
-latin7_general_ci	latin7	41	Yes		0
-latin7_general_cs	latin7	42			0
-macce_bin	macce	43			0
-macce_general_ci	macce	38	Yes		0
-macroman_bin	macroman	53			0
-macroman_general_ci	macroman	39	Yes		0
-sjis_bin	sjis	88		Yes	1
-sjis_japanese_ci	sjis	13	Yes	Yes	1
-swe7_bin	swe7	82			0
-swe7_swedish_ci	swe7	10	Yes		0
-tis620_bin	tis620	89		Yes	1
-tis620_thai_ci	tis620	18	Yes	Yes	4
-ucs2_bin	ucs2	90		Yes	1
-ucs2_czech_ci	ucs2	138		Yes	8
-ucs2_danish_ci	ucs2	139		Yes	8
-ucs2_esperanto_ci	ucs2	145		Yes	8
-ucs2_estonian_ci	ucs2	134		Yes	8
-ucs2_general_ci	ucs2	35	Yes	Yes	1
-ucs2_hungarian_ci	ucs2	146		Yes	8
-ucs2_icelandic_ci	ucs2	129		Yes	8
-ucs2_latvian_ci	ucs2	130		Yes	8
-ucs2_lithuanian_ci	ucs2	140		Yes	8
-ucs2_persian_ci	ucs2	144		Yes	8
-ucs2_polish_ci	ucs2	133		Yes	8
-ucs2_romanian_ci	ucs2	131		Yes	8
-ucs2_roman_ci	ucs2	143		Yes	8
-ucs2_slovak_ci	ucs2	141		Yes	8
-ucs2_slovenian_ci	ucs2	132		Yes	8
-ucs2_spanish2_ci	ucs2	142		Yes	8
-ucs2_spanish_ci	ucs2	135		Yes	8
-ucs2_swedish_ci	ucs2	136		Yes	8
-ucs2_turkish_ci	ucs2	137		Yes	8
-ucs2_unicode_ci	ucs2	128		Yes	8
-ujis_bin	ujis	91		Yes	1
-ujis_japanese_ci	ujis	12	Yes	Yes	1
-utf8_bin	utf8	83		Yes	1
-utf8_czech_ci	utf8	202		Yes	8
-utf8_danish_ci	utf8	203		Yes	8
-utf8_esperanto_ci	utf8	209		Yes	8
-utf8_estonian_ci	utf8	198		Yes	8
-utf8_general_ci	utf8	33	Yes	Yes	1
-utf8_hungarian_ci	utf8	210		Yes	8
-utf8_icelandic_ci	utf8	193		Yes	8
-utf8_latvian_ci	utf8	194		Yes	8
-utf8_lithuanian_ci	utf8	204		Yes	8
-utf8_persian_ci	utf8	208		Yes	8
-utf8_polish_ci	utf8	197		Yes	8
-utf8_romanian_ci	utf8	195		Yes	8
-utf8_roman_ci	utf8	207		Yes	8
-utf8_slovak_ci	utf8	205		Yes	8
-utf8_slovenian_ci	utf8	196		Yes	8
-utf8_spanish2_ci	utf8	206		Yes	8
-utf8_spanish_ci	utf8	199		Yes	8
-utf8_swedish_ci	utf8	200		Yes	8
-utf8_turkish_ci	utf8	201		Yes	8
-utf8_unicode_ci	utf8	192		Yes	8
-
-
-SELECT *
-FROM information_schema.collation_character_set_applicability
-ORDER BY collation_name, character_set_name;
-COLLATION_NAME	CHARACTER_SET_NAME
-armscii8_bin	armscii8
-armscii8_general_ci	armscii8
-ascii_bin	ascii
-ascii_general_ci	ascii
-big5_bin	big5
-big5_chinese_ci	big5
-binary	binary
-cp1250_bin	cp1250
-cp1250_croatian_ci	cp1250
-cp1250_czech_cs	cp1250
-cp1250_general_ci	cp1250
-cp1251_bin	cp1251
-cp1251_bulgarian_ci	cp1251
-cp1251_general_ci	cp1251
-cp1251_general_cs	cp1251
-cp1251_ukrainian_ci	cp1251
-cp1256_bin	cp1256
-cp1256_general_ci	cp1256
-cp1257_bin	cp1257
-cp1257_general_ci	cp1257
-cp1257_lithuanian_ci	cp1257
-cp850_bin	cp850
-cp850_general_ci	cp850
-cp852_bin	cp852
-cp852_general_ci	cp852
-cp866_bin	cp866
-cp866_general_ci	cp866
-cp932_bin	cp932
-cp932_japanese_ci	cp932
-dec8_bin	dec8
-dec8_swedish_ci	dec8
-eucjpms_bin	eucjpms
-eucjpms_japanese_ci	eucjpms
-euckr_bin	euckr
-euckr_korean_ci	euckr
-gb2312_bin	gb2312
-gb2312_chinese_ci	gb2312
-gbk_bin	gbk
-gbk_chinese_ci	gbk
-geostd8_bin	geostd8
-geostd8_general_ci	geostd8
-greek_bin	greek
-greek_general_ci	greek
-hebrew_bin	hebrew
-hebrew_general_ci	hebrew
-hp8_bin	hp8
-hp8_english_ci	hp8
-keybcs2_bin	keybcs2
-keybcs2_general_ci	keybcs2
-koi8r_bin	koi8r
-koi8r_general_ci	koi8r
-koi8u_bin	koi8u
-koi8u_general_ci	koi8u
-latin1_bin	latin1
-latin1_danish_ci	latin1
-latin1_general_ci	latin1
-latin1_general_cs	latin1
-latin1_german1_ci	latin1
-latin1_german2_ci	latin1
-latin1_spanish_ci	latin1
-latin1_swedish_ci	latin1
-latin2_bin	latin2
-latin2_croatian_ci	latin2
-latin2_czech_cs	latin2
-latin2_general_ci	latin2
-latin2_hungarian_ci	latin2
-latin5_bin	latin5
-latin5_turkish_ci	latin5
-latin7_bin	latin7
-latin7_estonian_cs	latin7
-latin7_general_ci	latin7
-latin7_general_cs	latin7
-macce_bin	macce
-macce_general_ci	macce
-macroman_bin	macroman
-macroman_general_ci	macroman
-sjis_bin	sjis
-sjis_japanese_ci	sjis
-swe7_bin	swe7
-swe7_swedish_ci	swe7
-tis620_bin	tis620
-tis620_thai_ci	tis620
-ucs2_bin	ucs2
-ucs2_czech_ci	ucs2
-ucs2_danish_ci	ucs2
-ucs2_esperanto_ci	ucs2
-ucs2_estonian_ci	ucs2
-ucs2_general_ci	ucs2
-ucs2_hungarian_ci	ucs2
-ucs2_icelandic_ci	ucs2
-ucs2_latvian_ci	ucs2
-ucs2_lithuanian_ci	ucs2
-ucs2_persian_ci	ucs2
-ucs2_polish_ci	ucs2
-ucs2_romanian_ci	ucs2
-ucs2_roman_ci	ucs2
-ucs2_slovak_ci	ucs2
-ucs2_slovenian_ci	ucs2
-ucs2_spanish2_ci	ucs2
-ucs2_spanish_ci	ucs2
-ucs2_swedish_ci	ucs2
-ucs2_turkish_ci	ucs2
-ucs2_unicode_ci	ucs2
-ujis_bin	ujis
-ujis_japanese_ci	ujis
-utf8_bin	utf8
-utf8_czech_ci	utf8
-utf8_danish_ci	utf8
-utf8_esperanto_ci	utf8
-utf8_estonian_ci	utf8
-utf8_general_ci	utf8
-utf8_hungarian_ci	utf8
-utf8_icelandic_ci	utf8
-utf8_latvian_ci	utf8
-utf8_lithuanian_ci	utf8
-utf8_persian_ci	utf8
-utf8_polish_ci	utf8
-utf8_romanian_ci	utf8
-utf8_roman_ci	utf8
-utf8_slovak_ci	utf8
-utf8_slovenian_ci	utf8
-utf8_spanish2_ci	utf8
-utf8_spanish_ci	utf8
-utf8_swedish_ci	utf8
-utf8_turkish_ci	utf8
-utf8_unicode_ci	utf8
-# Switch to connection default + disconnect con
-DROP USER dbdict_test@localhost;
diff --git a/mysql-test/suite/funcs_1/r/charset_collation_2.result b/mysql-test/suite/funcs_1/r/charset_collation_2.result
deleted file mode 100644
index 0035da13c56..00000000000
--- a/mysql-test/suite/funcs_1/r/charset_collation_2.result
+++ /dev/null
@@ -1,311 +0,0 @@
-DROP USER dbdict_test@localhost;
-CREATE USER dbdict_test@localhost;
-# Establish connection con (user=dbdict_test)
-
-SELECT *
-FROM information_schema.character_sets
-ORDER BY character_set_name;
-CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
-armscii8	armscii8_general_ci	ARMSCII-8 Armenian	1
-ascii	ascii_general_ci	US ASCII	1
-big5	big5_chinese_ci	Big5 Traditional Chinese	2
-binary	binary	Binary pseudo charset	1
-cp1250	cp1250_general_ci	Windows Central European	1
-cp1251	cp1251_general_ci	Windows Cyrillic	1
-cp1256	cp1256_general_ci	Windows Arabic	1
-cp1257	cp1257_general_ci	Windows Baltic	1
-cp850	cp850_general_ci	DOS West European	1
-cp852	cp852_general_ci	DOS Central European	1
-cp866	cp866_general_ci	DOS Russian	1
-cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
-dec8	dec8_swedish_ci	DEC West European	1
-eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
-euckr	euckr_korean_ci	EUC-KR Korean	2
-gb2312	gb2312_chinese_ci	GB2312 Simplified Chinese	2
-gbk	gbk_chinese_ci	GBK Simplified Chinese	2
-geostd8	geostd8_general_ci	GEOSTD8 Georgian	1
-greek	greek_general_ci	ISO 8859-7 Greek	1
-hebrew	hebrew_general_ci	ISO 8859-8 Hebrew	1
-hp8	hp8_english_ci	HP West European	1
-keybcs2	keybcs2_general_ci	DOS Kamenicky Czech-Slovak	1
-koi8r	koi8r_general_ci	KOI8-R Relcom Russian	1
-koi8u	koi8u_general_ci	KOI8-U Ukrainian	1
-latin1	latin1_swedish_ci	cp1252 West European	1
-latin2	latin2_general_ci	ISO 8859-2 Central European	1
-latin5	latin5_turkish_ci	ISO 8859-9 Turkish	1
-latin7	latin7_general_ci	ISO 8859-13 Baltic	1
-macce	macce_general_ci	Mac Central European	1
-macroman	macroman_general_ci	Mac West European	1
-sjis	sjis_japanese_ci	Shift-JIS Japanese	2
-swe7	swe7_swedish_ci	7bit Swedish	1
-tis620	tis620_thai_ci	TIS620 Thai	1
-ucs2	ucs2_general_ci	UCS-2 Unicode	2
-ujis	ujis_japanese_ci	EUC-JP Japanese	3
-utf8	utf8_general_ci	UTF-8 Unicode	3
-
-SELECT *
-FROM information_schema.collations
-ORDER BY collation_name;
-COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
-armscii8_bin	armscii8	64			0
-armscii8_general_ci	armscii8	32	Yes		0
-ascii_bin	ascii	65			0
-ascii_general_ci	ascii	11	Yes		0
-big5_bin	big5	84		Yes	1
-big5_chinese_ci	big5	1	Yes	Yes	1
-binary	binary	63	Yes	Yes	1
-cp1250_bin	cp1250	66		Yes	1
-cp1250_croatian_ci	cp1250	44		Yes	1
-cp1250_czech_cs	cp1250	34		Yes	2
-cp1250_general_ci	cp1250	26	Yes	Yes	1
-cp1251_bin	cp1251	50			0
-cp1251_bulgarian_ci	cp1251	14			0
-cp1251_general_ci	cp1251	51	Yes		0
-cp1251_general_cs	cp1251	52			0
-cp1251_ukrainian_ci	cp1251	23			0
-cp1256_bin	cp1256	67			0
-cp1256_general_ci	cp1256	57	Yes		0
-cp1257_bin	cp1257	58			0
-cp1257_general_ci	cp1257	59	Yes		0
-cp1257_lithuanian_ci	cp1257	29			0
-cp850_bin	cp850	80			0
-cp850_general_ci	cp850	4	Yes		0
-cp852_bin	cp852	81			0
-cp852_general_ci	cp852	40	Yes		0
-cp866_bin	cp866	68			0
-cp866_general_ci	cp866	36	Yes		0
-cp932_bin	cp932	96		Yes	1
-cp932_japanese_ci	cp932	95	Yes	Yes	1
-dec8_bin	dec8	69			0
-dec8_swedish_ci	dec8	3	Yes		0
-eucjpms_bin	eucjpms	98		Yes	1
-eucjpms_japanese_ci	eucjpms	97	Yes	Yes	1
-euckr_bin	euckr	85		Yes	1
-euckr_korean_ci	euckr	19	Yes	Yes	1
-gb2312_bin	gb2312	86		Yes	1
-gb2312_chinese_ci	gb2312	24	Yes	Yes	1
-gbk_bin	gbk	87		Yes	1
-gbk_chinese_ci	gbk	28	Yes	Yes	1
-geostd8_bin	geostd8	93			0
-geostd8_general_ci	geostd8	92	Yes		0
-greek_bin	greek	70			0
-greek_general_ci	greek	25	Yes		0
-hebrew_bin	hebrew	71			0
-hebrew_general_ci	hebrew	16	Yes		0
-hp8_bin	hp8	72			0
-hp8_english_ci	hp8	6	Yes		0
-keybcs2_bin	keybcs2	73			0
-keybcs2_general_ci	keybcs2	37	Yes		0
-koi8r_bin	koi8r	74			0
-koi8r_general_ci	koi8r	7	Yes		0
-koi8u_bin	koi8u	75			0
-koi8u_general_ci	koi8u	22	Yes		0
-latin1_bin	latin1	47		Yes	1
-latin1_danish_ci	latin1	15		Yes	1
-latin1_general_ci	latin1	48		Yes	1
-latin1_general_cs	latin1	49		Yes	1
-latin1_german1_ci	latin1	5		Yes	1
-latin1_german2_ci	latin1	31		Yes	2
-latin1_spanish_ci	latin1	94		Yes	1
-latin1_swedish_ci	latin1	8	Yes	Yes	1
-latin2_bin	latin2	77		Yes	1
-latin2_croatian_ci	latin2	27		Yes	1
-latin2_czech_cs	latin2	2		Yes	4
-latin2_general_ci	latin2	9	Yes	Yes	1
-latin2_hungarian_ci	latin2	21		Yes	1
-latin5_bin	latin5	78			0
-latin5_turkish_ci	latin5	30	Yes		0
-latin7_bin	latin7	79			0
-latin7_estonian_cs	latin7	20			0
-latin7_general_ci	latin7	41	Yes		0
-latin7_general_cs	latin7	42			0
-macce_bin	macce	43			0
-macce_general_ci	macce	38	Yes		0
-macroman_bin	macroman	53			0
-macroman_general_ci	macroman	39	Yes		0
-sjis_bin	sjis	88		Yes	1
-sjis_japanese_ci	sjis	13	Yes	Yes	1
-swe7_bin	swe7	82			0
-swe7_swedish_ci	swe7	10	Yes		0
-tis620_bin	tis620	89		Yes	1
-tis620_thai_ci	tis620	18	Yes	Yes	4
-ucs2_bin	ucs2	90		Yes	1
-ucs2_czech_ci	ucs2	138		Yes	8
-ucs2_danish_ci	ucs2	139		Yes	8
-ucs2_esperanto_ci	ucs2	145		Yes	8
-ucs2_estonian_ci	ucs2	134		Yes	8
-ucs2_general_ci	ucs2	35	Yes	Yes	1
-ucs2_hungarian_ci	ucs2	146		Yes	8
-ucs2_icelandic_ci	ucs2	129		Yes	8
-ucs2_latvian_ci	ucs2	130		Yes	8
-ucs2_lithuanian_ci	ucs2	140		Yes	8
-ucs2_persian_ci	ucs2	144		Yes	8
-ucs2_polish_ci	ucs2	133		Yes	8
-ucs2_romanian_ci	ucs2	131		Yes	8
-ucs2_roman_ci	ucs2	143		Yes	8
-ucs2_slovak_ci	ucs2	141		Yes	8
-ucs2_slovenian_ci	ucs2	132		Yes	8
-ucs2_spanish2_ci	ucs2	142		Yes	8
-ucs2_spanish_ci	ucs2	135		Yes	8
-ucs2_swedish_ci	ucs2	136		Yes	8
-ucs2_turkish_ci	ucs2	137		Yes	8
-ucs2_unicode_ci	ucs2	128		Yes	8
-ujis_bin	ujis	91		Yes	1
-ujis_japanese_ci	ujis	12	Yes	Yes	1
-utf8_bin	utf8	83		Yes	1
-utf8_czech_ci	utf8	202		Yes	8
-utf8_danish_ci	utf8	203		Yes	8
-utf8_esperanto_ci	utf8	209		Yes	8
-utf8_estonian_ci	utf8	198		Yes	8
-utf8_general_ci	utf8	33	Yes	Yes	1
-utf8_general_cs	utf8	254		Yes	1
-utf8_hungarian_ci	utf8	210		Yes	8
-utf8_icelandic_ci	utf8	193		Yes	8
-utf8_latvian_ci	utf8	194		Yes	8
-utf8_lithuanian_ci	utf8	204		Yes	8
-utf8_persian_ci	utf8	208		Yes	8
-utf8_polish_ci	utf8	197		Yes	8
-utf8_romanian_ci	utf8	195		Yes	8
-utf8_roman_ci	utf8	207		Yes	8
-utf8_slovak_ci	utf8	205		Yes	8
-utf8_slovenian_ci	utf8	196		Yes	8
-utf8_spanish2_ci	utf8	206		Yes	8
-utf8_spanish_ci	utf8	199		Yes	8
-utf8_swedish_ci	utf8	200		Yes	8
-utf8_turkish_ci	utf8	201		Yes	8
-utf8_unicode_ci	utf8	192		Yes	8
-
-
-SELECT *
-FROM information_schema.collation_character_set_applicability
-ORDER BY collation_name, character_set_name;
-COLLATION_NAME	CHARACTER_SET_NAME
-armscii8_bin	armscii8
-armscii8_general_ci	armscii8
-ascii_bin	ascii
-ascii_general_ci	ascii
-big5_bin	big5
-big5_chinese_ci	big5
-binary	binary
-cp1250_bin	cp1250
-cp1250_croatian_ci	cp1250
-cp1250_czech_cs	cp1250
-cp1250_general_ci	cp1250
-cp1251_bin	cp1251
-cp1251_bulgarian_ci	cp1251
-cp1251_general_ci	cp1251
-cp1251_general_cs	cp1251
-cp1251_ukrainian_ci	cp1251
-cp1256_bin	cp1256
-cp1256_general_ci	cp1256
-cp1257_bin	cp1257
-cp1257_general_ci	cp1257
-cp1257_lithuanian_ci	cp1257
-cp850_bin	cp850
-cp850_general_ci	cp850
-cp852_bin	cp852
-cp852_general_ci	cp852
-cp866_bin	cp866
-cp866_general_ci	cp866
-cp932_bin	cp932
-cp932_japanese_ci	cp932
-dec8_bin	dec8
-dec8_swedish_ci	dec8
-eucjpms_bin	eucjpms
-eucjpms_japanese_ci	eucjpms
-euckr_bin	euckr
-euckr_korean_ci	euckr
-gb2312_bin	gb2312
-gb2312_chinese_ci	gb2312
-gbk_bin	gbk
-gbk_chinese_ci	gbk
-geostd8_bin	geostd8
-geostd8_general_ci	geostd8
-greek_bin	greek
-greek_general_ci	greek
-hebrew_bin	hebrew
-hebrew_general_ci	hebrew
-hp8_bin	hp8
-hp8_english_ci	hp8
-keybcs2_bin	keybcs2
-keybcs2_general_ci	keybcs2
-koi8r_bin	koi8r
-koi8r_general_ci	koi8r
-koi8u_bin	koi8u
-koi8u_general_ci	koi8u
-latin1_bin	latin1
-latin1_danish_ci	latin1
-latin1_general_ci	latin1
-latin1_general_cs	latin1
-latin1_german1_ci	latin1
-latin1_german2_ci	latin1
-latin1_spanish_ci	latin1
-latin1_swedish_ci	latin1
-latin2_bin	latin2
-latin2_croatian_ci	latin2
-latin2_czech_cs	latin2
-latin2_general_ci	latin2
-latin2_hungarian_ci	latin2
-latin5_bin	latin5
-latin5_turkish_ci	latin5
-latin7_bin	latin7
-latin7_estonian_cs	latin7
-latin7_general_ci	latin7
-latin7_general_cs	latin7
-macce_bin	macce
-macce_general_ci	macce
-macroman_bin	macroman
-macroman_general_ci	macroman
-sjis_bin	sjis
-sjis_japanese_ci	sjis
-swe7_bin	swe7
-swe7_swedish_ci	swe7
-tis620_bin	tis620
-tis620_thai_ci	tis620
-ucs2_bin	ucs2
-ucs2_czech_ci	ucs2
-ucs2_danish_ci	ucs2
-ucs2_esperanto_ci	ucs2
-ucs2_estonian_ci	ucs2
-ucs2_general_ci	ucs2
-ucs2_hungarian_ci	ucs2
-ucs2_icelandic_ci	ucs2
-ucs2_latvian_ci	ucs2
-ucs2_lithuanian_ci	ucs2
-ucs2_persian_ci	ucs2
-ucs2_polish_ci	ucs2
-ucs2_romanian_ci	ucs2
-ucs2_roman_ci	ucs2
-ucs2_slovak_ci	ucs2
-ucs2_slovenian_ci	ucs2
-ucs2_spanish2_ci	ucs2
-ucs2_spanish_ci	ucs2
-ucs2_swedish_ci	ucs2
-ucs2_turkish_ci	ucs2
-ucs2_unicode_ci	ucs2
-ujis_bin	ujis
-ujis_japanese_ci	ujis
-utf8_bin	utf8
-utf8_czech_ci	utf8
-utf8_danish_ci	utf8
-utf8_esperanto_ci	utf8
-utf8_estonian_ci	utf8
-utf8_general_ci	utf8
-utf8_general_cs	utf8
-utf8_hungarian_ci	utf8
-utf8_icelandic_ci	utf8
-utf8_latvian_ci	utf8
-utf8_lithuanian_ci	utf8
-utf8_persian_ci	utf8
-utf8_polish_ci	utf8
-utf8_romanian_ci	utf8
-utf8_roman_ci	utf8
-utf8_slovak_ci	utf8
-utf8_slovenian_ci	utf8
-utf8_spanish2_ci	utf8
-utf8_spanish_ci	utf8
-utf8_swedish_ci	utf8
-utf8_turkish_ci	utf8
-utf8_unicode_ci	utf8
-# Switch to connection default + disconnect con
-DROP USER dbdict_test@localhost;
diff --git a/mysql-test/suite/funcs_1/r/charset_collation_3.result b/mysql-test/suite/funcs_1/r/charset_collation_3.result
deleted file mode 100644
index b9a2dbe8a98..00000000000
--- a/mysql-test/suite/funcs_1/r/charset_collation_3.result
+++ /dev/null
@@ -1,309 +0,0 @@
-DROP USER dbdict_test@localhost;
-CREATE USER dbdict_test@localhost;
-# Establish connection con (user=dbdict_test)
-
-SELECT *
-FROM information_schema.character_sets
-ORDER BY character_set_name;
-CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
-armscii8	armscii8_general_ci	ARMSCII-8 Armenian	1
-ascii	ascii_general_ci	US ASCII	1
-big5	big5_chinese_ci	Big5 Traditional Chinese	2
-binary	binary	Binary pseudo charset	1
-cp1250	cp1250_general_ci	Windows Central European	1
-cp1251	cp1251_general_ci	Windows Cyrillic	1
-cp1256	cp1256_general_ci	Windows Arabic	1
-cp1257	cp1257_general_ci	Windows Baltic	1
-cp850	cp850_general_ci	DOS West European	1
-cp852	cp852_general_ci	DOS Central European	1
-cp866	cp866_general_ci	DOS Russian	1
-cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
-dec8	dec8_swedish_ci	DEC West European	1
-eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
-euckr	euckr_korean_ci	EUC-KR Korean	2
-gb2312	gb2312_chinese_ci	GB2312 Simplified Chinese	2
-gbk	gbk_chinese_ci	GBK Simplified Chinese	2
-geostd8	geostd8_general_ci	GEOSTD8 Georgian	1
-greek	greek_general_ci	ISO 8859-7 Greek	1
-hebrew	hebrew_general_ci	ISO 8859-8 Hebrew	1
-hp8	hp8_english_ci	HP West European	1
-keybcs2	keybcs2_general_ci	DOS Kamenicky Czech-Slovak	1
-koi8r	koi8r_general_ci	KOI8-R Relcom Russian	1
-koi8u	koi8u_general_ci	KOI8-U Ukrainian	1
-latin1	latin1_swedish_ci	cp1252 West European	1
-latin2	latin2_general_ci	ISO 8859-2 Central European	1
-latin5	latin5_turkish_ci	ISO 8859-9 Turkish	1
-latin7	latin7_general_ci	ISO 8859-13 Baltic	1
-macce	macce_general_ci	Mac Central European	1
-macroman	macroman_general_ci	Mac West European	1
-sjis	sjis_japanese_ci	Shift-JIS Japanese	2
-swe7	swe7_swedish_ci	7bit Swedish	1
-tis620	tis620_thai_ci	TIS620 Thai	1
-ucs2	ucs2_general_ci	UCS-2 Unicode	2
-ujis	ujis_japanese_ci	EUC-JP Japanese	3
-utf8	utf8_general_ci	UTF-8 Unicode	3
-
-SELECT *
-FROM information_schema.collations
-ORDER BY collation_name;
-COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
-armscii8_bin	armscii8	64		Yes	1
-armscii8_general_ci	armscii8	32	Yes	Yes	1
-ascii_bin	ascii	65		Yes	1
-ascii_general_ci	ascii	11	Yes	Yes	1
-big5_bin	big5	84		Yes	1
-big5_chinese_ci	big5	1	Yes	Yes	1
-binary	binary	63	Yes	Yes	1
-cp1250_bin	cp1250	66		Yes	1
-cp1250_croatian_ci	cp1250	44		Yes	1
-cp1250_czech_cs	cp1250	34		Yes	2
-cp1250_general_ci	cp1250	26	Yes	Yes	1
-cp1251_bin	cp1251	50		Yes	1
-cp1251_bulgarian_ci	cp1251	14		Yes	1
-cp1251_general_ci	cp1251	51	Yes	Yes	1
-cp1251_general_cs	cp1251	52		Yes	1
-cp1251_ukrainian_ci	cp1251	23		Yes	1
-cp1256_bin	cp1256	67		Yes	1
-cp1256_general_ci	cp1256	57	Yes	Yes	1
-cp1257_bin	cp1257	58		Yes	1
-cp1257_general_ci	cp1257	59	Yes	Yes	1
-cp1257_lithuanian_ci	cp1257	29		Yes	1
-cp850_bin	cp850	80		Yes	1
-cp850_general_ci	cp850	4	Yes	Yes	1
-cp852_bin	cp852	81		Yes	1
-cp852_general_ci	cp852	40	Yes	Yes	1
-cp866_bin	cp866	68		Yes	1
-cp866_general_ci	cp866	36	Yes	Yes	1
-cp932_bin	cp932	96		Yes	1
-cp932_japanese_ci	cp932	95	Yes	Yes	1
-dec8_bin	dec8	69		Yes	1
-dec8_swedish_ci	dec8	3	Yes	Yes	1
-eucjpms_bin	eucjpms	98		Yes	1
-eucjpms_japanese_ci	eucjpms	97	Yes	Yes	1
-euckr_bin	euckr	85		Yes	1
-euckr_korean_ci	euckr	19	Yes	Yes	1
-gb2312_bin	gb2312	86		Yes	1
-gb2312_chinese_ci	gb2312	24	Yes	Yes	1
-gbk_bin	gbk	87		Yes	1
-gbk_chinese_ci	gbk	28	Yes	Yes	1
-geostd8_bin	geostd8	93		Yes	1
-geostd8_general_ci	geostd8	92	Yes	Yes	1
-greek_bin	greek	70		Yes	1
-greek_general_ci	greek	25	Yes	Yes	1
-hebrew_bin	hebrew	71		Yes	1
-hebrew_general_ci	hebrew	16	Yes	Yes	1
-hp8_bin	hp8	72		Yes	1
-hp8_english_ci	hp8	6	Yes	Yes	1
-keybcs2_bin	keybcs2	73		Yes	1
-keybcs2_general_ci	keybcs2	37	Yes	Yes	1
-koi8r_bin	koi8r	74		Yes	1
-koi8r_general_ci	koi8r	7	Yes	Yes	1
-koi8u_bin	koi8u	75		Yes	1
-koi8u_general_ci	koi8u	22	Yes	Yes	1
-latin1_bin	latin1	47		Yes	1
-latin1_danish_ci	latin1	15		Yes	1
-latin1_general_ci	latin1	48		Yes	1
-latin1_general_cs	latin1	49		Yes	1
-latin1_german1_ci	latin1	5		Yes	1
-latin1_german2_ci	latin1	31		Yes	2
-latin1_spanish_ci	latin1	94		Yes	1
-latin1_swedish_ci	latin1	8	Yes	Yes	1
-latin2_bin	latin2	77		Yes	1
-latin2_croatian_ci	latin2	27		Yes	1
-latin2_czech_cs	latin2	2		Yes	4
-latin2_general_ci	latin2	9	Yes	Yes	1
-latin2_hungarian_ci	latin2	21		Yes	1
-latin5_bin	latin5	78		Yes	1
-latin5_turkish_ci	latin5	30	Yes	Yes	1
-latin7_bin	latin7	79		Yes	1
-latin7_estonian_cs	latin7	20		Yes	1
-latin7_general_ci	latin7	41	Yes	Yes	1
-latin7_general_cs	latin7	42		Yes	1
-macce_bin	macce	43		Yes	1
-macce_general_ci	macce	38	Yes	Yes	1
-macroman_bin	macroman	53		Yes	1
-macroman_general_ci	macroman	39	Yes	Yes	1
-sjis_bin	sjis	88		Yes	1
-sjis_japanese_ci	sjis	13	Yes	Yes	1
-swe7_bin	swe7	82		Yes	1
-swe7_swedish_ci	swe7	10	Yes	Yes	1
-tis620_bin	tis620	89		Yes	1
-tis620_thai_ci	tis620	18	Yes	Yes	4
-ucs2_bin	ucs2	90		Yes	1
-ucs2_czech_ci	ucs2	138		Yes	8
-ucs2_danish_ci	ucs2	139		Yes	8
-ucs2_esperanto_ci	ucs2	145		Yes	8
-ucs2_estonian_ci	ucs2	134		Yes	8
-ucs2_general_ci	ucs2	35	Yes	Yes	1
-ucs2_hungarian_ci	ucs2	146		Yes	8
-ucs2_icelandic_ci	ucs2	129		Yes	8
-ucs2_latvian_ci	ucs2	130		Yes	8
-ucs2_lithuanian_ci	ucs2	140		Yes	8
-ucs2_persian_ci	ucs2	144		Yes	8
-ucs2_polish_ci	ucs2	133		Yes	8
-ucs2_romanian_ci	ucs2	131		Yes	8
-ucs2_roman_ci	ucs2	143		Yes	8
-ucs2_slovak_ci	ucs2	141		Yes	8
-ucs2_slovenian_ci	ucs2	132		Yes	8
-ucs2_spanish2_ci	ucs2	142		Yes	8
-ucs2_spanish_ci	ucs2	135		Yes	8
-ucs2_swedish_ci	ucs2	136		Yes	8
-ucs2_turkish_ci	ucs2	137		Yes	8
-ucs2_unicode_ci	ucs2	128		Yes	8
-ujis_bin	ujis	91		Yes	1
-ujis_japanese_ci	ujis	12	Yes	Yes	1
-utf8_bin	utf8	83		Yes	1
-utf8_czech_ci	utf8	202		Yes	8
-utf8_danish_ci	utf8	203		Yes	8
-utf8_esperanto_ci	utf8	209		Yes	8
-utf8_estonian_ci	utf8	198		Yes	8
-utf8_general_ci	utf8	33	Yes	Yes	1
-utf8_hungarian_ci	utf8	210		Yes	8
-utf8_icelandic_ci	utf8	193		Yes	8
-utf8_latvian_ci	utf8	194		Yes	8
-utf8_lithuanian_ci	utf8	204		Yes	8
-utf8_persian_ci	utf8	208		Yes	8
-utf8_polish_ci	utf8	197		Yes	8
-utf8_romanian_ci	utf8	195		Yes	8
-utf8_roman_ci	utf8	207		Yes	8
-utf8_slovak_ci	utf8	205		Yes	8
-utf8_slovenian_ci	utf8	196		Yes	8
-utf8_spanish2_ci	utf8	206		Yes	8
-utf8_spanish_ci	utf8	199		Yes	8
-utf8_swedish_ci	utf8	200		Yes	8
-utf8_turkish_ci	utf8	201		Yes	8
-utf8_unicode_ci	utf8	192		Yes	8
-
-
-SELECT *
-FROM information_schema.collation_character_set_applicability
-ORDER BY collation_name, character_set_name;
-COLLATION_NAME	CHARACTER_SET_NAME
-armscii8_bin	armscii8
-armscii8_general_ci	armscii8
-ascii_bin	ascii
-ascii_general_ci	ascii
-big5_bin	big5
-big5_chinese_ci	big5
-binary	binary
-cp1250_bin	cp1250
-cp1250_croatian_ci	cp1250
-cp1250_czech_cs	cp1250
-cp1250_general_ci	cp1250
-cp1251_bin	cp1251
-cp1251_bulgarian_ci	cp1251
-cp1251_general_ci	cp1251
-cp1251_general_cs	cp1251
-cp1251_ukrainian_ci	cp1251
-cp1256_bin	cp1256
-cp1256_general_ci	cp1256
-cp1257_bin	cp1257
-cp1257_general_ci	cp1257
-cp1257_lithuanian_ci	cp1257
-cp850_bin	cp850
-cp850_general_ci	cp850
-cp852_bin	cp852
-cp852_general_ci	cp852
-cp866_bin	cp866
-cp866_general_ci	cp866
-cp932_bin	cp932
-cp932_japanese_ci	cp932
-dec8_bin	dec8
-dec8_swedish_ci	dec8
-eucjpms_bin	eucjpms
-eucjpms_japanese_ci	eucjpms
-euckr_bin	euckr
-euckr_korean_ci	euckr
-gb2312_bin	gb2312
-gb2312_chinese_ci	gb2312
-gbk_bin	gbk
-gbk_chinese_ci	gbk
-geostd8_bin	geostd8
-geostd8_general_ci	geostd8
-greek_bin	greek
-greek_general_ci	greek
-hebrew_bin	hebrew
-hebrew_general_ci	hebrew
-hp8_bin	hp8
-hp8_english_ci	hp8
-keybcs2_bin	keybcs2
-keybcs2_general_ci	keybcs2
-koi8r_bin	koi8r
-koi8r_general_ci	koi8r
-koi8u_bin	koi8u
-koi8u_general_ci	koi8u
-latin1_bin	latin1
-latin1_danish_ci	latin1
-latin1_general_ci	latin1
-latin1_general_cs	latin1
-latin1_german1_ci	latin1
-latin1_german2_ci	latin1
-latin1_spanish_ci	latin1
-latin1_swedish_ci	latin1
-latin2_bin	latin2
-latin2_croatian_ci	latin2
-latin2_czech_cs	latin2
-latin2_general_ci	latin2
-latin2_hungarian_ci	latin2
-latin5_bin	latin5
-latin5_turkish_ci	latin5
-latin7_bin	latin7
-latin7_estonian_cs	latin7
-latin7_general_ci	latin7
-latin7_general_cs	latin7
-macce_bin	macce
-macce_general_ci	macce
-macroman_bin	macroman
-macroman_general_ci	macroman
-sjis_bin	sjis
-sjis_japanese_ci	sjis
-swe7_bin	swe7
-swe7_swedish_ci	swe7
-tis620_bin	tis620
-tis620_thai_ci	tis620
-ucs2_bin	ucs2
-ucs2_czech_ci	ucs2
-ucs2_danish_ci	ucs2
-ucs2_esperanto_ci	ucs2
-ucs2_estonian_ci	ucs2
-ucs2_general_ci	ucs2
-ucs2_hungarian_ci	ucs2
-ucs2_icelandic_ci	ucs2
-ucs2_latvian_ci	ucs2
-ucs2_lithuanian_ci	ucs2
-ucs2_persian_ci	ucs2
-ucs2_polish_ci	ucs2
-ucs2_romanian_ci	ucs2
-ucs2_roman_ci	ucs2
-ucs2_slovak_ci	ucs2
-ucs2_slovenian_ci	ucs2
-ucs2_spanish2_ci	ucs2
-ucs2_spanish_ci	ucs2
-ucs2_swedish_ci	ucs2
-ucs2_turkish_ci	ucs2
-ucs2_unicode_ci	ucs2
-ujis_bin	ujis
-ujis_japanese_ci	ujis
-utf8_bin	utf8
-utf8_czech_ci	utf8
-utf8_danish_ci	utf8
-utf8_esperanto_ci	utf8
-utf8_estonian_ci	utf8
-utf8_general_ci	utf8
-utf8_hungarian_ci	utf8
-utf8_icelandic_ci	utf8
-utf8_latvian_ci	utf8
-utf8_lithuanian_ci	utf8
-utf8_persian_ci	utf8
-utf8_polish_ci	utf8
-utf8_romanian_ci	utf8
-utf8_roman_ci	utf8
-utf8_slovak_ci	utf8
-utf8_slovenian_ci	utf8
-utf8_spanish2_ci	utf8
-utf8_spanish_ci	utf8
-utf8_swedish_ci	utf8
-utf8_turkish_ci	utf8
-utf8_unicode_ci	utf8
-# Switch to connection default + disconnect con
-DROP USER dbdict_test@localhost;
diff --git a/mysql-test/suite/funcs_1/datadict/charset_collation.inc b/mysql-test/suite/funcs_1/t/charset_collation.test
similarity index 54%
rename from mysql-test/suite/funcs_1/datadict/charset_collation.inc
rename to mysql-test/suite/funcs_1/t/charset_collation.test
index ae03996b073..186eb1f5b85 100644
--- a/mysql-test/suite/funcs_1/datadict/charset_collation.inc
+++ b/mysql-test/suite/funcs_1/t/charset_collation.test
@@ -1,58 +1,16 @@
-# suite/funcs_1/datadict/charset_collation.inc
+# suite/funcs_1/t/charset_collation.test
 #
 # Tests checking the content of the information_schema tables
 #      character_sets
 #      collations
 #      collation_character_set_applicability
 #
-#
-# The amount and properties of character_sets/collations depend on the
-# build type
-# 2007-12 MySQL 5.0, 2008-06 MySQL 5.1
-# ---------------------------------------------------------------------
-#
-# Variant 1 fits to
-#    version_comment       MySQL Enterprise Server (Commercial)
-#    version_comment       MySQL Enterprise Server (GPL)
-#    version_comment       MySQL Classic Server (Commercial)
-#    version_comment       MySQL Pushbuild Edition, build <number>
-#   (version_comment       Source distribution
-#    and
-#    compile was without "max" - > no collation 'utf8_general_ci')
-#
-# Variant 2 fits to
-#    version_comment       MySQL Enterprise Server (GPL)
-#    version_comment       MySQL Classic Server (Commercial)
-#    version_comment       MySQL Pushbuild Edition, build <number>
-#   (version_comment       Source distribution
-#    and
-#    compile was without "max" - > collation 'utf8_general_ci' exists)
-#
-# Difference between variant 1 and 2 is the collation 'utf8_general_ci'.
-#
-# Variant 3 fits to
-#    version_comment       MySQL Community Server (GPL)
-#    version_comment       MySQL Cluster Server (Commercial)
-#    version_comment       MySQL Advanced Server (GPL)         5.1
-#    version_comment       MySQL Advanced Server (Commercial)  5.1
-#
-# Difference between variant 3 and 2 is within the collation properties
-# IS_COMPILED and SORTLEN.
-#
-# 2008-06 All time excluded variant is "vanilla".
-# How to build "vanilla":
-#    ./BUILD/autorun.sh
-#    ./configure
-#    ./make
-# Some properties of "vanilla"
-#    version_comment       Source distribution
-#    Compared to the variants 1 to 3 a lot of character sets are missing.
-#    Example: "ucs2_bin" is in variant 1 to 3 but not in "vanilla".
-#
 # Created:
-# 2007-12-18 mleich - remove the unstable character_set/collation subtests
-#                     from include/datadict-master.inc
-#                   - create this new test
+# 2009-04-28 mleich Replace the charset_collation_* test which failed too often
+#                   because of changes
+#                   - in general available character sets and collations
+#                   - in build types
+#                   (Bug#40545, Bug#40209, Bug#40618, Bug#38346)
 #
 
 # Create a low privileged user.
@@ -61,7 +19,6 @@ DROP USER dbdict_test@localhost;
 CREATE USER dbdict_test@localhost;
 
 --echo # Establish connection con (user=dbdict_test)
---replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (con,localhost,dbdict_test,,);
 ################################################################################
 #
@@ -97,32 +54,48 @@ connect (con,localhost,dbdict_test,,);
 #          combinations for which the current user and PUBLIC have no
 #          USAGE privilege.
 #
-# Notes (2007-12-19 mleich):
+# Notes (2009-04-28 mleich):
 # - The requirements are outdated because grant/revoke privilege for using a
 #   characterset/collation were never implemented.
-#   Therefore the tests should simply check the content of these tables.
-#
+#   Therefore the tests focus on the completeness and correctness of the
+#   content (rows and columns) of these tables.
 # - The amount of collations/character sets grows with new MySQL releases.
-#
-# - Even within the same release the amount of records within these tables
+#   Even within the same release the amount of records within these tables
 #   can differ between different build types (community, enterprise, source,...)
-#
+#   Therefore we limit the queries to character sets and collations which
+#   - exist in all build types
+#   - have in all build types the same "state".
+#   The character set
+#   - utf8 is used for Metadata
+#   - ascii is a quite usual
+#   The collations <character set>_general_ci and <character set>_bin seem
+#   to be available all time.
 #
 ################################################################################
+
+let $char_set_condition= character_set_name IN ('utf8','latin1','binary');
+let $collation_condition=
+   (collation_name LIKE CONCAT(character_set_name,'_general_ci')
+    OR
+    collation_name LIKE CONCAT(character_set_name,'_bin'));
 --echo
-SELECT *
+eval SELECT *
 FROM information_schema.character_sets
+WHERE $char_set_condition
 ORDER BY character_set_name;
 
 --echo
-SELECT *
+eval SELECT *
 FROM information_schema.collations
+WHERE $char_set_condition
+  AND $collation_condition
 ORDER BY collation_name;
 
-echo;
 --echo
-SELECT *
+eval SELECT *
 FROM information_schema.collation_character_set_applicability
+WHERE $char_set_condition
+  AND $collation_condition
 ORDER BY collation_name, character_set_name;
 
 
diff --git a/mysql-test/suite/funcs_1/t/charset_collation_1.test b/mysql-test/suite/funcs_1/t/charset_collation_1.test
deleted file mode 100644
index 15777062a72..00000000000
--- a/mysql-test/suite/funcs_1/t/charset_collation_1.test
+++ /dev/null
@@ -1,32 +0,0 @@
-# Tests checking the content of the information_schema tables
-#      character_sets
-#      collations
-#      collation_character_set_applicability
-#
-# Content variant 1 which should fit to
-#    Enterprise or Classic builds (binaries provided by MySQL)
-#    Pushbuilds
-#    Source builds without "max"
-#
-# Please read suite/funcs_1/datadict/charset_collation.inc for
-# additional information.
-#
-# Created:
-# 2007-12-18 mleich - remove the unstable character_set/collation subtests
-#                     from include/datadict-master.inc
-#                   - create this new test
-#
-
-if (`SELECT EXISTS (SELECT 1 FROM information_schema.collations
-                    WHERE collation_name = 'utf8_general_cs')
-       OR (    @@version_comment NOT LIKE '%Source%'
-           AND @@version_comment NOT LIKE '%Enterprise%'
-           AND @@version_comment NOT LIKE '%Classic%'
-           AND @@version_comment NOT LIKE '%Pushbuild%')
-       OR (SELECT count(*) = 0 FROM information_schema.collations
-                    WHERE collation_name = 'ucs2_bin')`)
-{
-  skip Test needs Enterprise, Classic , regular Pushbuild or Source-without-max build;
-}
-
---source suite/funcs_1/datadict/charset_collation.inc
diff --git a/mysql-test/suite/funcs_1/t/charset_collation_2.test b/mysql-test/suite/funcs_1/t/charset_collation_2.test
deleted file mode 100644
index d4924953b7d..00000000000
--- a/mysql-test/suite/funcs_1/t/charset_collation_2.test
+++ /dev/null
@@ -1,24 +0,0 @@
-# Tests checking the content of the information_schema tables
-#      character_sets
-#      collations
-#      collation_character_set_applicability
-#
-# Content variant 2 (compile from source with "max")
-#
-# Please read suite/funcs_1/datadict/charset_collation.inc for
-# additional information.
-#
-# Created:
-# 2007-12-18 mleich - remove the unstable character_set/collation subtests
-#                     from include/datadict-master.inc
-#                   - create this new test
-#
-
-if (`SELECT @@version_comment NOT LIKE '%Source%'
-     OR NOT EXISTS (SELECT 1 FROM information_schema.collations
-                    WHERE collation_name = 'utf8_general_cs')`)
-{
-  skip Test needs Source build with "max";
-}
-
---source suite/funcs_1/datadict/charset_collation.inc
diff --git a/mysql-test/suite/funcs_1/t/charset_collation_3.test b/mysql-test/suite/funcs_1/t/charset_collation_3.test
deleted file mode 100644
index e88b44e4a0f..00000000000
--- a/mysql-test/suite/funcs_1/t/charset_collation_3.test
+++ /dev/null
@@ -1,25 +0,0 @@
-# Tests checking the content of the information_schema tables
-#      character_sets
-#      collations
-#      collation_character_set_applicability
-#
-# Content variant 3 which should fit to
-#    Community and Cluster builds (binaries provided by MySQL)
-#
-# Please read suite/funcs_1/datadict/charset_collation.inc for
-# additional information.
-#
-# Created:
-# 2007-12-18 mleich - remove the unstable character_set/collation subtests
-#                     from include/datadict-master.inc
-#                   - create this new test
-#
-
-if (`SELECT @@version_comment NOT LIKE '%Community%'
-        AND @@version_comment NOT LIKE '%Cluster%'
-        AND @@version_comment NOT LIKE '%Advanced%'`)
-{
-   skip Test needs Community, Cluster or Advanced build;
-}
-
---source suite/funcs_1/datadict/charset_collation.inc

From 1b454e345cfd43e6bbea9565c6e628384c1ff9ad Mon Sep 17 00:00:00 2001
From: V Narayanan <v.narayanan@sun.com>
Date: Mon, 22 Jun 2009 16:40:34 +0530
Subject: [PATCH 09/25] Bug#43572  Handle failures from hash_init

The merge from http://lists.mysql.com/commits/76678 caused the
growth_size parameter to the my_init_dynamic_array function to
be ignored. This patch corrects the problem.
---
 mysys/hash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysys/hash.c b/mysys/hash.c
index 2490a6c2019..63933abb085 100644
--- a/mysys/hash.c
+++ b/mysys/hash.c
@@ -89,7 +89,7 @@ _my_hash_init(HASH *hash, uint growth_size, CHARSET_INFO *charset,
   hash->flags=flags;
   hash->charset=charset;
   DBUG_RETURN(my_init_dynamic_array_ci(&hash->array, 
-                                       sizeof(HASH_LINK), size, 0));
+                                       sizeof(HASH_LINK), size, growth_size));
 }
 
 

From 2c6d34214912c58e5e17c61938f504c819e7f76a Mon Sep 17 00:00:00 2001
From: Satya B <satya.bn@sun.com>
Date: Mon, 22 Jun 2009 16:58:00 +0530
Subject: [PATCH 10/25] Applying InnoDB snashot 5.1-ss5343, Fixes BUG#45357

1. BUG#45357 - 5.1.35 crashes with Failing assertion: index->type & DICT_CLUSTERED

2. Also fixes the compilation problem when the flag -DUNIV_MUST_NOT_INLINE

Detailed revision comments:

r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines
branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,
refuse to unlock the record.
(Bug #45357, caused by the fix of Bug #39320).
rb://132 approved by Sunny Bains.
r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" so that the code compiles
with -DUNIV_MUST_NOT_INLINE.
---
 mysql-test/r/innodb_bug45357.result  |  7 +++++++
 mysql-test/t/innodb_bug45357.test    | 10 ++++++++++
 storage/innobase/btr/btr0cur.c       |  1 +
 storage/innobase/include/trx0rseg.ic |  1 +
 storage/innobase/row/row0mysql.c     |  9 +++++++--
 storage/innobase/trx/trx0rec.c       |  1 +
 6 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 mysql-test/r/innodb_bug45357.result
 create mode 100644 mysql-test/t/innodb_bug45357.test

diff --git a/mysql-test/r/innodb_bug45357.result b/mysql-test/r/innodb_bug45357.result
new file mode 100644
index 00000000000..7adeff2062f
--- /dev/null
+++ b/mysql-test/r/innodb_bug45357.result
@@ -0,0 +1,7 @@
+set session transaction isolation level read committed;
+create table bug45357(a int, b int,key(b))engine=innodb;
+insert into bug45357 values (25170,6122);
+update bug45357 set a=1 where b=30131;
+delete from bug45357 where b < 20996;
+delete from bug45357 where b < 7001;
+drop table bug45357;
diff --git a/mysql-test/t/innodb_bug45357.test b/mysql-test/t/innodb_bug45357.test
new file mode 100644
index 00000000000..81727f352dd
--- /dev/null
+++ b/mysql-test/t/innodb_bug45357.test
@@ -0,0 +1,10 @@
+-- source include/have_innodb.inc
+
+set session transaction isolation level read committed;
+
+create table bug45357(a int, b int,key(b))engine=innodb;
+insert into bug45357 values (25170,6122);
+update bug45357 set a=1 where b=30131;
+delete from bug45357 where b < 20996;
+delete from bug45357 where b < 7001;
+drop table bug45357;
diff --git a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c
index 54acdf73db6..d2a2e4d2157 100644
--- a/storage/innobase/btr/btr0cur.c
+++ b/storage/innobase/btr/btr0cur.c
@@ -23,6 +23,7 @@ Created 10/16/1994 Heikki Tuuri
 #include "btr0cur.ic"
 #endif
 
+#include "mtr0log.h"
 #include "page0page.h"
 #include "rem0rec.h"
 #include "rem0cmp.h"
diff --git a/storage/innobase/include/trx0rseg.ic b/storage/innobase/include/trx0rseg.ic
index eb1893587a6..577cd0dee7b 100644
--- a/storage/innobase/include/trx0rseg.ic
+++ b/storage/innobase/include/trx0rseg.ic
@@ -7,6 +7,7 @@ Created 3/26/1996 Heikki Tuuri
 *******************************************************/
 
 #include "srv0srv.h"
+#include "mtr0log.h"
 
 /**********************************************************************
 Gets a rollback segment header. */
diff --git a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
index 2d9ed4fc944..6ec466cf995 100644
--- a/storage/innobase/row/row0mysql.c
+++ b/storage/innobase/row/row0mysql.c
@@ -1529,9 +1529,14 @@ row_unlock_for_mysql(
 			index = btr_pcur_get_btr_cur(clust_pcur)->index;
 		}
 
+		if (UNIV_UNLIKELY(!(index->type & DICT_CLUSTERED))) {
+			/* This is not a clustered index record.  We
+			do not know how to unlock the record. */
+			goto no_unlock;
+		}
+
 		/* If the record has been modified by this
 		transaction, do not unlock it. */
-		ut_a(index->type & DICT_CLUSTERED);
 
 		if (index->trx_id_offset) {
 			rec_trx_id = trx_read_trx_id(rec
@@ -1568,7 +1573,7 @@ row_unlock_for_mysql(
 						prebuilt->select_lock_type);
 			}
 		}
-
+no_unlock:
 		mtr_commit(&mtr);
 	}
 
diff --git a/storage/innobase/trx/trx0rec.c b/storage/innobase/trx/trx0rec.c
index 50f8b011463..38ad53fcfb0 100644
--- a/storage/innobase/trx/trx0rec.c
+++ b/storage/innobase/trx/trx0rec.c
@@ -23,6 +23,7 @@ Created 3/26/1996 Heikki Tuuri
 #include "que0que.h"
 #include "trx0purge.h"
 #include "row0row.h"
+#include "mtr0log.h"
 
 /*=========== UNDO LOG RECORD CREATION AND DECODING ====================*/
 

From 2cc1134c2cc2e3bcf80a5454f15d71b77016d362 Mon Sep 17 00:00:00 2001
From: Martin Hansson <martin.hansson@sun.com>
Date: Mon, 22 Jun 2009 14:51:33 +0200
Subject: [PATCH 11/25] Bug#44653: Server crash noticed when executing random
 queries with partitions.

When opening a table, it is imperative that the flag
TABLE::auto_increment_field_not_null be false. But if an error occured during
the creation of a table (e.g. the table exists already) with an auto_increment
column and a BEFORE trigger that used the INSERT ... SELECT construct, the
flag was not reset until after error checking. Thus if an error occured,
select_insert::send_data() returned immediately and it was not reset (see * in
pseudocode below).  Crash happened if the table was opened again. Fixed by
resetting the flag after error checking.

nested-loops_join():
  for each row in SELECT table {
    select_insert::send_data():
      if a values is supplied for AUTO_INCREMENT column
         table->auto_increment_field_not_null= TRUE
       else
         table->auto_increment_field_not_null= FALSE
       if (error)
         return 1; *
       if (table->auto_increment_field_not_null == FALSE)
         ...
       table->auto_increment_field_not_null == FALSE
  }
<-- table returned to table cache and later retrieved by open_table:
open_table():
  assert(table->auto_increment_field_not_null)
---
 mysql-test/r/trigger.result | 14 ++++++++++++++
 mysql-test/t/trigger.test   | 26 ++++++++++++++++++++++++++
 sql/sql_insert.cc           |  3 +++
 3 files changed, 43 insertions(+)

diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result
index 23f15f618f2..4476735735c 100644
--- a/mysql-test/r/trigger.result
+++ b/mysql-test/r/trigger.result
@@ -2073,4 +2073,18 @@ select @a, @b;
 drop trigger trg1;
 drop trigger trg2;
 drop table t1, t2;
+CREATE TABLE t1 ( a INT, b INT );
+CREATE TABLE t2 ( a INT AUTO_INCREMENT KEY, b INT );
+INSERT INTO t1 (a) VALUES (1);
+CREATE TRIGGER tr1
+BEFORE INSERT ON t2
+FOR EACH ROW 
+BEGIN 
+UPDATE a_nonextisting_table SET a = 1;
+END//
+CREATE TABLE IF NOT EXISTS t2 ( a INT, b INT ) SELECT a, b FROM t1;
+ERROR 42S02: Table 'test.a_nonextisting_table' doesn't exist
+SELECT * FROM t2;
+a	b
+DROP TABLE t1, t2;
 End of 5.1 tests.
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test
index 9a5556c518d..1e55f9d5993 100644
--- a/mysql-test/t/trigger.test
+++ b/mysql-test/t/trigger.test
@@ -2370,4 +2370,30 @@ drop trigger trg1;
 drop trigger trg2;
 drop table t1, t2;
 
+#
+# Bug#44653: Server crash noticed when executing random queries with partitions.
+#
+CREATE TABLE t1 ( a INT, b INT );
+CREATE TABLE t2 ( a INT AUTO_INCREMENT KEY, b INT );
+
+INSERT INTO t1 (a) VALUES (1);
+
+delimiter //;
+CREATE TRIGGER tr1
+BEFORE INSERT ON t2
+FOR EACH ROW 
+BEGIN 
+  UPDATE a_nonextisting_table SET a = 1;
+END//
+delimiter ;//
+
+--disable_abort_on_error
+CREATE TABLE IF NOT EXISTS t2 ( a INT, b INT ) SELECT a, b FROM t1;
+--enable_abort_on_error
+
+# Caused failed assertion
+SELECT * FROM t2;
+
+DROP TABLE t1, t2;
+
 --echo End of 5.1 tests.
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 9de27868d74..633dbf67bbc 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -3100,7 +3100,10 @@ bool select_insert::send_data(List<Item> &values)
   store_values(values);
   thd->count_cuted_fields= CHECK_FIELD_IGNORE;
   if (thd->is_error())
+  {
+    table->auto_increment_field_not_null= FALSE;
     DBUG_RETURN(1);
+  }
   if (table_list)                               // Not CREATE ... SELECT
   {
     switch (table_list->view_check_option(thd, info.ignore)) {

From 3625c1e1579be1d6a79daf134b41bc2bb121cd18 Mon Sep 17 00:00:00 2001
From: Alexey Kopytov <Alexey.Kopytov@Sun.com>
Date: Tue, 23 Jun 2009 10:15:27 +0400
Subject: [PATCH 12/25] Bug #45309: InnoDB does not rollback for delete and
 update             queries if query was killed

Since we rely on thd->is_error() to decide whether we should
COMMIT or ROLLBACK after a query execution, check the query
'killed' state and throw an error before calling
ha_autocommit_or_rollback(), not after.

The patch was tested manually. For reliable results, the test
case would have to KILL QUERY while a DELETE/UPDATE query in
another thread is still running. I don't see a way to achieve
this kind of synchronization in our test suite (no debug_sync
in 5.1).
---
 sql/sql_parse.cc | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 9c621004cc3..c593f563052 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1560,14 +1560,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
     break;
   }
 
-  /* If commit fails, we should be able to reset the OK status. */
-  thd->main_da.can_overwrite_status= TRUE;
-  ha_autocommit_or_rollback(thd, thd->is_error());
-  thd->main_da.can_overwrite_status= FALSE;
-
-  thd->transaction.stmt.reset();
-
-
   /* report error issued during command execution */
   if (thd->killed_errno())
   {
@@ -1580,6 +1572,13 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
     thd->mysys_var->abort= 0;
   }
 
+  /* If commit fails, we should be able to reset the OK status. */
+  thd->main_da.can_overwrite_status= TRUE;
+  ha_autocommit_or_rollback(thd, thd->is_error());
+  thd->main_da.can_overwrite_status= FALSE;
+
+  thd->transaction.stmt.reset();
+
   net_end_statement(thd);
   query_cache_end_of_result(thd);
 

From 0ecf826a863891312c9b3aa84ccc9a7b781a795a Mon Sep 17 00:00:00 2001
From: Andrei Elkin <aelkin@mysql.com>
Date: Tue, 23 Jun 2009 12:10:04 +0300
Subject: [PATCH 13/25] Bug #38240 Crash in safe_mutex_lock () thr_mutex.c line
 97 on rotate_relay_log

The reason for the crash was rotate_relay_log (mi=0x0) did not verify
the passed value of active_mi.  There are more cases where active_mi
is supposed to be non-zero e.g change_master(), stop_slave(), and it's
reasonable to protect from a similar crash all of them with common
fixes.

Fixed with spliting end_slave() in slave threads release and slave
data clean-up parts (a new close_active_mi()). The new function is
invoked at the very end of close_connections() so that all users of
active_mi are proven to have left.
---
 sql/mysqld.cc |  1 +
 sql/slave.cc  | 25 +++++++++++++++++++++----
 sql/slave.h   |  3 ++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 1d18226ab45..f7ee7b025f9 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -983,6 +983,7 @@ static void close_connections(void)
   }
   (void) pthread_mutex_unlock(&LOCK_thread_count);
 
+  close_active_mi();
   DBUG_PRINT("quit",("close_connections thread"));
   DBUG_VOID_RETURN;
 }
diff --git a/sql/slave.cc b/sql/slave.cc
index 043b0e3fed5..5570a07c02d 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -668,7 +668,7 @@ static int end_slave_on_walk(Master_info* mi, uchar* /*unused*/)
 
 
 /*
-  Free all resources used by slave
+  Release slave threads at time of executing shutdown.
 
   SYNOPSIS
     end_slave()
@@ -694,14 +694,31 @@ void end_slave()
       once multi-master code is ready.
     */
     terminate_slave_threads(active_mi,SLAVE_FORCE_ALL);
-    end_master_info(active_mi);
-    delete active_mi;
-    active_mi= 0;
   }
   pthread_mutex_unlock(&LOCK_active_mi);
   DBUG_VOID_RETURN;
 }
 
+/**
+   Free all resources used by slave threads at time of executing shutdown.
+   The routine must be called after all possible users of @c active_mi
+   have left.
+
+   SYNOPSIS
+     close_active_mi()
+
+*/
+void close_active_mi()
+{
+  pthread_mutex_lock(&LOCK_active_mi);
+  if (active_mi)
+  {
+    end_master_info(active_mi);
+    delete active_mi;
+    active_mi= 0;
+  }
+  pthread_mutex_unlock(&LOCK_active_mi);
+}
 
 static bool io_slave_killed(THD* thd, Master_info* mi)
 {
diff --git a/sql/slave.h b/sql/slave.h
index abd63315e62..160418955b5 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -174,7 +174,8 @@ const char *print_slave_db_safe(const char *db);
 int check_expected_error(THD* thd, Relay_log_info const *rli, int error_code);
 void skip_load_data_infile(NET* net);
 
-void end_slave(); /* clean up */
+void end_slave(); /* release slave threads */
+void close_active_mi(); /* clean up slave threads data */
 void clear_until_condition(Relay_log_info* rli);
 void clear_slave_error(Relay_log_info* rli);
 void end_relay_log_info(Relay_log_info* rli);

From 2c29e27418ebb7bd65910d4265e5eaab95336837 Mon Sep 17 00:00:00 2001
From: "Bernt M. Johnsen" <bernt.johnsen@sun.com>
Date: Tue, 23 Jun 2009 14:32:14 +0200
Subject: [PATCH 14/25] Bug#45293 Supressed some warnings

---
 mysql-test/suite/funcs_1/r/storedproc.result | 8 --------
 mysql-test/suite/funcs_1/t/storedproc.test   | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result
index 7e21ddf1544..3efb361dc82 100644
--- a/mysql-test/suite/funcs_1/r/storedproc.result
+++ b/mysql-test/suite/funcs_1/r/storedproc.result
@@ -18241,8 +18241,6 @@ END//
 CALL sp70_n(-1e+40);
 f1
 -10000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
 -10000000000000000000000000000000000000000
@@ -18255,8 +18253,6 @@ END//
 CALL sp71_nu(1.00e+40);
 f1
 10000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
 10000000000000000000000000000000000000000
@@ -18269,8 +18265,6 @@ END//
 CALL sp72_nuz(1.00e+40);
 f1
 0000000000000000000000010000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
 0000000000000000000000010000000000000000000000000000000000000000
@@ -18283,8 +18277,6 @@ END//
 CALL sp73_n_z(1.00e+40);
 f1
 0000000000000000000000010000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
 0000000000000000000000010000000000000000000000000000000000000000
diff --git a/mysql-test/suite/funcs_1/t/storedproc.test b/mysql-test/suite/funcs_1/t/storedproc.test
index dc1177ac8bb..67fc33269a3 100644
--- a/mysql-test/suite/funcs_1/t/storedproc.test
+++ b/mysql-test/suite/funcs_1/t/storedproc.test
@@ -22429,7 +22429,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_warnings
 CALL sp70_n(-1e+40);
+--enable_warnings
 eval CALL sp70_n( $minus_40 );
 
 
@@ -22445,7 +22447,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_warnings
 CALL sp71_nu(1.00e+40);
+--enable_warnings
 eval CALL sp71_nu( $plus_40 );
 
 
@@ -22461,7 +22465,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_warnings
 CALL sp72_nuz(1.00e+40);
+--enable_warnings
 eval CALL sp72_nuz( $plus_40 );
 
 
@@ -22477,7 +22483,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_warnings
 CALL sp73_n_z(1.00e+40);
+--enable_warnings
 eval CALL sp73_n_z( $plus_40 );
 
 

From 2c53a70e1563a8c79262e7561ee3a33be6a01e01 Mon Sep 17 00:00:00 2001
From: Sergey Glukhov <Sergey.Glukhov@sun.com>
Date: Thu, 25 Jun 2009 11:22:39 +0500
Subject: [PATCH 15/25] Bug#45485 replication different between master/slaver
 using procedure with gbk In Item_param::set_from_user_var
 value.cs_info.character_set_client is set to 'fromcs' value. It's wrong, it
 should be set to thd->variables.character_set_client.

---
 mysql-test/r/ctype_gbk_binlog.result | 26 ++++++++++++++++++++
 mysql-test/t/ctype_gbk_binlog.test   | 36 ++++++++++++++++++++++++++++
 sql/item.cc                          |  4 ++--
 3 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 mysql-test/r/ctype_gbk_binlog.result
 create mode 100644 mysql-test/t/ctype_gbk_binlog.test

diff --git a/mysql-test/r/ctype_gbk_binlog.result b/mysql-test/r/ctype_gbk_binlog.result
new file mode 100644
index 00000000000..a49e170ff19
--- /dev/null
+++ b/mysql-test/r/ctype_gbk_binlog.result
@@ -0,0 +1,26 @@
+SET NAMES gbk;
+CREATE TABLE t1 (
+f1 BLOB
+) ENGINE=MyISAM DEFAULT CHARSET=gbk;
+CREATE PROCEDURE p1(IN val BLOB)
+BEGIN
+SET @tval = val;
+SET @sql_cmd = CONCAT_WS(' ', 'insert into t1(f1) values(?)');
+PREPARE stmt FROM @sql_cmd;
+EXECUTE stmt USING @tval;
+DEALLOCATE PREPARE stmt;
+END|
+SET @`tcontent`:=_binary 0x50434B000900000000000000E9000000 COLLATE `binary`/*!*/;
+CALL p1(@`tcontent`);
+FLUSH LOGS;
+DROP PROCEDURE p1;
+RENAME TABLE t1 to t2;
+SELECT hex(f1) FROM t2;
+hex(f1)
+50434B000900000000000000E9000000
+SELECT hex(f1) FROM t1;
+hex(f1)
+50434B000900000000000000E9000000
+DROP PROCEDURE p1;
+DROP TABLE t1;
+DROP TABLE t2;
diff --git a/mysql-test/t/ctype_gbk_binlog.test b/mysql-test/t/ctype_gbk_binlog.test
new file mode 100644
index 00000000000..99763667f4f
--- /dev/null
+++ b/mysql-test/t/ctype_gbk_binlog.test
@@ -0,0 +1,36 @@
+-- source include/have_log_bin.inc
+-- source include/have_gbk.inc
+
+SET NAMES gbk;
+--character_set gbk
+
+CREATE TABLE t1 (
+  f1 BLOB
+) ENGINE=MyISAM DEFAULT CHARSET=gbk;
+
+delimiter |;
+CREATE PROCEDURE p1(IN val BLOB)
+BEGIN
+     SET @tval = val;
+     SET @sql_cmd = CONCAT_WS(' ', 'insert into t1(f1) values(?)');
+     PREPARE stmt FROM @sql_cmd;
+     EXECUTE stmt USING @tval;
+     DEALLOCATE PREPARE stmt;
+END|
+delimiter ;|
+
+SET @`tcontent`:=_binary 0x50434B000900000000000000E9000000 COLLATE `binary`/*!*/;
+CALL p1(@`tcontent`);
+
+FLUSH LOGS;
+DROP PROCEDURE p1;
+RENAME TABLE t1 to t2;
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+--exec $MYSQL_BINLOG --force-if-open --short-form $MYSQLD_DATADIR/master-bin.000001 | $MYSQL
+SELECT hex(f1) FROM t2;
+SELECT hex(f1) FROM t1;
+
+DROP PROCEDURE p1;
+DROP TABLE t1;
+DROP TABLE t2;
diff --git a/sql/item.cc b/sql/item.cc
index e693bf32f61..4c967200a3a 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -2771,8 +2771,8 @@ bool Item_param::set_from_user_var(THD *thd, const user_var_entry *entry)
       CHARSET_INFO *tocs= thd->variables.collation_connection;
       uint32 dummy_offset;
 
-      value.cs_info.character_set_of_placeholder= 
-        value.cs_info.character_set_client= fromcs;
+      value.cs_info.character_set_of_placeholder= fromcs;
+      value.cs_info.character_set_client= thd->variables.character_set_client;
       /*
         Setup source and destination character sets so that they
         are different only if conversion is necessary: this will

From cd8151ed255c8515df8e09563c26303eda0890e3 Mon Sep 17 00:00:00 2001
From: Sergey Glukhov <Sergey.Glukhov@sun.com>
Date: Thu, 25 Jun 2009 13:44:50 +0500
Subject: [PATCH 16/25] test case fix

---
 mysql-test/r/ctype_cp932_binlog_stm.result | 16 ++++++++--------
 mysql-test/t/ctype_cp932_binlog_stm.test   |  5 +++--
 mysql-test/t/ctype_gbk_binlog.test         |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/mysql-test/r/ctype_cp932_binlog_stm.result b/mysql-test/r/ctype_cp932_binlog_stm.result
index 2f67eb16b2e..044885d1ea7 100644
--- a/mysql-test/r/ctype_cp932_binlog_stm.result
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result
@@ -9,7 +9,7 @@ EXECUTE stmt1 USING @var1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES('ƒ\0')
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES(0x8300)
 SELECT HEX(f1) FROM t1;
 HEX(f1)
 8300
@@ -29,22 +29,22 @@ HEX(s1)	HEX(s2)	d
 466F6F2773206120426172	ED40ED41ED42	47.93
 DROP PROCEDURE bug18293|
 DROP TABLE t4|
-SHOW BINLOG EVENTS FROM 369|
+SHOW BINLOG EVENTS FROM 370|
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	369	Query	1	535	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
+master-bin.000001	370	Query	1	536	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
 s2 CHAR(50) CHARACTER SET cp932,
 d DECIMAL(10,2))
-master-bin.000001	535	Query	1	784	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `bug18293`(IN ins1 CHAR(50),
+master-bin.000001	536	Query	1	785	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `bug18293`(IN ins1 CHAR(50),
 IN ins2 CHAR(50) CHARACTER SET cp932,
 IN ind DECIMAL(10,2))
 BEGIN
 INSERT INTO t4 VALUES (ins1, ins2, ind);
 END
-master-bin.000001	784	Query	1	1048	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172 COLLATE 'latin1_swedish_ci'),  NAME_CONST('ins2',_cp932 0xED40ED41ED42 COLLATE 'cp932_japanese_ci'),  NAME_CONST('ind',47.93))
-master-bin.000001	1048	Query	1	1137	use `test`; DROP PROCEDURE bug18293
-master-bin.000001	1137	Query	1	1216	use `test`; DROP TABLE t4
+master-bin.000001	785	Query	1	1049	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172 COLLATE 'latin1_swedish_ci'),  NAME_CONST('ins2',_cp932 0xED40ED41ED42 COLLATE 'cp932_japanese_ci'),  NAME_CONST('ind',47.93))
+master-bin.000001	1049	Query	1	1138	use `test`; DROP PROCEDURE bug18293
+master-bin.000001	1138	Query	1	1217	use `test`; DROP TABLE t4
 End of 5.0 tests
-SHOW BINLOG EVENTS FROM 364;
+SHOW BINLOG EVENTS FROM 365;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error
 Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment.
 CREATE TABLE t1 (a varchar(16)) character set cp932;
diff --git a/mysql-test/t/ctype_cp932_binlog_stm.test b/mysql-test/t/ctype_cp932_binlog_stm.test
index 9e9716e5ddb..89df33a6df5 100644
--- a/mysql-test/t/ctype_cp932_binlog_stm.test
+++ b/mysql-test/t/ctype_cp932_binlog_stm.test
@@ -22,7 +22,7 @@ CALL bug18293("Foo's a Bar", _cp932 0xED40ED41ED42, 47.93)|
 SELECT HEX(s1),HEX(s2),d FROM t4|
 DROP PROCEDURE bug18293|
 DROP TABLE t4|
-SHOW BINLOG EVENTS FROM 369|
+SHOW BINLOG EVENTS FROM 370|
 delimiter ;|
 
 --echo End of 5.0 tests
@@ -31,8 +31,9 @@ delimiter ;|
 # #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump 
 # Note: 364 is a magic position (found experimentally, depends on 
 # the log's contents) that caused the server crash.
+
 --error 1220
-SHOW BINLOG EVENTS FROM 364;
+SHOW BINLOG EVENTS FROM 365;
 
 --echo Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment.
 CREATE TABLE t1 (a varchar(16)) character set cp932;
diff --git a/mysql-test/t/ctype_gbk_binlog.test b/mysql-test/t/ctype_gbk_binlog.test
index 99763667f4f..a8f653d1b1e 100644
--- a/mysql-test/t/ctype_gbk_binlog.test
+++ b/mysql-test/t/ctype_gbk_binlog.test
@@ -1,4 +1,4 @@
--- source include/have_log_bin.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
 -- source include/have_gbk.inc
 
 SET NAMES gbk;

From 663e41aebdab002cd33cf28eb55edf588278f0a2 Mon Sep 17 00:00:00 2001
From: Satya B <satya.bn@sun.com>
Date: Thu, 25 Jun 2009 15:06:12 +0530
Subject: [PATCH 17/25] Applying InnoDB snashot 5.0-ss5406, part 1. Fixes
 BUG#38479

BUG#38479 - valgrind warnings in show table status for innodb tables

Detailed revision comments:

r5080 | vasil | 2009-05-22 14:45:34 +0300 (Fri, 22 May 2009) | 6 lines
branches/5.0:

Fix Bug#38479 valgrind warnings in show table status for innodb tables

by initializing prebuilt->hint_need_to_fetch_extra_cols.
---
 innobase/row/row0mysql.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c
index d7213b25145..cab6a9ce272 100644
--- a/innobase/row/row0mysql.c
+++ b/innobase/row/row0mysql.c
@@ -625,7 +625,9 @@ row_create_prebuilt(
 	prebuilt->ins_node = NULL;
 
 	prebuilt->ins_upd_rec_buff = NULL;
-	
+
+	prebuilt->hint_need_to_fetch_extra_cols = 0;
+
 	prebuilt->upd_node = NULL;
 	prebuilt->ins_graph = NULL;
 	prebuilt->upd_graph = NULL;

From c417035866a1970ac7a8a2efe577a61b39a2b463 Mon Sep 17 00:00:00 2001
From: Satya B <satya.bn@sun.com>
Date: Thu, 25 Jun 2009 15:20:26 +0530
Subject: [PATCH 18/25] Applying InnoDB snashot 5.0-ss5406, part 2. Fixes
 BUG#40565

BUG#40565 - Update Query Results in "1 Row Affected" But Should Be "Zero Rows"

Detailed revision comments:

r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").

Also, add a test case for Bug #40565.

rb://128 approved by Heikki Tuuri
  ------------------------------------------------------------------------
  r3590 | marko | 2008-12-18 15:33:36 +0200 (Thu, 18 Dec 2008) | 11 lines

  branches/5.1: When converting a record to MySQL format, copy the default
  column values for columns that are SQL NULL.  This addresses failures in
  row-based replication (Bug #39648).

  row_prebuilt_t: Add default_rec, for the default values of the columns in
  MySQL format.

  row_sel_store_mysql_rec(): Use prebuilt->default_rec instead of
  padding columns.

  rb://64 approved by Heikki Tuuri
  ------------------------------------------------------------------------
---
 innobase/include/row0mysql.h        |  2 +
 innobase/row/row0mysql.c            |  2 +
 innobase/row/row0sel.c              | 57 ++++-------------------------
 mysql-test/r/innodb_bug40565.result |  9 +++++
 mysql-test/t/innodb_bug40565.test   | 10 +++++
 sql/ha_innodb.cc                    |  3 ++
 6 files changed, 33 insertions(+), 50 deletions(-)
 create mode 100644 mysql-test/r/innodb_bug40565.result
 create mode 100644 mysql-test/t/innodb_bug40565.test

diff --git a/innobase/include/row0mysql.h b/innobase/include/row0mysql.h
index 9e28fabe491..2349539eafd 100644
--- a/innobase/include/row0mysql.h
+++ b/innobase/include/row0mysql.h
@@ -581,6 +581,8 @@ struct row_prebuilt_struct {
 	byte*		ins_upd_rec_buff;/* buffer for storing data converted
 					to the Innobase format from the MySQL
 					format */
+	const void*	default_rec;	/* the default values of all columns
+					(a "default row") in MySQL format */
 	ulint		hint_need_to_fetch_extra_cols;
 					/* normally this is set to 0; if this
 					is set to ROW_RETRIEVE_PRIMARY_KEY,
diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c
index cab6a9ce272..75c54cec4b3 100644
--- a/innobase/row/row0mysql.c
+++ b/innobase/row/row0mysql.c
@@ -626,6 +626,8 @@ row_create_prebuilt(
 
 	prebuilt->ins_upd_rec_buff = NULL;
 
+	prebuilt->default_rec = NULL;
+
 	prebuilt->hint_need_to_fetch_extra_cols = 0;
 
 	prebuilt->upd_node = NULL;
diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c
index c956492900d..973d8fad2e7 100644
--- a/innobase/row/row0sel.c
+++ b/innobase/row/row0sel.c
@@ -2423,8 +2423,9 @@ row_sel_store_mysql_rec(
 	byte*			data;
 	ulint			len;
 	ulint			i;
-	
+
 	ut_ad(prebuilt->mysql_template);
+	ut_ad(prebuilt->default_rec);
 	ut_ad(rec_offs_validate(rec, NULL, offsets));
 
 	if (UNIV_LIKELY_NULL(prebuilt->blob_heap)) {
@@ -2520,58 +2521,14 @@ row_sel_store_mysql_rec(
 					~(byte) (templ->mysql_null_bit_mask);
 			}
 		} else {
-		        /* MySQL seems to assume the field for an SQL NULL
-		        value is set to zero or space. Not taking this into
-			account caused seg faults with NULL BLOB fields, and
-		        bug number 154 in the MySQL bug database: GROUP BY
-		        and DISTINCT could treat NULL values inequal. */
-			int	pad_char;
+			/* MySQL assumes that the field for an SQL
+			NULL value is set to the default value. */
 
 			mysql_rec[templ->mysql_null_byte_offset] |=
 					(byte) (templ->mysql_null_bit_mask);
-			switch (templ->type) {
-			case DATA_VARCHAR:
-			case DATA_BINARY:
-			case DATA_VARMYSQL:
-				if (templ->mysql_type
-				    == DATA_MYSQL_TRUE_VARCHAR) {
-					/* This is a >= 5.0.3 type
-					true VARCHAR.  Zero the field. */
-					pad_char = 0x00;
-					break;
-				}
-				/* Fall through */
-			case DATA_CHAR:
-			case DATA_FIXBINARY:
-			case DATA_MYSQL:
-			        /* MySQL pads all string types (except
-				BLOB, TEXT and true VARCHAR) with space. */
-				if (UNIV_UNLIKELY(templ->mbminlen == 2)) {
-					/* Treat UCS2 as a special case. */
-					data = mysql_rec
-						+ templ->mysql_col_offset;
-					len = templ->mysql_col_len;
-					/* There are two UCS2 bytes per char,
-					so the length has to be even. */
-					ut_a(!(len & 1));
-					/* Pad with 0x0020. */
-					while (len) {
-						*data++ = 0x00;
-						*data++ = 0x20;
-						len -= 2;
-					}
-					continue;
-				}
-				pad_char = 0x20;
-				break;
-			default:
-				pad_char = 0x00;
-				break;
-			}
-
-			ut_ad(!pad_char || templ->mbminlen == 1);
-			memset(mysql_rec + templ->mysql_col_offset,
-					pad_char, templ->mysql_col_len);
+			memcpy(mysql_rec + templ->mysql_col_offset,
+			       prebuilt->default_rec + templ->mysql_col_offset,
+			       templ->mysql_col_len);
 		}
 	} 
 
diff --git a/mysql-test/r/innodb_bug40565.result b/mysql-test/r/innodb_bug40565.result
new file mode 100644
index 00000000000..21e923d9336
--- /dev/null
+++ b/mysql-test/r/innodb_bug40565.result
@@ -0,0 +1,9 @@
+create table bug40565(value decimal(4,2)) engine=innodb;
+insert into bug40565 values (1), (null);
+update bug40565 set value=NULL;
+affected rows: 1
+info: Rows matched: 2  Changed: 1  Warnings: 0
+update bug40565 set value=NULL;
+affected rows: 0
+info: Rows matched: 2  Changed: 0  Warnings: 0
+drop table bug40565;
diff --git a/mysql-test/t/innodb_bug40565.test b/mysql-test/t/innodb_bug40565.test
new file mode 100644
index 00000000000..d7aa0fd514a
--- /dev/null
+++ b/mysql-test/t/innodb_bug40565.test
@@ -0,0 +1,10 @@
+# Bug #40565 Update Query Results in "1 Row Affected" But Should Be "Zero Rows"
+-- source include/have_innodb.inc
+
+create table bug40565(value decimal(4,2)) engine=innodb;
+insert into bug40565 values (1), (null);
+--enable_info
+update bug40565 set value=NULL;
+update bug40565 set value=NULL;
+--disable_info
+drop table bug40565;
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index f71e891e88d..7eb6ef05d9c 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -2253,6 +2253,9 @@ ha_innobase::open(
 
 	((row_prebuilt_t*)innobase_prebuilt)->mysql_row_len =
 							table->s->reclength;
+	((row_prebuilt_t*)innobase_prebuilt)->default_rec
+		= table->s->default_values;
+	ut_ad(table->s->default_values);
 
 	/* Looks like MySQL-3.23 sometimes has primary key number != 0 */
 

From 3393fdf80ad60040cf992308be6949631e8f79ab Mon Sep 17 00:00:00 2001
From: Sergey Glukhov <Sergey.Glukhov@sun.com>
Date: Thu, 25 Jun 2009 15:52:50 +0500
Subject: [PATCH 19/25] Bug#45412 SHOW CREATE TRIGGER does not require
 privileges to disclose trigger data Added privilege checking to SHOW CREATE
 TRIGGER code.

---
 mysql-test/r/trigger_notembedded.result | 14 ++++++++++++++
 mysql-test/t/trigger_notembedded.test   | 23 +++++++++++++++++++++++
 sql/sql_show.cc                         |  6 ++++++
 3 files changed, 43 insertions(+)

diff --git a/mysql-test/r/trigger_notembedded.result b/mysql-test/r/trigger_notembedded.result
index 1e13bff03b1..335e6910a3a 100644
--- a/mysql-test/r/trigger_notembedded.result
+++ b/mysql-test/r/trigger_notembedded.result
@@ -462,4 +462,18 @@ unlock tables;
 select * from t1;
 i
 drop table t1;
+CREATE DATABASE db1;
+CREATE TABLE db1.t1 (a char(30)) ENGINE=MEMORY;
+CREATE TRIGGER db1.trg AFTER INSERT ON db1.t1 FOR EACH ROW
+INSERT INTO db1.t1 VALUES('Some very sensitive data goes here');
+CREATE USER 'no_rights'@'localhost';
+REVOKE ALL ON *.* FROM 'no_rights'@'localhost';
+FLUSH PRIVILEGES;
+SELECT trigger_name FROM INFORMATION_SCHEMA.TRIGGERS
+WHERE trigger_schema = 'db1';
+trigger_name
+SHOW CREATE TRIGGER db1.trg;
+ERROR 42000: Access denied; you need the TRIGGER privilege for this operation
+DROP USER 'no_rights'@'localhost';
+DROP DATABASE db1;
 End of 5.1 tests.
diff --git a/mysql-test/t/trigger_notembedded.test b/mysql-test/t/trigger_notembedded.test
index 9588ec6e3ed..7a7e6c6bc85 100644
--- a/mysql-test/t/trigger_notembedded.test
+++ b/mysql-test/t/trigger_notembedded.test
@@ -909,4 +909,27 @@ select * from t1;
 drop table t1;
 disconnect flush;
 
+#
+# Bug#45412 SHOW CREATE TRIGGER does not require privileges to disclose trigger data
+#
+CREATE DATABASE db1;
+CREATE TABLE db1.t1 (a char(30)) ENGINE=MEMORY;
+CREATE TRIGGER db1.trg AFTER INSERT ON db1.t1 FOR EACH ROW
+ INSERT INTO db1.t1 VALUES('Some very sensitive data goes here');
+
+CREATE USER 'no_rights'@'localhost';
+REVOKE ALL ON *.* FROM 'no_rights'@'localhost';
+FLUSH PRIVILEGES;
+
+connect (con1,localhost,no_rights,,);
+SELECT trigger_name FROM INFORMATION_SCHEMA.TRIGGERS
+ WHERE trigger_schema = 'db1';
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SHOW CREATE TRIGGER db1.trg;
+
+connection default;
+disconnect con1;
+DROP USER 'no_rights'@'localhost';
+DROP DATABASE db1;
+
 --echo End of 5.1 tests.
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 3964e38db5e..d07e951bfd1 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -7071,6 +7071,12 @@ bool show_create_trigger(THD *thd, const sp_name *trg_name)
   if (!lst)
     return TRUE;
 
+  if (check_table_access(thd, TRIGGER_ACL, lst, 1, TRUE))
+  {
+    my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "TRIGGER");
+    return TRUE;
+  }
+
   /*
     Open the table by name in order to load Table_triggers_list object.
 

From 75ba3c6a4b2b42d2b2a1de69a959ee72f5b0600f Mon Sep 17 00:00:00 2001
From: Kristofer Pettersson <kristofer.pettersson@sun.com>
Date: Thu, 25 Jun 2009 15:55:26 +0200
Subject: [PATCH 20/25] Bug#45336 --enable-foobar doesn't work for any plugin
 foobar.

Because of a regression introduced by bug#19027 the option --enable-foobar
doesn't work anymore for any plugin 'foobar'. The reason is that plugin
names are tristate options variables with optional parameters and integer
values are not accepted. Since the 'enable' prefix attempts to assign '1'
to the option the operation fails.

This patch translates any number n assigned to a plugin variable of type ENUM
to be the corresponding enumerated item. As a side effect --enable-foobar and
--disable-foobar will also start working again.
---
 mysys/my_getopt.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 33942d87e4f..fd3c2501226 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -20,6 +20,7 @@
 #include <mysys_err.h>
 #include <my_getopt.h>
 #include <errno.h>
+#include <m_string.h>
 
 typedef void (*init_func_p)(const struct my_option *option, uchar* *variable,
                             longlong value);
@@ -649,8 +650,18 @@ static int setval(const struct my_option *opts, uchar* *value, char *argument,
 	return EXIT_OUT_OF_MEMORY;
       break;
     case GET_ENUM:
-      if (((*(int*)result_pos)= find_type(argument, opts->typelib, 2) - 1) < 0)
-        return EXIT_ARGUMENT_INVALID;
+      if (((*(int*)result_pos)=
+             find_type(argument, opts->typelib, 2) - 1) < 0)
+      {
+        /*
+          Accept an integer representation of the enumerated item.
+        */
+        char *endptr;
+        unsigned int arg= (unsigned int) strtol(argument, &endptr, 10);
+        if (*endptr || arg >= opts->typelib->count)
+          return EXIT_ARGUMENT_INVALID;
+        *(int*)result_pos= arg;
+      }
       break;
     case GET_SET:
       *((ulonglong*)result_pos)= find_typeset(argument, opts->typelib, &err);

From b53715833509ecd21010edf99150154b201e9b23 Mon Sep 17 00:00:00 2001
From: Luis Soares <luis.soares@sun.com>
Date: Fri, 26 Jun 2009 12:05:56 +0100
Subject: [PATCH 21/25] BUG#44270: Post-push fix

The test case added failed sporadically on PB. This is due to the
fact that the user thread in some cases is waiting for slave IO
to stop and then check the error number. Thence, sometimes the
user thread would race for the error number with IO thread.

This post push fix addresses this by replacing the wait for slave
io to stop with a wait for slave io error (as it seems it was
added in 6.0 also after patch on which this is based was
pushed). This implied backporting wait_for_slave_io_error.inc
from 6.0 also.
---
 .../extra/rpl_tests/rpl_reset_slave.test      |  4 ++--
 .../include/wait_for_slave_io_error.inc       | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 mysql-test/include/wait_for_slave_io_error.inc

diff --git a/mysql-test/extra/rpl_tests/rpl_reset_slave.test b/mysql-test/extra/rpl_tests/rpl_reset_slave.test
index 49a142f10c2..1f88c792fce 100644
--- a/mysql-test/extra/rpl_tests/rpl_reset_slave.test
+++ b/mysql-test/extra/rpl_tests/rpl_reset_slave.test
@@ -58,7 +58,7 @@ echo *** errno must be zero: $last_io_errno ***;
 
 change master to master_user='impossible_user_name';
 start slave;
-source include/wait_for_slave_io_to_stop.inc;
+source include/wait_for_slave_io_error.inc;
 let $last_io_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
 --disable_query_log
 eval SELECT $last_io_errno > 0 as ONE;
@@ -79,7 +79,7 @@ let $last_io_error= query_get_value(SHOW SLAVE STATUS, Last_IO_Error, 1);
 source include/stop_slave.inc;
 change master to master_user='impossible_user_name';
 start slave;
-source include/wait_for_slave_io_to_stop.inc;
+source include/wait_for_slave_io_error.inc;
 let $last_io_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
 --disable_query_log
 eval SELECT $last_io_errno > 0 as ONE;
diff --git a/mysql-test/include/wait_for_slave_io_error.inc b/mysql-test/include/wait_for_slave_io_error.inc
new file mode 100644
index 00000000000..094406e02b2
--- /dev/null
+++ b/mysql-test/include/wait_for_slave_io_error.inc
@@ -0,0 +1,23 @@
+# ==== Purpose ====
+#
+# Waits until the IO thread of the current connection has got an
+# error, or until a timeout is reached.
+#
+# ==== Usage ====
+#
+# source include/wait_for_slave_io_error.inc;
+#
+# Parameters to this macro are $slave_timeout and
+# $slave_keep_connection. See wait_for_slave_param.inc for
+# descriptions.
+
+let $old_slave_param_comparison= $slave_param_comparison;
+
+let $slave_param= Last_IO_Errno;
+let $slave_param_comparison= !=;
+let $slave_param_value= 0;
+let $slave_error_message= Failed while waiting for slave to produce an error in its sql thread;
+source include/wait_for_slave_param.inc;
+let $slave_error_message= ;
+
+let $slave_param_comparison= $old_slave_param_comparison;

From 4c1333e6edc45bd10a23fa836f82d8b59d623fd5 Mon Sep 17 00:00:00 2001
From: Davi Arnaut <Davi.Arnaut@Sun.COM>
Date: Thu, 25 Jun 2009 12:25:23 -0300
Subject: [PATCH 22/25] Bug#45548: XA transaction without access to InnoDB
 tables crashes the server

The problem is that the one phase commit function failed to
properly end a empty transaction. The solution is to ensure
that the transaction cleanup procedure is invoked even for
empty transactions.
---
 mysql-test/r/xa.result |  8 ++++++++
 mysql-test/t/xa.test   | 14 ++++++++++++++
 sql/handler.cc         |  5 +++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/xa.result b/mysql-test/r/xa.result
index 92f52b402ec..a597806d897 100644
--- a/mysql-test/r/xa.result
+++ b/mysql-test/r/xa.result
@@ -81,3 +81,11 @@ xa rollback 'a';
 xa start 'a';
 xa end 'a';
 xa rollback 'a';
+xa start 'a';
+xa end 'a';
+xa prepare 'a';
+xa commit 'a';
+xa start 'a';
+xa end 'a';
+xa prepare 'a';
+xa commit 'a';
diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test
index a0d5aa60641..7b1c6a268d5 100644
--- a/mysql-test/t/xa.test
+++ b/mysql-test/t/xa.test
@@ -135,6 +135,20 @@ xa start 'a';
 xa end 'a';
 xa rollback 'a';
 
+#
+# Bug#45548: XA transaction without access to InnoDB tables crashes the server
+#
+
+xa start 'a';
+xa end 'a';
+xa prepare 'a';
+xa commit 'a';
+
+xa start 'a';
+xa end 'a';
+xa prepare 'a';
+xa commit 'a';
+
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
 
diff --git a/sql/handler.cc b/sql/handler.cc
index 7e584b8fcf3..e65ceba4181 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1242,9 +1242,10 @@ int ha_commit_one_phase(THD *thd, bool all)
 #endif
       thd->variables.tx_isolation=thd->session_tx_isolation;
     }
-    if (is_real_trans)
-      thd->transaction.cleanup();
   }
+  /* Free resources and perform other cleanup even for 'empty' transactions. */
+  if (is_real_trans)
+    thd->transaction.cleanup();
 #endif /* USING_TRANSACTIONS */
   DBUG_RETURN(error);
 }

From 498ac0f598f998999ac3d675466912f16d2d4e9e Mon Sep 17 00:00:00 2001
From: Staale Smedseng <staale.smedseng@sun.com>
Date: Thu, 25 Jun 2009 17:41:05 +0200
Subject: [PATCH 23/25] Bug #34002 uninitialized Rows_examined for some admin
 queries such as quit and shutdown

Logging to slow log can produce an undetermined value for
Rows_examined in special cases. In debug mode this manifests
itself as any of the various marker values used to mark
uninitialized memory on various platforms.

If logging happens on a THD object that hasn't performed any
row reads (on this or any previous connections), the
THD::examined_row_count may be uninitialized. This patch adds
initialization for this attribute.

No automated test cases are added, as for this to be
meaningful, we need to ensure that we're using a THD
fulfilling the above conditions. This is hard to do in the
mysql-test-run framework. The patch has been verified
manually, however, by restarting mysqld and running the test
included with the bug report.
---
 sql/sql_class.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index f1ad410b877..409e4dc4b8b 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -546,6 +546,7 @@ THD::THD()
    first_successful_insert_id_in_prev_stmt_for_binlog(0),
    first_successful_insert_id_in_cur_stmt(0),
    stmt_depends_on_first_successful_insert_id_in_prev_stmt(FALSE),
+   examined_row_count(0),
    global_read_lock(0),
    is_fatal_error(0),
    transaction_rollback_request(0),

From 0e64988a5e96d705f0ff28690eb04805ad090e0b Mon Sep 17 00:00:00 2001
From: Evgeny Potemkin <epotemkin@mysql.com>
Date: Fri, 26 Jun 2009 19:57:42 +0000
Subject: [PATCH 24/25] Bug#45266: Uninitialized variable lead to an empty
 result.

The TABLE::reginfo.impossible_range is used by the optimizer to indicate
that the condition applied to the table is impossible. It wasn't initialized
at table opening and this might lead to an empty result on complex queries:
a query might set the impossible_range flag on a table and when the query finishes,
all tables are returned back to the table cache. The next query that uses the table
with the impossible_range flag set and an index over the table will see the flag
and thus return an empty result.

The open_table function now initializes the TABLE::reginfo.impossible_range
variable.
---
 mysql-test/r/select.result | 79 ++++++++++++++++++++++++++++++++++
 mysql-test/t/select.test   | 86 ++++++++++++++++++++++++++++++++++++++
 sql/sql_base.cc            |  1 +
 sql/sql_select.cc          |  1 -
 sql/structs.h              |  4 ++
 5 files changed, 170 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 09c7d1b329d..50b5c3c13fb 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -4457,4 +4457,83 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 Warnings:
 Note	1003	select '0' AS `a`,'0' AS `b`,'0' AS `c` from `test`.`t1` where 1
 DROP TABLE t1;
+#
+# Bug#45266: Uninitialized variable lead to an empty result.
+#
+drop table if exists A,AA,B,BB;
+CREATE TABLE `A` (
+`pk` int(11) NOT NULL AUTO_INCREMENT,
+`date_key` date NOT NULL,
+`date_nokey` date NOT NULL,
+`datetime_key` datetime NOT NULL,
+`int_nokey` int(11) NOT NULL,
+`time_key` time NOT NULL,
+`time_nokey` time NOT NULL,
+PRIMARY KEY (`pk`),
+KEY `date_key` (`date_key`),
+KEY `time_key` (`time_key`),
+KEY `datetime_key` (`datetime_key`)
+);
+CREATE TABLE `AA` (
+`pk` int(11) NOT NULL AUTO_INCREMENT,
+`int_nokey` int(11) NOT NULL,
+`time_key` time NOT NULL,
+KEY `time_key` (`time_key`),
+PRIMARY KEY (`pk`)
+);
+CREATE TABLE `B` (
+`date_nokey` date NOT NULL,
+`date_key` date NOT NULL,
+`time_key` time NOT NULL,
+`datetime_nokey` datetime NOT NULL,
+`varchar_key` varchar(1) NOT NULL,
+KEY `date_key` (`date_key`),
+KEY `time_key` (`time_key`),
+KEY `varchar_key` (`varchar_key`)
+);
+INSERT INTO `B` VALUES ('2003-07-28','2003-07-28','15:13:38','0000-00-00 00:00:00','f'),('0000-00-00','0000-00-00','00:05:48','2004-07-02 14:34:13','x');
+CREATE TABLE `BB` (
+`pk` int(11) NOT NULL AUTO_INCREMENT,
+`int_nokey` int(11) NOT NULL,
+`date_key` date NOT NULL,
+`varchar_nokey` varchar(1) NOT NULL,
+`date_nokey` date NOT NULL,
+PRIMARY KEY (`pk`),
+KEY `date_key` (`date_key`)
+);
+INSERT INTO `BB` VALUES (10,8,'0000-00-00','i','0000-00-00'),(11,0,'2005-08-18','','2005-08-18');
+SELECT table1 . `pk` AS field1 
+FROM 
+(BB AS table1 INNER JOIN 
+(AA AS table2 STRAIGHT_JOIN A AS table3 
+ON ( table3 . `date_key` = table2 . `pk` ))
+ON ( table3 . `datetime_key` = table2 . `int_nokey` ))
+WHERE  ( table3 . `date_key` <= 4 AND table2 . `pk` = table1 . `varchar_nokey`)
+GROUP BY field1 ;
+field1
+SELECT table3 .`date_key` field1
+FROM
+B table1 LEFT JOIN B table3 JOIN
+(BB table6 JOIN A table7 ON table6 .`varchar_nokey`)
+ON table6 .`int_nokey` ON table6 .`date_key`
+  WHERE  NOT ( table1 .`varchar_key`  AND table7 .`pk`) GROUP  BY field1;
+field1
+NULL
+SELECT table4 . `time_nokey` AS field1 FROM 
+(AA AS table1 CROSS JOIN 
+(AA AS table2 STRAIGHT_JOIN 
+(B AS table3 STRAIGHT_JOIN A AS table4 
+ON ( table4 . `date_key` = table3 . `time_key` ))
+ON ( table4 . `pk` = table3 . `date_nokey` ))
+ON ( table4 . `time_key` = table3 . `datetime_nokey` ))
+WHERE  ( table4 . `time_key` < table1 . `time_key` AND
+table1 . `int_nokey` != 'f')
+GROUP BY field1  ORDER BY field1 , field1;
+field1
+SELECT table1 .`time_key` field2  FROM B table1  LEFT JOIN  BB JOIN A table5 ON table5 .`date_nokey`  ON table5 .`int_nokey` GROUP  BY field2;
+field2
+00:05:48
+15:13:38
+drop table A,AA,B,BB;
+#end of test for bug#45266
 End of 5.1 tests
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index 715bdf0e667..7d3785ecccc 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -3799,4 +3799,90 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE (a=a AND a=a AND b=b) OR b > 20;
 EXPLAIN EXTENDED SELECT * FROM t1 WHERE (a=a AND b=b AND a=a) OR b > 20;
 DROP TABLE t1;
 
+
+--echo #
+--echo # Bug#45266: Uninitialized variable lead to an empty result.
+--echo #
+--disable_warnings
+drop table if exists A,AA,B,BB;
+CREATE TABLE `A` (
+  `pk` int(11) NOT NULL AUTO_INCREMENT,
+  `date_key` date NOT NULL,
+  `date_nokey` date NOT NULL,
+  `datetime_key` datetime NOT NULL,
+  `int_nokey` int(11) NOT NULL,
+  `time_key` time NOT NULL,
+  `time_nokey` time NOT NULL,
+  PRIMARY KEY (`pk`),
+  KEY `date_key` (`date_key`),
+  KEY `time_key` (`time_key`),
+  KEY `datetime_key` (`datetime_key`)
+);
+
+CREATE TABLE `AA` (
+  `pk` int(11) NOT NULL AUTO_INCREMENT,
+  `int_nokey` int(11) NOT NULL,
+  `time_key` time NOT NULL,
+  KEY `time_key` (`time_key`),
+  PRIMARY KEY (`pk`)
+);
+
+CREATE TABLE `B` (
+  `date_nokey` date NOT NULL,
+  `date_key` date NOT NULL,
+  `time_key` time NOT NULL,
+  `datetime_nokey` datetime NOT NULL,
+  `varchar_key` varchar(1) NOT NULL,
+  KEY `date_key` (`date_key`),
+  KEY `time_key` (`time_key`),
+  KEY `varchar_key` (`varchar_key`)
+);
+
+INSERT INTO `B` VALUES ('2003-07-28','2003-07-28','15:13:38','0000-00-00 00:00:00','f'),('0000-00-00','0000-00-00','00:05:48','2004-07-02 14:34:13','x');
+
+CREATE TABLE `BB` (
+  `pk` int(11) NOT NULL AUTO_INCREMENT,
+  `int_nokey` int(11) NOT NULL,
+  `date_key` date NOT NULL,
+  `varchar_nokey` varchar(1) NOT NULL,
+  `date_nokey` date NOT NULL,
+  PRIMARY KEY (`pk`),
+  KEY `date_key` (`date_key`)
+);
+
+INSERT INTO `BB` VALUES (10,8,'0000-00-00','i','0000-00-00'),(11,0,'2005-08-18','','2005-08-18');
+# Test #1
+SELECT table1 . `pk` AS field1 
+  FROM 
+    (BB AS table1 INNER JOIN 
+      (AA AS table2 STRAIGHT_JOIN A AS table3 
+        ON ( table3 . `date_key` = table2 . `pk` ))
+       ON ( table3 . `datetime_key` = table2 . `int_nokey` ))
+  WHERE  ( table3 . `date_key` <= 4 AND table2 . `pk` = table1 . `varchar_nokey`)
+  GROUP BY field1 ;
+
+SELECT table3 .`date_key` field1
+  FROM
+    B table1 LEFT JOIN B table3 JOIN
+      (BB table6 JOIN A table7 ON table6 .`varchar_nokey`)
+       ON table6 .`int_nokey` ON table6 .`date_key`
+  WHERE  NOT ( table1 .`varchar_key`  AND table7 .`pk`) GROUP  BY field1;
+
+# Test #2
+SELECT table4 . `time_nokey` AS field1 FROM 
+  (AA AS table1 CROSS JOIN 
+    (AA AS table2 STRAIGHT_JOIN 
+      (B AS table3 STRAIGHT_JOIN A AS table4 
+       ON ( table4 . `date_key` = table3 . `time_key` ))
+     ON ( table4 . `pk` = table3 . `date_nokey` ))
+   ON ( table4 . `time_key` = table3 . `datetime_nokey` ))
+  WHERE  ( table4 . `time_key` < table1 . `time_key` AND
+            table1 . `int_nokey` != 'f')
+  GROUP BY field1  ORDER BY field1 , field1;
+
+SELECT table1 .`time_key` field2  FROM B table1  LEFT JOIN  BB JOIN A table5 ON table5 .`date_nokey`  ON table5 .`int_nokey` GROUP  BY field2;
+--enable_warnings
+
+drop table A,AA,B,BB;
+--echo #end of test for bug#45266
 --echo End of 5.1 tests
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 134b45a9100..88e1620b152 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2963,6 +2963,7 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
   table->insert_values= 0;
   table->fulltext_searched= 0;
   table->file->ft_handler= 0;
+  table->reginfo.impossible_range= 0;
   /* Catch wrong handling of the auto_increment_field_not_null. */
   DBUG_ASSERT(!table->auto_increment_field_not_null);
   table->auto_increment_field_not_null= FALSE;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 41f5e7a1815..916603344e3 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2432,7 +2432,6 @@ static ha_rows get_quick_record_count(THD *thd, SQL_SELECT *select,
   if (select)
   {
     select->head=table;
-    table->reginfo.impossible_range=0;
     if ((error= select->test_quick_select(thd, *(key_map *)keys,(table_map) 0,
                                           limit, 0)) == 1)
       DBUG_RETURN(select->quick->records);
diff --git a/sql/structs.h b/sql/structs.h
index 0a20eee0e9a..a58c18f97c5 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -107,6 +107,10 @@ typedef struct st_reginfo {		/* Extra info about reg */
   struct st_join_table *join_tab;	/* Used by SELECT() */
   enum thr_lock_type lock_type;		/* How database is used */
   bool not_exists_optimize;
+  /*
+    TRUE <=> range optimizer found that there is no rows satisfying
+    table conditions.
+  */
   bool impossible_range;
 } REGINFO;
 

From ccb1183887b939c7d17ca333e8f3899b68a0decd Mon Sep 17 00:00:00 2001
From: V Narayanan <v.narayanan@sun.com>
Date: Mon, 29 Jun 2009 07:32:17 +0530
Subject: [PATCH 25/25] Bug#45196  Some collations do not sort correctly with
 IBMDB2I

Some collations--including cp1250_czech_cs,latin2_czech_cs,
ucs2/utf8_czech_ci, ucs2/utf8_danish_ci--are not being
sorted correctly by the IBMDB2I storage engine. This
was being caused because the sort order used by DB2 is
incompatible with the order expected by MySQL.

This patch removes support for the cp1250_czech_cs and
latin2_czech_cs collations because it has been determined
that the sort order used by DB2 is incompatible with the
order expected by MySQL. Users needing a czech collation
with IBMDB2I are encouraged to use a Unicode-based collation
instead of these single-byte collations. This patch also
modifies the DB2 sort sequence used for ucs2/utf8_czech_ci
and ucs2/utf8_danish_ci collations to better match the
sorting expected by MySQL. This will only affect indexes
or tables that are newly created through the IBMDB2I storage
engine. Existing IBMDB2I tables will retain the old sort
sequence until recreated.
---
 .../suite/ibmdb2i/r/ibmdb2i_bug_45196.result  | 33 +++++++++++++++++++
 .../suite/ibmdb2i/t/ibmdb2i_bug_45196.test    | 26 +++++++++++++++
 storage/ibmdb2i/db2i_collationSupport.cc      | 14 +++-----
 3 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result
 create mode 100644 mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test

diff --git a/mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result b/mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result
new file mode 100644
index 00000000000..916e1d93ee5
--- /dev/null
+++ b/mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result
@@ -0,0 +1,33 @@
+drop table if exists t1;
+create table t1 (c char(10), index(c)) collate ucs2_czech_ci engine=ibmdb2i;
+insert into t1 values ("ch"),("h"),("i");
+select * from t1 order by c;
+c
+h
+ch
+i
+drop table t1;
+create table t1 (c char(10), index(c)) collate utf8_czech_ci engine=ibmdb2i;
+insert into t1 values ("ch"),("h"),("i");
+select * from t1 order by c;
+c
+h
+ch
+i
+drop table t1;
+create table t1 (c char(10), index(c)) collate ucs2_danish_ci engine=ibmdb2i;
+insert into t1 values("abc"),("abcd"),("aaaa");
+select c from t1 order by c;
+c
+abc
+abcd
+aaaa
+drop table t1;
+create table t1 (c char(10), index(c)) collate utf8_danish_ci engine=ibmdb2i;
+insert into t1 values("abc"),("abcd"),("aaaa");
+select c from t1 order by c;
+c
+abc
+abcd
+aaaa
+drop table t1;
diff --git a/mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test b/mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test
new file mode 100644
index 00000000000..17b1d658975
--- /dev/null
+++ b/mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test
@@ -0,0 +1,26 @@
+source suite/ibmdb2i/include/have_ibmdb2i.inc;
+source suite/ibmdb2i/include/have_i61.inc;
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+create table t1 (c char(10), index(c)) collate ucs2_czech_ci engine=ibmdb2i;
+insert into t1 values ("ch"),("h"),("i");
+select * from t1 order by c;
+drop table t1;
+
+create table t1 (c char(10), index(c)) collate utf8_czech_ci engine=ibmdb2i;
+insert into t1 values ("ch"),("h"),("i");
+select * from t1 order by c;
+drop table t1;
+
+create table t1 (c char(10), index(c)) collate ucs2_danish_ci engine=ibmdb2i;           
+insert into t1 values("abc"),("abcd"),("aaaa"); 
+select c from t1 order by c;
+drop table t1;
+
+create table t1 (c char(10), index(c)) collate utf8_danish_ci engine=ibmdb2i;           
+insert into t1 values("abc"),("abcd"),("aaaa"); 
+select c from t1 order by c;
+drop table t1;
diff --git a/storage/ibmdb2i/db2i_collationSupport.cc b/storage/ibmdb2i/db2i_collationSupport.cc
index a41f211a689..65a17fd2452 100644
--- a/storage/ibmdb2i/db2i_collationSupport.cc
+++ b/storage/ibmdb2i/db2i_collationSupport.cc
@@ -44,7 +44,7 @@ OF SUCH DAMAGE.
   between corresponding array slots but is incomplete without case-sensitivity
   markers dynamically added to the mySqlSortSequence names.
 */
-#define MAX_COLLATION 89
+#define MAX_COLLATION 87
 static const char* mySQLCollation[MAX_COLLATION] = 
 {
     {"ascii_general"},
@@ -52,7 +52,6 @@ static const char* mySQLCollation[MAX_COLLATION] =
     {"big5_chinese"},
     {"big5"},
     {"cp1250_croatian"},
-    {"cp1250_czech"},
     {"cp1250_general"},
     {"cp1250_polish"},
     {"cp1250"},
@@ -84,7 +83,6 @@ static const char* mySQLCollation[MAX_COLLATION] =
     {"latin1_swedish"},
     {"latin1"},
     {"latin2_croatian"},
-    {"latin2_czech"},
     {"latin2_general"},
     {"latin2_hungarian"},
     {"latin2"},
@@ -146,7 +144,6 @@ static const char* mySqlSortSequence[MAX_COLLATION] =
     {"QACHT04B0"},  
     {"QBCHT04B0"},
     {"QALA20481"},  
-    {"QBLA20481"},
     {"QCLA20481"},
     {"QDLA20481"},
     {"QELA20481"},
@@ -178,7 +175,6 @@ static const char* mySqlSortSequence[MAX_COLLATION] =
     {"QELA1047C"},
     {"QFLA1047C"},
     {"QCLA20366"},  
-    {"QDLA20366"},
     {"QELA20366"},
     {"QFLA20366"},
     {"QGLA20366"},
@@ -190,8 +186,8 @@ static const char* mySqlSortSequence[MAX_COLLATION] =
     {"QDJPN04B0"},
     {"QATHA0346"},  
     {"QBTHA0346"},  
-    {"ACS"},        
-    {"ADA"},
+    {"ACS_CZ"},        
+    {"ADA_DK"},
     {"AEO"},
     {"AET"},
     {"QAUCS04B0"},  
@@ -211,8 +207,8 @@ static const char* mySqlSortSequence[MAX_COLLATION] =
     {"*HEX"},
     {"QEJPN04B0"},  
     {"QFJPN04B0"},
-    {"ACS"},        
-    {"ADA"},
+    {"ACS_CZ"},        
+    {"ADA_DK"},
     {"AEO"},
     {"AET"},
     {"QAUCS04B0"},