From: Date: June 10 2005 9:05pm
Subject: bk commit into 5.0 tree (reggie:1.1961) BUG#10947
List-Archive: http://lists.mysql.com/internals/25885
X-Bug: 10947
Message-Id: <200506101905.j5AJ5gRa005331@mdk10>

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.1961 05/06/10 14:03:22 reggie@mdk10.(none) +1 -0
  Bug #10947 mysqlshow wildcard failure on Windows 

  client/mysqlshow.c
    1.43 05/06/10 14:03:13 reggie@mdk10.(none) +1 -1
    change to using mysql_real_escape_string
    Also, passing in length of from string "table" instead of to string "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-10 14:03:13 -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_real_escape_string(mysql, rows, table, (unsigned long)strlen(table));
     my_snprintf(query, sizeof(query), "show%s tables like '%s'",
                 opt_table_type ? " full" : "", rows);
   }