Merge with 4.0.4

BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_base.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/sslopt-case.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql/libmysql.def:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_set.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/sql_cache.cc:
  Code cleanup (removed ifdef)

1 files changed, 36 insertions, 22 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index c418ef34174..900d529827e 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -240,6 +240,8 @@ SHOW_COMP_OPTION have_query_cache=SHOW_OPTION_YES;
 SHOW_COMP_OPTION have_query_cache=SHOW_OPTION_NO;
 #endif
 
+const char *show_comp_option_name[]= {"YES", "NO", "DISABLED"};
+
 bool opt_large_files= sizeof(my_off_t) > 4;
 
 /*
@@ -413,15 +415,14 @@ my_bool use_temp_pool=0;
 
 pthread_key(MEM_ROOT*,THR_MALLOC);
 pthread_key(THD*, THR_THD);
-pthread_key(NET*, THR_NET);
 pthread_mutex_t LOCK_mysql_create_db, LOCK_Acl, LOCK_open, LOCK_thread_count,
-		LOCK_mapped_file, LOCK_status, LOCK_grant,
+		LOCK_mapped_file, LOCK_status,
 		LOCK_error_log,
 		LOCK_delayed_insert, LOCK_delayed_status, LOCK_delayed_create,
 		LOCK_crypt, LOCK_bytes_sent, LOCK_bytes_received,
 	        LOCK_global_system_variables,
 		LOCK_user_conn, LOCK_slave_list, LOCK_active_mi;
-
+rw_lock_t	LOCK_grant;
 pthread_cond_t COND_refresh,COND_thread_count, COND_slave_stopped,
 	       COND_slave_start;
 pthread_cond_t COND_thread_cache,COND_flush_thread_cache;
@@ -939,7 +940,7 @@ static void set_user(const char *user)
   {
     // allow a numeric uid to be used
     const char *pos;
-    for (pos=user; isdigit(*pos); pos++) ;
+    for (pos=user; my_isdigit(system_charset_info,*pos); pos++) ;
     if (*pos)					// Not numeric id
     {
       fprintf(stderr,"Fatal error: Can't change to run as user '%s' ;  Please check that the user exists!\n",user);
@@ -1042,7 +1043,7 @@ static void server_init(void)
   if (Service.IsNT() && mysql_unix_port[0] && !opt_bootstrap &&
       opt_enable_named_pipe)
   {
-    sprintf( szPipeName, "\\\\.\\pipe\\%s", mysql_unix_port );
+    sprintf(szPipeName, "\\\\.\\pipe\\%s", mysql_unix_port );
     ZeroMemory( &saPipeSecurity, sizeof(saPipeSecurity) );
     ZeroMemory( &sdPipeDescriptor, sizeof(sdPipeDescriptor) );
     if ( !InitializeSecurityDescriptor(&sdPipeDescriptor,
@@ -1127,12 +1128,12 @@ static void server_init(void)
 
 void yyerror(const char *s)
 {
-  NET *net=my_pthread_getspecific_ptr(NET*,THR_NET);
-  char *yytext=(char*) current_lex->tok_start;
+  THD *thd=current_thd;
+  char *yytext=(char*) thd->lex.tok_start;
   if (!strcmp(s,"parse error"))
     s=ER(ER_SYNTAX_ERROR);
-  net_printf(net,ER_PARSE_ERROR, s, yytext ? (char*) yytext : "",
-	     current_lex->yylineno);
+  net_printf(thd,ER_PARSE_ERROR, s, yytext ? (char*) yytext : "",
+	     thd->lex.yylineno);
 }
 
 
@@ -1148,7 +1149,7 @@ void close_connection(NET *net,uint errcode,bool lock)
   if ((vio=net->vio) != 0)
   {
     if (errcode)
-      send_error(net,errcode,ER(errcode));	/* purecov: inspected */
+      net_send_error(net,errcode,ER(errcode));	/* purecov: inspected */
     vio_close(vio);			/* vio is freed in delete thd */
   }
   if (lock)
