Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1

into  mysql.com:/home/emurphy/src/work/mysql-5.0


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
include/m_ctype.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysys/charset.c:
  Auto merged
netware/BUILD/nwbootstrap:
  Auto merged
sql/item.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-extra.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
configure.in:
  Manual merge from 4.1
include/config-netware.h:
  Manual merge from 4.1
sql/item.cc:
  Manual merge from 4.1
sql/mysqld.cc:
  Manual merge from 4.1

15 files changed, 60 insertions, 0 deletions

diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 9ccbb149523..5069a1dc082 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -6399,6 +6399,7 @@ CHARSET_INFO my_charset_big5_chinese_ci=
     2,			/* mbmaxlen   */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_big5_handler,
     &my_collation_big5_chinese_ci_handler
 };
@@ -6430,6 +6431,7 @@ CHARSET_INFO my_charset_big5_bin=
     2,			/* mbmaxlen   */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_big5_handler,
     &my_collation_mb_bin_handler
 };
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index 40ecbc33d61..0fcd9021c4b 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -539,6 +539,7 @@ CHARSET_INFO my_charset_bin =
     1,				/* mbmaxlen      */
     0,				/* min_sort_char */
     255,			/* max_sort_char */
+    0,                          /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_binary_handler
 };
diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index 1361b728b26..bdafc5c94b6 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@@ -628,6 +628,7 @@ CHARSET_INFO my_charset_latin2_czech_ci =
     1,			/* mbmaxlen  */
     0,			/* min_sort_char */
     0,			/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_8bit_handler,
     &my_collation_latin2_czech_ci_handler
 };
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index e2167aa315e..b529bbb0308 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@@ -8706,6 +8706,7 @@ CHARSET_INFO my_charset_euckr_korean_ci=
     2,			/* mbmaxlen   */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_ci_handler
 };
@@ -8737,6 +8738,7 @@ CHARSET_INFO my_charset_euckr_bin=
     2,			/* mbmaxlen   */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_mb_bin_handler
 };
diff --git a/strings/ctype-extra.c b/strings/ctype-extra.c
index 2544245bc42..e9a9598abdf 100644
--- a/strings/ctype-extra.c
+++ b/strings/ctype-extra.c
@@ -43,6 +43,7 @@ CHARSET_INFO compiled_charsets[] = {
     0,			/* mbmaxlen     */
     0,			/* min_sort_ord */
     0,			/* max_sort_ord */
+    0,                  /* escape_with_backslash_is_dangerous */
     NULL,		/* cset handler */
     NULL		/* coll handler */
   }
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index 6b582081085..3d9a17205cd 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@@ -5757,6 +5757,7 @@ CHARSET_INFO my_charset_gb2312_chinese_ci=
     2,			/* mbmaxlen   */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_ci_handler
 };
@@ -5787,6 +5788,7 @@ CHARSET_INFO my_charset_gb2312_bin=
     2,			/* mbmaxlen   */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_mb_bin_handler
 };
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index 7caef07202d..5c220a285dd 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -10046,6 +10046,7 @@ CHARSET_INFO my_charset_gbk_chinese_ci=
     2,			/* mbmaxlen */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_ci_handler
 };
@@ -10076,6 +10077,7 @@ CHARSET_INFO my_charset_gbk_bin=
     2,			/* mbmaxlen */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_mb_bin_handler
 };
diff --git a/strings/ctype-latin1.c b/strings/ctype-latin1.c
index 7d54dd47552..9075710610b 100644
--- a/strings/ctype-latin1.c
+++ b/strings/ctype-latin1.c
@@ -441,6 +441,7 @@ CHARSET_INFO my_charset_latin1=
     1,			/* mbmaxlen  */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_8bit_simple_ci_handler
 };
@@ -739,6 +740,7 @@ CHARSET_INFO my_charset_latin1_german2_ci=
   1,					/* mbmaxlen  */
   0,					/* min_sort_char */
   247,					/* max_sort_char */
+  0,                                    /* escape_with_backslash_is_dangerous */
   &my_charset_handler,
   &my_collation_german2_ci_handler
 };
@@ -770,6 +772,7 @@ CHARSET_INFO my_charset_latin1_bin=
   1,					/* mbmaxlen  */
   0,					/* min_sort_char */
   255,					/* max_sort_char */
+  0,                                    /* escape_with_backslash_is_dangerous */
   &my_charset_handler,
   &my_collation_8bit_bin_handler
 };
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 1c12df08b32..c0a395b5792 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -4696,6 +4696,7 @@ CHARSET_INFO my_charset_sjis_japanese_ci=
     2,			/* mbmaxlen */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_ci_handler
 };
@@ -4726,6 +4727,7 @@ CHARSET_INFO my_charset_sjis_bin=
     2,			/* mbmaxlen */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_mb_bin_handler
 };
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index e445fa90bd3..2003eaa0789 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -993,6 +993,7 @@ CHARSET_INFO my_charset_tis620_thai_ci=
     1,			/* mbmaxlen  */
     0,			/* min_sort_char */
     0,			/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_ci_handler
 };
