bk commit into 5.0 tree (elliot:1.1988)

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
5.0 repository of emurphy. When emurphy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1988 05/08/18 15:35:46 elliot@stripped +28 -0
  Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
  into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0

  sql/mysqld.cc
    1.483 05/08/18 15:35:41 elliot@stripped +0 -1
    Manual merge

  sql/item.cc
    1.163 05/08/18 15:35:41 elliot@stripped +1 -0
    manual merge

  mysys/charset.c
    1.144 05/08/18 15:35:41 elliot@stripped +1 -1
    Manual merge

  include/config-netware.h
    1.10 05/08/18 15:35:41 elliot@stripped +0 -11
    Auto-merge.

  configure.in
    1.331 05/08/18 15:35:41 elliot@stripped +2 -3
    Manual merge

  strings/ctype-win1250ch.c
    1.52 05/08/18 15:10:39 elliot@stripped +0 -0
    Auto merged

  strings/ctype-utf8.c
    1.96 05/08/18 15:10:39 elliot@stripped +0 -0
    Auto merged

  strings/ctype-ujis.c
    1.68 05/08/18 15:10:39 elliot@stripped +0 -0
    Auto merged

  strings/ctype-ucs2.c
    1.54 05/08/18 15:10:39 elliot@stripped +0 -0
    Auto merged

  strings/ctype-uca.c
    1.37 05/08/18 15:10:39 elliot@stripped +0 -0
    Auto merged

  strings/ctype-tis620.c
    1.88 05/08/18 15:10:38 elliot@stripped +0 -0
    Auto merged

  strings/ctype-sjis.c
    1.86 05/08/18 15:10:38 elliot@stripped +0 -0
    Auto merged

  strings/ctype-latin1.c
    1.46 05/08/18 15:10:38 elliot@stripped +0 -0
    Auto merged

  strings/ctype-gbk.c
    1.76 05/08/18 15:10:38 elliot@stripped +0 -0
    Auto merged

  strings/ctype-gb2312.c
    1.60 05/08/18 15:10:38 elliot@stripped +0 -0
    Auto merged

  strings/ctype-extra.c
    1.19 05/08/18 15:10:38 elliot@stripped +0 -0
    Auto merged

  strings/ctype-euc_kr.c
    1.63 05/08/18 15:10:37 elliot@stripped +0 -0
    Auto merged

  strings/ctype-czech.c
    1.60 05/08/18 15:10:37 elliot@stripped +0 -0
    Auto merged

  strings/ctype-bin.c
    1.64 05/08/18 15:10:37 elliot@stripped +0 -0
    Auto merged

  strings/ctype-big5.c
    1.85 05/08/18 15:10:37 elliot@stripped +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.149 05/08/18 15:10:37 elliot@stripped +0 -0
    Auto merged

  sql/item.h
    1.161 05/08/18 15:10:36 elliot@stripped +0 -0
    Auto merged

  netware/BUILD/nwbootstrap
    1.10 05/08/18 15:10:36 elliot@stripped +0 -1
    Auto merged

  mysql-test/mysql-test-run.pl
    1.34 05/08/18 15:10:36 elliot@stripped +0 -0
    Auto merged

  innobase/srv/srv0start.c
    1.84 05/08/18 15:10:36 elliot@stripped +0 -0
    Auto merged

  include/my_sys.h
    1.166 05/08/18 15:10:36 elliot@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ctype-cp932.c
    1.9 05/08/18 15:10:35 elliot@stripped +0 -0
    Auto merged

  include/m_ctype.h
    1.113 05/08/18 15:10:35 elliot@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ctype-cp932.c
    1.1.6.2 05/08/18 15:10:35 elliot@stripped +0 -0
    Merge rename: strings/ctype-cp932.c -> BitKeeper/deleted/.del-ctype-cp932.c

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	elliot
# Host:	agony.local
# Root:	/Users/emurphy/src/bk-clean/mysql-5.0/RESYNC

--- 1.330/configure.in	2005-08-14 08:06:38 -04:00
+++ 1.331/configure.in	2005-08-18 15:35:41 -04:00
@@ -5,7 +5,8 @@
 
 AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