@@ -1541,8 +1542,8 @@ static void *signal_hand(void *arg __attribute__((unused)))
     if ((pidFile = my_create(pidfile_name,0664, O_WRONLY, MYF(MY_WME))) >= 0)
     {
       char buff[21];
-      sprintf(buff,"%lu",(ulong) getpid());
-      (void) my_write(pidFile, buff,strlen(buff),MYF(MY_WME));
+      ulong length= my_sprintf(buff, (buff,"%lu",(ulong) getpid()));
+      (void) my_write(pidFile, buff, length, MYF(MY_WME));
       (void) my_close(pidFile,MYF(0));
     }
   }
@@ -1640,11 +1641,12 @@ static void *signal_hand(void *arg __attribute__((unused)))
 static int my_message_sql(uint error, const char *str,
 			  myf MyFlags __attribute__((unused)))
 {
-  NET *net;
+  THD *thd;
   DBUG_ENTER("my_message_sql");
   DBUG_PRINT("error",("Message: '%s'",str));
-  if ((net=my_pthread_getspecific_ptr(NET*,THR_NET)))
+  if ((thd=current_thd))
   {
+    NET *net= &thd->net;
     if (!net->last_error[0])			// Return only first message
     {
       strmake(net->last_error,str,sizeof(net->last_error)-1);
@@ -1853,7 +1855,6 @@ int main(int argc, char **argv)
 
   (void) pthread_mutex_init(&LOCK_mysql_create_db,MY_MUTEX_INIT_SLOW);
   (void) pthread_mutex_init(&LOCK_Acl,MY_MUTEX_INIT_SLOW);
-  (void) pthread_mutex_init(&LOCK_grant,MY_MUTEX_INIT_FAST);
   (void) pthread_mutex_init(&LOCK_open,MY_MUTEX_INIT_FAST);
   (void) pthread_mutex_init(&LOCK_thread_count,MY_MUTEX_INIT_FAST);
   (void) pthread_mutex_init(&LOCK_mapped_file,MY_MUTEX_INIT_SLOW);
@@ -1871,6 +1872,7 @@ int main(int argc, char **argv)
   (void) pthread_mutex_init(&LOCK_rpl_status, MY_MUTEX_INIT_FAST);
   (void) pthread_mutex_init(&LOCK_active_mi, MY_MUTEX_INIT_FAST);
   (void) pthread_mutex_init(&LOCK_global_system_variables, MY_MUTEX_INIT_FAST);
+  (void) my_rwlock_init(&LOCK_grant, NULL);
   (void) pthread_cond_init(&COND_thread_count,NULL);
   (void) pthread_cond_init(&COND_refresh,NULL);
   (void) pthread_cond_init(&COND_thread_cache,NULL);
@@ -1881,7 +1883,7 @@ int main(int argc, char **argv)
 
   if (set_default_charset_by_name(sys_charset.value, MYF(MY_WME)))
     exit(1);
-  charsets_list = list_charsets(MYF(MY_COMPILED_SETS|MY_CONFIG_SETS));
+  charsets_list= list_charsets(MYF(MY_CS_COMPILED | MY_CS_CONFIG));
 
 #ifdef HAVE_OPENSSL
   if (opt_use_ssl)
@@ -2025,7 +2027,7 @@ int main(int argc, char **argv)
     After this we can't quit by a simple unireg_abort
   */
   error_handler_hook = my_message_sql;
-  if (pthread_key_create(&THR_THD,NULL) || pthread_key_create(&THR_NET,NULL) ||
+  if (pthread_key_create(&THR_THD,NULL) ||
       pthread_key_create(&THR_MALLOC,NULL))
   {
     sql_print_error("Can't create thread-keys");
@@ -2470,7 +2472,7 @@ static void create_new_thread(THD *thd)
 	thread_count--;
 	thd->killed=1;				// Safety
 	(void) pthread_mutex_unlock(&LOCK_thread_count);
-	net_printf(net,ER_CANT_CREATE_THREAD,error);
+	net_printf(thd,ER_CANT_CREATE_THREAD,error);
 	(void) pthread_mutex_lock(&LOCK_thread_count);
 	close_connection(net,0,0);
 	delete thd;
@@ -2875,6 +2877,7 @@ enum options {
   OPT_MAX_JOIN_SIZE, OPT_MAX_SORT_LENGTH,
   OPT_MAX_TMP_TABLES, OPT_MAX_USER_CONNECTIONS,
   OPT_MAX_WRITE_LOCK_COUNT, OPT_BULK_INSERT_BUFFER_SIZE,
+  OPT_MAX_ERROR_COUNT, OPT_MAX_PREP_STMT,
   OPT_MYISAM_BLOCK_SIZE, OPT_MYISAM_MAX_EXTRA_SORT_FILE_SIZE,
   OPT_MYISAM_MAX_SORT_FILE_SIZE, OPT_MYISAM_SORT_BUFFER_SIZE,
   OPT_NET_BUFFER_LENGTH, OPT_NET_RETRY_COUNT,
@@ -3495,6 +3498,11 @@ struct my_option my_long_options[] =
    "Don't start more than this number of threads to handle INSERT DELAYED statements.",
    (gptr*) &max_insert_delayed_threads, (gptr*) &max_insert_delayed_threads,
    0, GET_ULONG, REQUIRED_ARG, 20, 1, 16384, 0, 1, 0},
+  {"max_error_count", OPT_MAX_ERROR_COUNT,
+   "Max number of errors/warnings to store for a statement",
+   (gptr*) &global_system_variables.max_error_count,
+   (gptr*) &max_system_variables.max_error_count,
+   0, GET_ULONG, REQUIRED_ARG, DEFAULT_ERROR_COUNT, 1, 65535, 0, 1, 0},
   {"max_heap_table_size", OPT_MAX_HEP_TABLE_SIZE,
    "Don't allow creation of heap tables bigger than this.",
    (gptr*) &global_system_variables.max_heap_table_size,
@@ -3505,6 +3513,11 @@ struct my_option my_long_options[] =
    (gptr*) &global_system_variables.max_join_size,
    (gptr*) &max_system_variables.max_join_size, 0, GET_ULONG, REQUIRED_ARG,
    ~0L, 1, ~0L, 0, 1, 0},
+  {"max_prepared_statements", OPT_MAX_PREP_STMT,
+   "Max number of prepared_statements for a thread",
+   (gptr*) &global_system_variables.max_prep_stmt_count,
+   (gptr*) &max_system_variables.max_prep_stmt_count, 0, GET_ULONG,
+   REQUIRED_ARG, DEFAULT_PREP_STMT_COUNT, 0, ~0L, 0, 1, 0},
   {"max_sort_length", OPT_MAX_SORT_LENGTH,
    "The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored).",
    (gptr*) &global_system_variables.max_sort_length,
@@ -4026,7 +4039,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
       exit(1);
     }
     val= p--;
-    while (isspace(*p) && p > argument)
+    while (my_isspace(system_charset_info, *p) && p > argument)
       *p-- = 0;
     if (p == argument)
     {
@@ -4036,7 +4049,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     }
     *val= 0;
     val+= 2;
-    while (*val && isspace(*val))
+    while (*val && my_isspace(system_charset_info, *val))
       *val++;
     if (!*val)
     {
@@ -4179,7 +4192,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     have_symlink=SHOW_OPTION_DISABLED;
     break;
   case (int) OPT_BIND_ADDRESS:
-    if (argument && isdigit(argument[0]))
+    if (argument && my_isdigit(system_charset_info, argument[0]))
     {
       my_bind_addr = (ulong) inet_addr(argument);
     }
@@ -4587,7 +4600,8 @@ static ulong find_bit_type(const char *x, TYPELIB *bit_lib)
       j=pos;
       while (j != end)
       {
-	if (toupper(*i++) != toupper(*j++))
+	if (my_toupper(system_charset_info,*i++) != 
+            my_toupper(system_charset_info,*j++))
 	  goto skipp;
       }
       found_int=bit;