@@ -1023,6 +1024,7 @@ CHARSET_INFO my_charset_tis620_bin=
     1,			/* mbmaxlen  */
     0,			/* min_sort_char */
     0,			/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_8bit_bin_handler
 };
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index 8bc48b3609d..dcf1c07113e 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -8059,6 +8059,7 @@ CHARSET_INFO my_charset_ucs2_general_uca=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8089,6 +8090,7 @@ CHARSET_INFO my_charset_ucs2_icelandic_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8119,6 +8121,7 @@ CHARSET_INFO my_charset_ucs2_latvian_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8149,6 +8152,7 @@ CHARSET_INFO my_charset_ucs2_romanian_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8179,6 +8183,7 @@ CHARSET_INFO my_charset_ucs2_slovenian_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8209,6 +8214,7 @@ CHARSET_INFO my_charset_ucs2_polish_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8239,6 +8245,7 @@ CHARSET_INFO my_charset_ucs2_estonian_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8269,6 +8276,7 @@ CHARSET_INFO my_charset_ucs2_spanish_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8299,6 +8307,7 @@ CHARSET_INFO my_charset_ucs2_swedish_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8329,6 +8338,7 @@ CHARSET_INFO my_charset_ucs2_turkish_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8359,6 +8369,7 @@ CHARSET_INFO my_charset_ucs2_czech_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8390,6 +8401,7 @@ CHARSET_INFO my_charset_ucs2_danish_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8420,6 +8432,7 @@ CHARSET_INFO my_charset_ucs2_lithuanian_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8450,6 +8463,7 @@ CHARSET_INFO my_charset_ucs2_slovak_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8480,6 +8494,7 @@ CHARSET_INFO my_charset_ucs2_spanish2_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8511,6 +8526,7 @@ CHARSET_INFO my_charset_ucs2_roman_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8542,6 +8558,7 @@ CHARSET_INFO my_charset_ucs2_persian_uca_ci=
     2,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_uca_handler
 };
@@ -8620,6 +8637,7 @@ CHARSET_INFO my_charset_utf8_general_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -8651,6 +8669,7 @@ CHARSET_INFO my_charset_utf8_icelandic_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -8681,6 +8700,7 @@ CHARSET_INFO my_charset_utf8_latvian_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -8711,6 +8731,7 @@ CHARSET_INFO my_charset_utf8_romanian_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -8741,6 +8762,7 @@ CHARSET_INFO my_charset_utf8_slovenian_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -8771,6 +8793,7 @@ CHARSET_INFO my_charset_utf8_polish_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -8801,6 +8824,7 @@ CHARSET_INFO my_charset_utf8_estonian_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -8831,6 +8855,7 @@ CHARSET_INFO my_charset_utf8_spanish_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -8861,6 +8886,7 @@ CHARSET_INFO my_charset_utf8_swedish_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -8891,6 +8917,7 @@ CHARSET_INFO my_charset_utf8_turkish_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -8921,6 +8948,7 @@ CHARSET_INFO my_charset_utf8_czech_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -8952,6 +8980,7 @@ CHARSET_INFO my_charset_utf8_danish_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -8982,6 +9011,7 @@ CHARSET_INFO my_charset_utf8_lithuanian_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -9012,6 +9042,7 @@ CHARSET_INFO my_charset_utf8_slovak_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -9042,6 +9073,7 @@ CHARSET_INFO my_charset_utf8_spanish2_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -9072,6 +9104,7 @@ CHARSET_INFO my_charset_utf8_roman_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
@@ -9102,6 +9135,7 @@ CHARSET_INFO my_charset_utf8_persian_uca_ci=
     3,			/* mbmaxlen     */
     9,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_any_uca_handler
 };
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 408e511d2e8..41ab055d2de 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1621,6 +1621,7 @@ CHARSET_INFO my_charset_ucs2_general_ci=
     2,			/* mbmaxlen     */
     0,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_general_ci_handler
 };
@@ -1651,6 +1652,7 @@ CHARSET_INFO my_charset_ucs2_bin=
     2,			/* mbmaxlen     */
     0,			/* min_sort_char */
     0xFFFF,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_ucs2_handler,
     &my_collation_ucs2_bin_handler
 };
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 3f934ebd9ce..57ca2de2852 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -8576,6 +8576,7 @@ CHARSET_INFO my_charset_ujis_japanese_ci=
     3,			/* mbmaxlen     */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_ci_handler
 };
@@ -8607,6 +8608,7 @@ CHARSET_INFO my_charset_ujis_bin=
     3,			/* mbmaxlen     */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_mb_bin_handler
 };
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 2b5f5883abf..88b6b7d5c86 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -2579,6 +2579,7 @@ CHARSET_INFO my_charset_utf8_general_ci=
     3,                  /* mbmaxlen     */
     0,                  /* min_sort_char */
     0xFFFF,             /* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_ci_handler
 };
@@ -2610,6 +2611,7 @@ CHARSET_INFO my_charset_utf8_bin=
     3,                  /* mbmaxlen     */
     0,                  /* min_sort_char */
     255,                /* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_mb_bin_handler
 };
@@ -2779,6 +2781,7 @@ CHARSET_INFO my_charset_utf8_general_cs=
     3,			/* mbmaxlen     */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_cs_handler
 };
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c
index b840a58a499..c6b396658d4 100644
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.c
@@ -662,6 +662,7 @@ CHARSET_INFO my_charset_cp1250_czech_ci =
   1,				/* mbmaxlen  */
   0,				/* min_sort_char */
   0,				/* max_sort_char */
+  0,                            /* escape_with_backslash_is_dangerous */
   &my_charset_8bit_handler,
   &my_collation_czech_ci_handler
 };