-# Don't forget to also update the NDB lines below.
+# The Docs Makefile.am parses this line!
+# remember to also change ndb version below and update version.c in ndb
 AM_INIT_AUTOMAKE(mysql, 5.0.12-beta)
 AM_CONFIG_HEADER(config.h)
 

--- 1.112/include/m_ctype.h	2005-06-06 07:50:37 -04:00
+++ 1.113/include/m_ctype.h	2005-08-18 15:10:35 -04:00
@@ -231,6 +231,7 @@
   uint      mbmaxlen;
   uint16    min_sort_char;
   uint16    max_sort_char; /* For LIKE optimization */
+  my_bool   escape_with_backslash_is_dangerous;
   
   MY_CHARSET_HANDLER *cset;
   MY_COLLATION_HANDLER *coll;

--- 1.165/include/my_sys.h	2005-08-11 07:18:37 -04:00
+++ 1.166/include/my_sys.h	2005-08-18 15:10:36 -04:00
@@ -866,6 +866,7 @@
 extern ulong escape_string_for_mysql(CHARSET_INFO *charset_info,
                                      char *to, ulong to_length,
                                      const char *from, ulong length);
+extern char *bare_str_to_hex(char *to, const char *from, uint len);
 #ifdef __WIN__
 #define BACKSLASH_MBTAIL
 /* File system character set */

--- 1.143/mysys/charset.c	2005-08-11 07:18:37 -04:00
+++ 1.144/mysys/charset.c	2005-08-18 15:35:41 -04:00
@@ -704,6 +704,23 @@
 }
 #endif
 
+/*
+  Transforms a string into hex form.
+ */
+char *bare_str_to_hex(char *to, const char *from, uint len)
+{
+  char *p= to;
+  uint i;
+  for (i= 0; i < len; i++, p+= 2)
+  {
+    /* val[i] is char. Casting to uchar helps greatly if val[i] < 0 */
+    uint tmp= (uint) (uchar) from[i];
+    p[0]= _dig_vec_upper[tmp >> 4];
+    p[1]= _dig_vec_upper[tmp & 15];
+  }
+  *p= 0;
+  return p; // pointer to end 0 of 'to'
+}
 
 /*
   Escape apostrophes by doubling them up
@@ -785,3 +802,4 @@
   *to= 0;
   return overflow ? (ulong)~0 : (ulong) (to - to_start);
 }
+

--- 1.162/sql/item.cc	2005-08-12 11:04:48 -04:00
+++ 1.163/sql/item.cc	2005-08-18 15:35:41 -04:00
@@ -2412,7 +2412,7 @@
   and avoid one more memcpy/alloc between str and log string.
 */
 
-const String *Item_param::query_val_str(String* str) const
+const String *Item_param::query_val_str(String* str, THD *thd) const
 {
   switch (state) {
   case INT_VALUE:
@@ -2457,9 +2457,18 @@
       buf= str->c_ptr_quick();
       ptr= buf;
       *ptr++= '\'';
-      ptr+= escape_string_for_mysql(str_value.charset(), ptr, 0,
-                                    str_value.ptr(), str_value.length());
-      *ptr++= '\'';
+      if (thd->charset()->escape_with_backslash_is_dangerous)
+      {
+        ptr= strmov(ptr, "x\'");
+        ptr= bare_str_to_hex(ptr, str_value.ptr(), str_value.length());
+      }
+      else
+      {
+        *ptr++= '\'';
+        ptr+= escape_string_for_mysql(str_value.charset(), ptr,
+                                      str_value.ptr(), str_value.length());
+      }
+      *ptr++='\'';
       str->length((uint32) (ptr - buf));
       break;
     }

--- 1.160/sql/item.h	2005-08-13 01:12:56 -04:00
+++ 1.161/sql/item.h	2005-08-18 15:10:36 -04:00
@@ -1087,7 +1087,7 @@
   */
   void (*set_param_func)(Item_param *param, uchar **pos, ulong len);
 
-  const String *query_val_str(String *str) const;
+  const String *query_val_str(String *str, THD *thd) const;
 
   bool convert_str_value(THD *thd);
 

--- 1.84/strings/ctype-big5.c	2005-08-02 15:00:48 -04:00
+++ 1.85/strings/ctype-big5.c	2005-08-18 15:10:37 -04:00
@@ -6399,6 +6399,7 @@
     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 @@
     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
 };

