Change client_flag to unsigned long (16 -> 32 bits) to handle more options.

Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows


client/mysql.cc:
  Removed compiler warnings.
  Make quote handling simpler
include/config-win.h:
  Fix for myisam/rt_mbr.c
include/mysql.h:
  Change client_flag to unsigned long to handle more options.
libmysql/libmysql.c:
  Change client_flag to unsigned long to handle more options.
libmysqld/libmysqld.c:
  Change client_flag to unsigned long to handle more options.
myisam/rt_mbr.c:
  Portability fix for Windows
mysql-test/r/rpl_loaddata.result:
  Fix test case
sql/item_strfunc.cc:
  Don't use new password format if mysql.user has old format
sql/item_strfunc.h:
  Don't use new password format if mysql.user has old format
sql/mysql_priv.h:
  Don't use new password format if mysql.user has old format
sql/mysqld.cc:
  Don't use new password format if mysql.user has old format
sql/sql_acl.cc:
  Don't use new password format if mysql.user has old format.
  tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_class.h:
  Don't use new password format if mysql.user has old format
sql/sql_parse.cc:
  Change client_flag to unsigned long to handle more options.
sql/sql_yacc.yy:
  Don't use new password format if mysql.user has old format
strings/ctype-utf8.c:
  Remove compiler warnings
strings/ctype-win1250ch.c:
  Remove compiler warnings
tests/grant.res:
  Update results

1 files changed, 31 insertions, 21 deletions

diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c
index 86ddb82e1a2..b6e78368dde 100644
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.c
@@ -1,23 +1,33 @@
-/*
-	File strings/ctype-win1250ch.c for MySQL.
+/* Copyright (C) 2003 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-	Copyright: (C) 2001 Jan Pazdziora.
+   This program 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 General Public License for more details.
 
-	This software is released under the terms of GNU General
-        Public License.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-        Development of this software was supported by Neocortex, s.r.o.
+/*
+   Shared, independent copyright: (C) 2001 Jan Pazdziora.
 
-        Bug reports and suggestions are always welcome.
+   Development of this software was supported by Neocortex, s.r.o.
+   MySQL AB expresses its gratitude to Jan for for giving us this software.
 
-	This file implements the collating sequence for Windows-1250
-	character set. It merely extends the binary sorting of US-ASCII
-	by adding characters with diacritical marks into proper places.
-	In addition, it sorts 'ch' between 'h' and 'i', and the sorting
-	is case sensitive, with uppercase being sorted first, in the
-	second pass.
+   Bug reports and suggestions are always welcome.
 
-	Bug reports and suggestions are always welcome.
+   This file implements the collating sequence for Windows-1250
+   character set. It merely extends the binary sorting of US-ASCII
+   by adding characters with diacritical marks into proper places.
+   In addition, it sorts 'ch' between 'h' and 'i', and the sorting
+   is case sensitive, with uppercase being sorted first, in the
+   second pass.
 */
 
 /*
@@ -388,16 +398,16 @@ static uchar NEAR _sort_order_win1250ch2[] = {
 };
 
 struct wordvalue {
-	const char * word;
+	const uchar * word;
 	uchar pass1;
 	uchar pass2;
 };
 static struct wordvalue doubles[] = {
-	{ "ch", 0xad, 0x03 },
-	{ "c",  0xa6, 0x02 },
-	{ "Ch", 0xad, 0x02 },
-	{ "CH", 0xad, 0x01 },
-	{ "C",  0xa6, 0x01 },
+	{ (uchar*) "ch", 0xad, 0x03 },
+	{ (uchar*) "c",  0xa6, 0x02 },
+	{ (uchar*) "Ch", 0xad, 0x02 },
+	{ (uchar*) "CH", 0xad, 0x01 },
+	{ (uchar*) "C",  0xa6, 0x01 },
 };
 
 #define NEXT_CMP_VALUE(src, p, pass, value, len)			\
@@ -412,7 +422,7 @@ static struct wordvalue doubles[] = {
 			int i;						\
 			for (i = 0; i < (int) sizeof(doubles); i++) {	\
 				const uchar * patt = doubles[i].word;	\
-				const uchar * q = (const char *) p;	\
+				const uchar * q = (const uchar *) p;	\
 				while (*patt				\
 					&& !(IS_END(q, src, len))	\
 					&& (*patt == *q)) {		\