Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/my/mysql-4.1

include/m_ctype.h

@@ -340,23 +340,14 @@ uint my_instr_mb(struct charset_info_st *,
 extern my_bool my_parse_charset_xml(const char *bug, uint len,
 				    int (*add)(CHARSET_INFO *cs));
 
-#undef _U
-#undef	_L
-#undef	_NMR
-#undef	_SPC
-#undef	_PNT
-#undef	_CTR
-#undef	_B
-#undef	_X
-
-#define	_U	01	/* Upper case */
-#define	_L	02	/* Lower case */
-#define	_NMR	04	/* Numeral (digit) */
-#define	_SPC	010	/* Spacing character */
-#define	_PNT	020	/* Punctuation */
-#define	_CTR	040	/* Control character */
-#define	_B	0100	/* Blank */
-#define	_X	0200	/* heXadecimal digit */
+#define	_MY_U	01	/* Upper case */
+#define	_MY_L	02	/* Lower case */
+#define	_MY_NMR	04	/* Numeral (digit) */
+#define	_MY_SPC	010	/* Spacing character */
+#define	_MY_PNT	020	/* Punctuation */
+#define	_MY_CTR	040	/* Control character */
+#define	_MY_B	0100	/* Blank */
+#define	_MY_X	0200	/* heXadecimal digit */
 
 
 #define	my_isascii(c)	(!((c) & ~0177))
@@ -365,17 +356,17 @@ extern my_bool my_parse_charset_xml(const char *bug, uint len,
 #define my_toprint(c)	((c) | 64)
 #define my_toupper(s,c)	(char) ((s)->to_upper[(uchar) (c)])
 #define my_tolower(s,c)	(char) ((s)->to_lower[(uchar) (c)])
-#define	my_isalpha(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_U | _L))
-#define	my_isupper(s, c)  (((s)->ctype+1)[(uchar) (c)] & _U)
-#define	my_islower(s, c)  (((s)->ctype+1)[(uchar) (c)] & _L)
-#define	my_isdigit(s, c)  (((s)->ctype+1)[(uchar) (c)] & _NMR)
-#define	my_isxdigit(s, c) (((s)->ctype+1)[(uchar) (c)] & _X)
-#define	my_isalnum(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_U | _L | _NMR))
-#define	my_isspace(s, c)  (((s)->ctype+1)[(uchar) (c)] & _SPC)
-#define	my_ispunct(s, c)  (((s)->ctype+1)[(uchar) (c)] & _PNT)
-#define	my_isprint(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_PNT | _U | _L | _NMR | _B))
-#define	my_isgraph(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_PNT | _U | _L | _NMR))
-#define	my_iscntrl(s, c)  (((s)->ctype+1)[(uchar) (c)] & _CTR)
+#define	my_isalpha(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_MY_U | _MY_L))
+#define	my_isupper(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_U)
+#define	my_islower(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_L)
+#define	my_isdigit(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_NMR)
+#define	my_isxdigit(s, c) (((s)->ctype+1)[(uchar) (c)] & _MY_X)
+#define	my_isalnum(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_MY_U | _MY_L | _MY_NMR))
+#define	my_isspace(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_SPC)
+#define	my_ispunct(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_PNT)
+#define	my_isprint(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR | _MY_B))
+#define	my_isgraph(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR))
+#define	my_iscntrl(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_CTR)
 
 /* Some macros that should be cleaned up a little */
 #define my_isvar(s,c)                 (my_isalnum(s,c) || (c) == '_')

include/mysql.h

@@ -590,7 +590,7 @@ typedef struct st_mysql_methods
   int (*unbuffered_fetch)(MYSQL *mysql, char **row);
   void (*free_embedded_thd)(MYSQL *mysql);
   const char *(*read_statistics)(MYSQL *mysql);
-  int (*next_result)(MYSQL *mysql);
+  my_bool (*next_result)(MYSQL *mysql);
   int (*read_change_user_result)(MYSQL *mysql, char *buff, const char *passwd);
 #endif
 } MYSQL_METHODS;

libmysqld/lib_sql.cc

@@ -246,7 +246,7 @@ static MYSQL_RES * emb_mysql_store_result(MYSQL *mysql)
   return mysql_store_result(mysql);
 }
 
-int emb_next_result(MYSQL *mysql)
+my_bool emb_next_result(MYSQL *mysql)
 {
   THD *thd= (THD*)mysql->thd;
   DBUG_ENTER("emb_next_result");

mysys/charset2html.c

@@ -84,14 +84,14 @@ static void print_cs(CHARSET_INFO *cs)
     printf("<TD>%02X",ch[i].srt);
     
     printf("<TD>%s%s%s%s%s%s%s%s",
-    		ch[i].ctp & _U ? "U" : "",
-    		ch[i].ctp & _L ? "L" : "",
-    		ch[i].ctp & _NMR ? "N" : "",
-    		ch[i].ctp & _SPC ? "S" : "",
-    		ch[i].ctp & _PNT ? "P" : "",
-    		ch[i].ctp & _CTR ? "C" : "",
-    		ch[i].ctp & _B ? "B" : "",
-    		ch[i].ctp & _X ? "X" : "");
+    		ch[i].ctp & _MY_U ? "U" : "",
+    		ch[i].ctp & _MY_L ? "L" : "",
+    		ch[i].ctp & _MY_NMR ? "N" : "",
+    		ch[i].ctp & _MY_SPC ? "S" : "",
+    		ch[i].ctp & _MY_PNT ? "P" : "",
+    		ch[i].ctp & _MY_CTR ? "C" : "",
+    		ch[i].ctp & _MY_B ? "B" : "",
+    		ch[i].ctp & _MY_X ? "X" : "");
     
     printf("<TD>&#%d;",ch[i].uni);
     printf("<TD>&#%d;",ch[i].low);

regex/regcomp.c

@@ -36,18 +36,18 @@ struct parse {
 static char nuls[10];		/* place to point scanner in event of error */
 
 struct cclass cclasses[CCLASS_LAST+1]= {
-  { "alnum",	"","", _U | _L | _NMR},
-  { "alpha",	"","", _U | _L },
-  { "blank",	"","", _B },
-  { "cntrl",	"","", _CTR },
-  { "digit",	"","", _NMR },
-  { "graph",	"","", _PNT | _U | _L | _NMR},
-  { "lower",	"","", _L },
-  { "print",	"","", _PNT | _U | _L | _NMR | _B },
-  { "punct",	"","", _PNT },
-  { "space",	"","", _SPC },
-  { "upper",	"","", _U },
-  { "xdigit",	"","", _X },
+  { "alnum",	"","", _MY_U | _MY_L | _MY_NMR},
+  { "alpha",	"","", _MY_U | _MY_L },
+  { "blank",	"","", _MY_B },
+  { "cntrl",	"","", _MY_CTR },
+  { "digit",	"","", _MY_NMR },
+  { "graph",	"","", _MY_PNT | _MY_U | _MY_L | _MY_NMR},
+  { "lower",	"","", _MY_L },
+  { "print",	"","", _MY_PNT | _MY_U | _MY_L | _MY_NMR | _MY_B },
+  { "punct",	"","", _MY_PNT },
+  { "space",	"","", _MY_SPC },
+  { "upper",	"","", _MY_U },
+  { "xdigit",	"","", _MY_X },
   { NULL,NULL,NULL, 0 }
 };
 

sql-common/client.c

@@ -2233,6 +2233,7 @@ void STDCALL mysql_close(MYSQL *mysql)
   DBUG_VOID_RETURN;
 }
 
+
 static my_bool cli_read_query_result(MYSQL *mysql)
 {
   uchar *pos;