--- 1.59/strings/ctype-czech.c	2005-06-06 07:48:30 -04:00
+++ 1.60/strings/ctype-czech.c	2005-08-18 15:10:37 -04:00
@@ -628,6 +628,7 @@
     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
 };

--- 1.62/strings/ctype-euc_kr.c	2005-06-06 07:48:32 -04:00
+++ 1.63/strings/ctype-euc_kr.c	2005-08-18 15:10:37 -04:00
@@ -8706,6 +8706,7 @@
     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 @@
     2,			/* mbmaxlen   */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_mb_bin_handler
 };

--- 1.59/strings/ctype-gb2312.c	2005-06-06 07:48:38 -04:00
+++ 1.60/strings/ctype-gb2312.c	2005-08-18 15:10:38 -04:00
@@ -5757,6 +5757,7 @@
     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 @@
     2,			/* mbmaxlen   */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_mb_bin_handler
 };

--- 1.75/strings/ctype-gbk.c	2005-07-26 07:39:54 -04:00
+++ 1.76/strings/ctype-gbk.c	2005-08-18 15:10:38 -04:00
@@ -10046,6 +10046,7 @@
     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 @@
     2,			/* mbmaxlen */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_mb_bin_handler
 };

--- 1.85/strings/ctype-sjis.c	2005-07-26 07:39:54 -04:00
+++ 1.86/strings/ctype-sjis.c	2005-08-18 15:10:38 -04:00
@@ -4696,6 +4696,7 @@
     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 @@
     2,			/* mbmaxlen */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_mb_bin_handler
 };

--- 1.87/strings/ctype-tis620.c	2005-06-24 16:41:30 -04:00
+++ 1.88/strings/ctype-tis620.c	2005-08-18 15:10:38 -04:00
@@ -993,6 +993,7 @@
     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 @@
     1,			/* mbmaxlen  */
     0,			/* min_sort_char */
     0,			/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_8bit_bin_handler
 };

--- 1.67/strings/ctype-ujis.c	2005-07-26 07:43:05 -04:00
+++ 1.68/strings/ctype-ujis.c	2005-08-18 15:10:39 -04:00
@@ -8576,6 +8576,7 @@
     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 @@
     3,			/* mbmaxlen     */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_mb_bin_handler
 };

--- 1.36/strings/ctype-uca.c	2005-06-13 06:41:08 -04:00
+++ 1.37/strings/ctype-uca.c	2005-08-18 15:10:39 -04:00
@@ -8059,6 +8059,7 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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
 };

--- 1.63/strings/ctype-bin.c	2005-06-13 06:41:07 -04:00
+++ 1.64/strings/ctype-bin.c	2005-08-18 15:10:37 -04:00
@@ -539,6 +539,7 @@
     1,				/* mbmaxlen      */
     0,				/* min_sort_char */
     255,			/* max_sort_char */
+    0,                          /* escape_with_backslash_is_dangerous */
     &my_charset_handler,
     &my_collation_binary_handler
 };

--- 1.18/strings/ctype-extra.c	2005-06-06 07:48:34 -04:00
+++ 1.19/strings/ctype-extra.c	2005-08-18 15:10:38 -04:00
@@ -43,6 +43,7 @@
     0,			/* mbmaxlen     */
     0,			/* min_sort_ord */
     0,			/* max_sort_ord */
+    0,                  /* escape_with_backslash_is_dangerous */
     NULL,		/* cset handler */
     NULL		/* coll handler */
   }

--- 1.45/strings/ctype-latin1.c	2005-07-21 08:55:10 -04:00
+++ 1.46/strings/ctype-latin1.c	2005-08-18 15:10:38 -04:00
@@ -441,6 +441,7 @@
     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 @@
   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 @@
   1,					/* mbmaxlen  */
   0,					/* min_sort_char */
   255,					/* max_sort_char */
+  0,                                    /* escape_with_backslash_is_dangerous */
   &my_charset_handler,
   &my_collation_8bit_bin_handler
 };

