New files for MySQL 3.23.23 client library. New files are for qouting

using different character sets.

1 files changed, 21 insertions, 4 deletions

diff --git a/ext/mysql/libmysql/my_error.c b/ext/mysql/libmysql/my_error.c
index aeef85dbd4..26510f0848 100644
--- a/ext/mysql/libmysql/my_error.c
+++ b/ext/mysql/libmysql/my_error.c
@@ -1,5 +1,19 @@
-/* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
-   This file is public domain and comes with NO WARRANTY of any kind */
+/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA */
 
 #include "mysys_priv.h"
 #include "mysys_err.h"
@@ -39,6 +53,7 @@ int my_error(int nr,myf MyFlags, ...)
     if (tpos[0] != '%')
     {
       *endpos++= *tpos++;	/* Copy ordinary char */
+      olen++;
       continue;
     }
     if (*++tpos == '%')		/* test if %% */
@@ -66,8 +81,10 @@ int my_error(int nr,myf MyFlags, ...)
       {
 	register int iarg;
 	iarg = va_arg(ap, int);
-	plen= (uint) (int2str((long) iarg,endpos,*tpos == 'd'  ? -10 : 10)-
-		      endpos);
+	if (*tpos == 'd')
+	  plen= (uint) (int2str((long) iarg,endpos, -10) - endpos);
+	else
+	  plen= (uint) (int2str((long) (uint) iarg,endpos,10)- endpos);
 	if (olen + plen < ERRMSGSIZE+2) /* Replace parameter if possible */
 	{
 	  endpos+=plen;