bk commit into 5.0 tree (reggie:1.1962) BUG#10947

[reggie]

Below is the list of changes that have just been committed into a local
5.0 repository of reggie. When reggie 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.1962 05/06/09 17:52:33 reggie@mdk10.(none) +2 -0
  Bug #10947  mysqlshow wildcard failure on Windows

  libmysql/libmysql.c
    1.219 05/06/09 17:52:17 reggie@mdk10.(none) +1 -1
    reverting this from a previous changeset.  This is back the way it was before.

  client/mysqlshow.c
    1.43 05/06/09 17:52:17 reggie@mdk10.(none) +1 -1
    now passing in length of table instead of size of rows.

# 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:	reggie
# Host:	mdk10.(none)
# Root:	/home/reggie/bk/50test2

--- 1.42/client/mysqlshow.c	2005-05-06 03:39:13 -05:00
+++ 1.43/client/mysqlshow.c	2005-06-09 17:52:17 -05:00
@@ -447,7 +447,7 @@
       We just hijack the 'rows' variable for a bit to store the escaped
       table name
     */
-    mysql_escape_string(rows, table, sizeof(rows));
+    mysql_escape_string(rows, table, (unsigned long)strlen(table));
     my_snprintf(query, sizeof(query), "show%s tables like '%s'",
                 opt_table_type ? " full" : "", rows);
   }

--- 1.218/libmysql/libmysql.c	2005-06-08 12:05:25 -05:00
+++ 1.219/libmysql/libmysql.c	2005-06-09 17:52:17 -05:00
@@ -1609,7 +1609,7 @@
 ulong STDCALL
 mysql_escape_string(char *to,const char *from,ulong length)
 {
-  return escape_string_for_mysql(default_charset_info, to, length, from,
(ulong)strlen(from));
+  return escape_string_for_mysql(default_charset_info, to, 0, from, length);
 }
 
 ulong STDCALL