--- 1.53/strings/ctype-ucs2.c	2005-07-26 07:42:30 -04:00
+++ 1.54/strings/ctype-ucs2.c	2005-08-18 15:10:39 -04:00
@@ -1621,6 +1621,7 @@
     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 @@
     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
 };

--- 1.95/strings/ctype-utf8.c	2005-07-26 07:43:35 -04:00
+++ 1.96/strings/ctype-utf8.c	2005-08-18 15:10:39 -04:00
@@ -2579,6 +2579,7 @@
     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 @@
     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 @@
     3,			/* mbmaxlen     */
     0,			/* min_sort_char */
     255,		/* max_sort_char */
+    0,                  /* escape_with_backslash_is_dangerous */
     &my_charset_utf8_handler,
     &my_collation_cs_handler
 };

--- 1.51/strings/ctype-win1250ch.c	2005-06-06 14:21:28 -04:00
+++ 1.52/strings/ctype-win1250ch.c	2005-08-18 15:10:39 -04:00
@@ -662,6 +662,7 @@
   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
 };

--- 1.33/mysql-test/mysql-test-run.pl	2005-08-16 21:39:10 -04:00
+++ 1.34/mysql-test/mysql-test-run.pl	2005-08-18 15:10:36 -04:00
@@ -414,7 +414,7 @@
     $opt_source_dist=  1;
   }
 
-  $glob_hostname=  mtr_full_hostname();
+  $glob_hostname=  mtr_short_hostname();
 
   # 'basedir' is always parent of "mysql-test" directory
   $glob_mysql_test_dir=  cwd();

--- 1.83/innobase/srv/srv0start.c	2005-08-03 10:07:43 -04:00
+++ 1.84/innobase/srv/srv0start.c	2005-08-18 15:10:36 -04:00
@@ -1054,7 +1054,8 @@
 
 	        fprintf(stderr,
 "InnoDB: Error: You have specified innodb_buffer_pool_awe_mem_mb\n"
-"InnoDB: in my.cnf, but AWE can only be used in Windows 2000 and later.\n");
+"InnoDB: in my.cnf, but AWE can only be used in Windows 2000 and later.\n"
+"InnoDB: To use AWE, InnoDB must be compiled with __WIN2000__ defined.\n");
 
 	        return(DB_ERROR);
 	}

--- 1.9/include/config-netware.h	2005-07-26 04:16:08 -04:00
+++ 1.10/include/config-netware.h	2005-08-18 15:35:41 -04:00
@@ -45,14 +45,13 @@
 #undef HAVE_SCHED_H
 #undef HAVE_SYS_MMAN_H
 #undef HAVE_SYNCH_H
-#undef HAVE_MMAP
 #undef HAVE_RINT
-
 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 #define HAVE_PTHREAD_SIGMASK 1
 #define HAVE_PTHREAD_YIELD_ZERO_ARG 1
 #define HAVE_BROKEN_REALPATH 1
 
+/* changes made to make use of LibC-June-2004 for building purpose */
 #undef HAVE_POSIX_SIGNALS
 #undef HAVE_PTHREAD_ATTR_SETSCOPE
 #undef HAVE_ALLOC_A
@@ -62,6 +61,8 @@
 #undef HAVE_PTHREAD_SETSCHEDPARAM
 #undef HAVE_READLINK
 #undef HAVE_STPCPY
+/* changes  end  */
+
 /* no libc crypt() function */
 #ifdef HAVE_OPENSSL
   #define HAVE_CRYPT 1

--- 1.148/sql/sql_prepare.cc	2005-08-11 02:29:52 -04:00
+++ 1.149/sql/sql_prepare.cc	2005-08-18 15:10:37 -04:00
@@ -624,7 +624,7 @@
         param->set_param_func(param, &read_pos, data_end - read_pos);
       }
     }
-    res= param->query_val_str(&str);
+    res= param->query_val_str(&str, thd);
     if (param->convert_str_value(thd))
       DBUG_RETURN(1);                           /* out of memory */
 
@@ -772,7 +772,7 @@
                               client_param->buffer_length);
       }
     }
-    res= param->query_val_str(&str);
+    res= param->query_val_str(&str, thd);
     if (param->convert_str_value(thd))
       DBUG_RETURN(1);                           /* out of memory */