merge

configure.in:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

11 files changed, 15 insertions, 15 deletions

diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 10b6898ce24..88309aadaa0 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -6300,7 +6300,7 @@ CHARSET_INFO my_charset_big5_bin=
     NULL,		/* tab_from_uni */
     "",
     "",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     2,			/* mbmaxlen   */
     0,
     &my_charset_big5_handler,
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index ebe73016db7..10ea23e07eb 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -312,7 +312,7 @@ CHARSET_INFO my_charset_bin =
     NULL,			/* tab_to_uni    */
     NULL,			/* tab_from_uni  */
     "","",
-    0,				/* strxfrm_multiply */
+    1,				/* strxfrm_multiply */
     1,				/* mbmaxlen      */
     (char) 255,			/* max_sort_char */
     &my_charset_handler,
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index 8e288ee8e55..e8d2c8c4d1d 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@@ -8686,7 +8686,7 @@ CHARSET_INFO my_charset_euckr_korean_ci=
     NULL,		/* tab_from_uni */
     "",
     "",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     2,			/* mbmaxlen   */
     0,
     &my_charset_handler,
@@ -8709,7 +8709,7 @@ CHARSET_INFO my_charset_euckr_bin=
     NULL,		/* tab_from_uni */
     "",
     "",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     2,			/* mbmaxlen   */
     0,
     &my_charset_handler,
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index 378931eecc7..72548305ad1 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@@ -5736,7 +5736,7 @@ CHARSET_INFO my_charset_gb2312_chinese_ci=
     NULL,		/* tab_from_uni */
     "",
     "",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     2,			/* mbmaxlen   */
     0,
     &my_charset_handler,
@@ -5758,7 +5758,7 @@ CHARSET_INFO my_charset_gb2312_bin=
     NULL,		/* tab_from_uni */
     "",
     "",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     2,			/* mbmaxlen   */
     0,
     &my_charset_handler,
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index 58d281ae485..84819d2e1a8 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -9955,7 +9955,7 @@ CHARSET_INFO my_charset_gbk_bin=
     NULL,		/* tab_from_uni */
     "",
     "",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     2,			/* mbmaxlen */
     0,
     &my_charset_handler,
diff --git a/strings/ctype-latin1.c b/strings/ctype-latin1.c
index cf21f129664..d40e7b4b18f 100644
--- a/strings/ctype-latin1.c
+++ b/strings/ctype-latin1.c
@@ -213,7 +213,7 @@ CHARSET_INFO my_charset_latin1=
     latin1_uni,		/* tab_to_uni   */
     NULL,		/* tab_from_uni */
     "","",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     1,			/* mbmaxlen  */
     0,
     &my_charset_handler,
@@ -430,7 +430,7 @@ CHARSET_INFO my_charset_latin1_bin=
   NULL,					/* tab_from_uni */
   "",
   "",
-  0,					/* strxfrm_multiply */
+  1,					/* strxfrm_multiply */
   1,					/* mbmaxlen  */
   0,
   &my_charset_handler,
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 00d51dd23b5..d8443165462 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -4542,7 +4542,7 @@ CHARSET_INFO my_charset_sjis_bin=
     NULL,		/* tab_from_uni */
     "",
     "",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     2,			/* mbmaxlen */
     0,
     &my_charset_handler,
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index ab51ddd013f..643ea77c73e 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -762,7 +762,7 @@ CHARSET_INFO my_charset_tis620_bin=
     NULL,		/* tab_from_uni */
     "",
     "",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     1,			/* mbmaxlen  */
     0,
     &my_charset_handler,
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 5d78ab5dcff..6c0cfd3e874 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1077,7 +1077,7 @@ CHARSET_INFO my_charset_ucs2_bin=
     NULL,		/* tab_from_uni */
     "",
     "",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     2,			/* mbmaxlen     */
     0,
     &my_charset_handler,
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index eb31c49013a..c6cf6ff79ba 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -8477,7 +8477,7 @@ CHARSET_INFO my_charset_ujis_japanese_ci=
     NULL,		/* tab_to_uni   */
     NULL,		/* tab_from_uni */
     "","",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     3,			/* mbmaxlen     */
     0,
     &my_charset_handler,
@@ -8499,7 +8499,7 @@ CHARSET_INFO my_charset_ujis_bin=
     NULL,		/* tab_to_uni   */
     NULL,		/* tab_from_uni */
     "","",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     3,			/* mbmaxlen     */
     0,
     &my_charset_handler,
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 1982b9e3ba8..4ac397c4c48 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -2026,7 +2026,7 @@ CHARSET_INFO my_charset_utf8_bin=
     NULL,		/* tab_from_uni */
     "",
     "",
-    0,			/* strxfrm_multiply */
+    1,			/* strxfrm_multiply */
     3,			/* mbmaxlen     */
     0,
     &my_charset_handler,