bzr push into mysql-next-mr-bugfixing branch (bar:3224 to 3225)

[Alexander Barkov]

 3225 Alexander Barkov	2010-08-19 [merge]
      Merging from mysql-trunk-bugfixing

    removed:
      mysql-test/r/ctype_utf16_def.result
      mysql-test/t/ctype_utf16_def-master.opt
      mysql-test/t/ctype_utf16_def.test
    added:
      mysql-test/r/ctype_utf16_def.result
      mysql-test/t/ctype_utf16_def-master.opt
      mysql-test/t/ctype_utf16_def.test
 3224 Alexander Barkov	2010-08-18 [merge]
      Merging from mysql-trunk-bugfixing.

    modified:
      mysql-test/r/ctype_utf32.result
      mysql-test/t/ctype_utf32.test
      sql/item_strfunc.cc
      sql/item_strfunc.h
=== removed file 'mysql-test/r/ctype_utf16_def.result'
--- a/mysql-test/r/ctype_utf16_def.result	2010-08-13 13:24:43 +0000
+++ b/mysql-test/r/ctype_utf16_def.result	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-SHOW VARIABLES LIKE 'collation_server';
-Variable_name	Value
-collation_server	utf16_general_ci
-SHOW VARIABLES LIKE 'character_set_server';
-Variable_name	Value
-character_set_server	utf16
-SHOW VARIABLES LIKE 'ft_stopword_file';
-Variable_name	Value
-ft_stopword_file	(built-in)

=== added file 'mysql-test/r/ctype_utf16_def.result'
--- a/mysql-test/r/ctype_utf16_def.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/ctype_utf16_def.result	2010-08-19 06:00:43 +0000
@@ -0,0 +1,9 @@
+SHOW VARIABLES LIKE 'collation_server';
+Variable_name	Value
+collation_server	utf16_general_ci
+SHOW VARIABLES LIKE 'character_set_server';
+Variable_name	Value
+character_set_server	utf16
+SHOW VARIABLES LIKE 'ft_stopword_file';
+Variable_name	Value
+ft_stopword_file	(built-in)

=== removed file 'mysql-test/t/ctype_utf16_def-master.opt'
--- a/mysql-test/t/ctype_utf16_def-master.opt	2010-08-13 13:24:43 +0000
+++ b/mysql-test/t/ctype_utf16_def-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---character-set-server=utf16,latin1

=== added file 'mysql-test/t/ctype_utf16_def-master.opt'
--- a/mysql-test/t/ctype_utf16_def-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/ctype_utf16_def-master.opt	2010-08-19 06:00:43 +0000
@@ -0,0 +1 @@
+--character-set-server=utf16,latin1

=== added file 'mysql-test/t/ctype_utf16_def.test'
--- a/mysql-test/t/ctype_utf16_def.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/ctype_utf16_def.test	2010-08-19 06:00:43 +0000
@@ -0,0 +1,8 @@
+--source include/have_utf16.inc
+
+#
+# Bug #32391  	Character sets: crash with --character-set-server
+# 
+SHOW VARIABLES LIKE 'collation_server';
+SHOW VARIABLES LIKE 'character_set_server';
+SHOW VARIABLES LIKE 'ft_stopword_file';

=== removed file 'mysql-test/t/ctype_utf16_def.test'
--- a/mysql-test/t/ctype_utf16_def.test	2010-08-13 13:24:43 +0000
+++ b/mysql-test/t/ctype_utf16_def.test	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
---source include/have_utf16.inc
-
-#
-# Bug #32391  	Character sets: crash with --character-set-server
-# 
-SHOW VARIABLES LIKE 'collation_server';
-SHOW VARIABLES LIKE 'character_set_server';
-SHOW VARIABLES LIKE 'ft_stopword_file';


Attachment: [text/bzr-bundle] bzr/[e-mail]