From: Date: June 8 2005 7:07pm
Subject: bk commit into 5.0 tree (reggie:1.1961) BUG#10947
List-Archive: http://lists.mysql.com/internals/25824
X-Bug: 10947
Message-Id: <200506081707.j58H7sH0024673@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/08 12:05:39 reggie@mdk10.(none) +1 -0
  Bug #10947 mysqlshow wildcard failure on Windows 
  

  libmysql/libmysql.c
    1.218 05/06/08 12:05:25 reggie@mdk10.(none) +1 -1
    fix how we are passing in arguments to escape_string_for_mysql

# 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.217/libmysql/libmysql.c	2005-06-05 09:08:39 -05:00
+++ 1.218/libmysql/libmysql.c	2005-06-08 12:05:25 -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, 0, from, length);
+  return escape_string_for_mysql(default_charset_info, to, length, from, (ulong)strlen(from));
 }
 
 ulong STDCALL