Cleanups

BitKeeper/etc/ignore:
  added vio/test-ssl
Docs/manual.texi:
  Cleanup
isam/isamchk.c:
  Cleanup
myisam/mi_check.c:
  Cleanup
myisam/myisamchk.c:
  Cleanup
myisam/myisamdef.h:
  Cleanup
sql/log_event.cc:
  Cleanup
sql/mysqld.cc:
  Cleanup

8 files changed, 31 insertions, 29 deletions

diff --git a/.bzrignore b/.bzrignore
index 4011bf5ff5e..dd50d9b9086 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -400,3 +400,4 @@ vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
 tools/mysqlmanager
+vio/test-ssl
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 4522d7fb9e5..5e3bb8e3a6a 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -42382,11 +42382,6 @@ interface that is based on msqltcl 1.50.
 The MySQL @uref{http://www.mysql.com/Downloads/Contrib/,Contrib directory}
 contains an Eiffel wrapper written by Michael Ravits.
 
-You can also find this at:
-@url{http://www.netpedia.net/hosting/newplayer/}
-
-
-
 
 @node Extending MySQL, Problems, Clients, Top
 @chapter Extending MySQL
diff --git a/isam/isamchk.c b/isam/isamchk.c
index 3aa1cf4e3c2..c89cc36c9a0 100644
--- a/isam/isamchk.c
+++ b/isam/isamchk.c
@@ -62,7 +62,7 @@ SET_STACK_SIZE(9000)			/* Minimum stack size for program */
 #define MIN_SORT_BUFFER		(4096-MALLOC_OVERHEAD)
 #endif
 
-#define NEAD_MEM	((uint) 10*4*(IO_SIZE+32)+32) /* Nead for recursion */
+#define NEED_MEM	((uint) 10*4*(IO_SIZE+32)+32) /* Nead for recursion */
 #define MAXERR			20
 #define BUFFERS_WHEN_SORTING	16		/* Alloc for sort-key-tree */
 #define WRITE_COUNT		MY_HOW_OFTEN_TO_WRITE
@@ -512,7 +512,7 @@ static int nisamchk(my_string filename)
       if (!rep_quick)
       {
 	if (testflag & T_EXTEND)
-	  VOID(init_key_cache(use_buffers,(uint) NEAD_MEM));
+	  VOID(init_key_cache(use_buffers,(uint) NEED_MEM));
 	VOID(init_io_cache(&read_cache,datafile,(uint) read_buffer_length,
 			  READ_CACHE,share->pack.header_length,1,
 			  MYF(MY_WME)));
@@ -1473,7 +1473,7 @@ my_string name;
     printf("Data records: %lu\n",(ulong) share->state.records);
   }
 
-  VOID(init_key_cache(use_buffers,NEAD_MEM));
+  VOID(init_key_cache(use_buffers,NEED_MEM));
   if (init_io_cache(&read_cache,info->dfile,(uint) read_buffer_length,
 		   READ_CACHE,share->pack.header_length,1,MYF(MY_WME)))
     goto err;
@@ -1950,7 +1950,7 @@ int write_info;
   if (share->state.key_root[sort_key] == NI_POS_ERROR)
     DBUG_RETURN(0);				/* Nothing to do */
 
-  init_key_cache(use_buffers,NEAD_MEM);
+  init_key_cache(use_buffers,NEED_MEM);
   if (init_io_cache(&info->rec_cache,-1,(uint) write_buffer_length,
 		   WRITE_CACHE,share->pack.header_length,1,
 		   MYF(MY_WME | MY_WAIT_IF_FULL)))
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index a15427b7838..eb9e7491ce0 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -1130,7 +1130,7 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
   }
 
   if (!param->using_global_keycache)
-    VOID(init_key_cache(param->use_buffers,NEAD_MEM));
+    VOID(init_key_cache(param->use_buffers,NEED_MEM));
 
   if (init_io_cache(&param->read_cache,info->dfile,
 		    (uint) param->read_buffer_length,
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index 6f782b2f80f..319539b44d4 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -778,7 +778,7 @@ static int myisamchk(MI_CHECK *param, my_string filename)
 	  !(param->testflag & (T_FAST | T_FORCE_CREATE)))
       {
 	if (param->testflag & (T_EXTEND | T_MEDIUM))
-	  VOID(init_key_cache(param->use_buffers,(uint) NEAD_MEM));
+	  VOID(init_key_cache(param->use_buffers,(uint) NEED_MEM));
 	VOID(init_io_cache(&param->read_cache,datafile,
 			   (uint) param->read_buffer_length,
 			   READ_CACHE,
@@ -1185,7 +1185,7 @@ static int mi_sort_records(MI_CHECK *param,
   if (share->state.key_root[sort_key] == HA_OFFSET_ERROR)
     DBUG_RETURN(0);				/* Nothing to do */
 
-  init_key_cache(param->use_buffers,NEAD_MEM);
+  init_key_cache(param->use_buffers,NEED_MEM);
   if (init_io_cache(&info->rec_cache,-1,(uint) param->write_buffer_length,
 		   WRITE_CACHE,share->pack.header_length,1,
 		   MYF(MY_WME | MY_WAIT_IF_FULL)))
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h
index 9da669e8438..a2a30ae50ce 100644
--- a/myisam/myisamdef.h
+++ b/myisam/myisamdef.h
@@ -563,7 +563,7 @@ typedef struct st_mi_block_info {	/* Parameter to _mi_get_block_info */
 #define BLOCK_SYNC_ERROR 16	/* Right data at wrong place */
 #define BLOCK_FATAL_ERROR 32	/* hardware-error */
 
-#define NEAD_MEM	((uint) 10*4*(IO_SIZE+32)+32) /* Nead for recursion */
+#define NEED_MEM	((uint) 10*4*(IO_SIZE+32)+32) /* Nead for recursion */
 #define MAXERR			20
 #define BUFFERS_WHEN_SORTING	16		/* Alloc for sort-key-tree */
 #define WRITE_COUNT		MY_HOW_OFTEN_TO_WRITE
diff --git a/sql/log_event.cc b/sql/log_event.cc
index ecf4e815b49..9076d141f0d 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -548,7 +548,10 @@ void Log_event::print_header(FILE* file)
 
 void Log_event::print_timestamp(FILE* file, time_t* ts)
 {
-  struct tm tm_tmp, *res;
+#ifdef MYSQL_SERVER
+  struct tm tm_tmp;
+#endif
+  struct tm *res;
   if (!ts)
   {
     ts = &when;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 20ccb6d1f76..4ca07d63056 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2597,15 +2597,17 @@ enum options {
                OPT_INNODB_FLUSH_METHOD, 
                OPT_SAFE_SHOW_DB,
 	       OPT_GEMINI_SKIP, OPT_INNODB_SKIP,
-               OPT_TEMP_POOL, OPT_DO_PSTACK, OPT_TX_ISOLATION,
+               OPT_TEMP_POOL, OPT_TX_ISOLATION,
 	       OPT_GEMINI_FLUSH_LOG, OPT_GEMINI_RECOVER,
                OPT_GEMINI_UNBUFFERED_IO, OPT_SKIP_SAFEMALLOC,
-	       OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINK, OPT_REPORT_HOST,
+	       OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINKS,
+	       OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP_FAIL,
+	       OPT_SAFE_USER_CREATE, OPT_SQL_MODE,
+               OPT_DO_PSTACK, OPT_REPORT_HOST,
 	       OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT,
-               OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP_FAIL,
                OPT_SHOW_SLAVE_AUTH_INFO, OPT_OLD_RPL_COMPAT,
-               OPT_SQL_MODE,OPT_SAFE_USER_CREATE,
-               OPT_SLAVE_LOAD_TMPDIR, OPT_NO_MIX_TYPE};
+               OPT_SLAVE_LOAD_TMPDIR, OPT_NO_MIX_TYPE
+};
 
 static struct option long_options[] = {
   {"ansi",                  no_argument,       0, 'a'},
@@ -2703,10 +2705,10 @@ static struct option long_options[] = {
      OPT_SAFEMALLOC_MEM_LIMIT},
   {"new",                   no_argument,       0, 'n'},
 #ifdef NOT_YET
-  {"no-mix-table-types",       no_argument,       0, (int)OPT_NO_MIX_TYPE},
+  {"no-mix-table-types",    no_argument,       0, (int) OPT_NO_MIX_TYPE},
 #endif
-  {"old-protocol",          no_argument,       0, 'o'},
-  {"old-rpl-compat",          no_argument,       0, (int)OPT_OLD_RPL_COMPAT},
+  {"old-protocol",	    no_argument,       0, 'o'},
+  {"old-rpl-compat",        no_argument,       0, (int) OPT_OLD_RPL_COMPAT},
 #ifdef ONE_THREAD
   {"one-thread",            no_argument,       0, (int) OPT_ONE_THREAD},
 #endif
@@ -2715,15 +2717,15 @@ static struct option long_options[] = {
   {"replicate-do-db",       required_argument, 0, (int) OPT_REPLICATE_DO_DB},
   {"replicate-do-table",       required_argument, 0,
    (int) OPT_REPLICATE_DO_TABLE},
-  {"replicate-wild-do-table",       required_argument, 0,
+  {"replicate-wild-do-table",  required_argument, 0,
    (int) OPT_REPLICATE_WILD_DO_TABLE},
-  {"replicate-ignore-db",   required_argument, 0,
+  {"replicate-ignore-db",      required_argument, 0,
    (int) OPT_REPLICATE_IGNORE_DB},
   {"replicate-ignore-table",   required_argument, 0,
    (int) OPT_REPLICATE_IGNORE_TABLE},
   {"replicate-wild-ignore-table",   required_argument, 0,
    (int) OPT_REPLICATE_WILD_IGNORE_TABLE},
-  {"replicate-rewrite-db",   required_argument, 0,
+  {"replicate-rewrite-db",     required_argument, 0,
      (int) OPT_REPLICATE_REWRITE_DB},
     // In replication, we may need to tell the other servers how to connect
     // to us
@@ -2733,7 +2735,7 @@ static struct option long_options[] = {
   {"report-port",           required_argument, 0, (int) OPT_REPORT_PORT},
   {"safe-mode",             no_argument,       0, (int) OPT_SAFE},
   {"safe-show-database",    no_argument,       0, (int) OPT_SAFE_SHOW_DB},
-  {"socket",                required_argument, 0, (int) OPT_SOCKET},
+  {"safe-user-create",	    no_argument,       0, (int) OPT_SAFE_USER_CREATE},
   {"server-id",		    required_argument, 0, (int) OPT_SERVER_ID},
   {"set-variable",          required_argument, 0, 'O'},
   {"show-slave-auth-info",  no_argument,       0,
@@ -2753,9 +2755,10 @@ static struct option long_options[] = {
   {"skip-show-database",    no_argument,       0, (int) OPT_SKIP_SHOW_DB},
   {"skip-slave-start",      no_argument,       0, (int) OPT_SKIP_SLAVE_START},
   {"skip-stack-trace",	    no_argument,       0, (int) OPT_SKIP_STACK_TRACE},
-  {"skip-symlink",	    no_argument,       0, (int) OPT_SKIP_SYMLINK},
+  {"skip-symlink",	    no_argument,       0, (int) OPT_SKIP_SYMLINKS},
   {"skip-thread-priority",  no_argument,       0, (int) OPT_SKIP_PRIOR},
   {"slave-load-tmpdir", required_argument, 0, (int) OPT_SLAVE_LOAD_TMPDIR},  
+  {"socket",                required_argument, 0, (int) OPT_SOCKET},
   {"sql-bin-update-same",   no_argument,       0, (int) OPT_SQL_BIN_UPDATE_SAME},
   {"sql-mode",              required_argument, 0, (int) OPT_SQL_MODE},
 #include "sslopt-longopts.h"
@@ -3014,8 +3017,8 @@ struct show_var_st init_vars[]= {
   {"myisam_max_extra_sort_file_size", (char*) &myisam_max_extra_sort_file_size,
    SHOW_LONG},
   {"myisam_max_sort_file_size",(char*) &myisam_max_sort_file_size,  SHOW_LONG},
-  {"myisam_sort_buffer_size", (char*) &myisam_sort_buffer_size,     SHOW_LONG},
   {"myisam_recover_options",  (char*) &myisam_recover_options_str,  SHOW_CHAR_PTR},
+  {"myisam_sort_buffer_size", (char*) &myisam_sort_buffer_size,     SHOW_LONG},
   {"net_buffer_length",       (char*) &net_buffer_length,           SHOW_LONG},
   {"net_read_timeout",        (char*) &net_read_timeout,	    SHOW_LONG},
   {"net_retry_count",         (char*) &mysqld_net_retry_count,      SHOW_LONG},
@@ -3710,7 +3713,7 @@ static void get_options(int argc,char **argv)
     case (int) OPT_SKIP_STACK_TRACE:
       test_flags|=TEST_NO_STACKTRACE;
       break;
-    case (int) OPT_SKIP_SYMLINK:
+    case (int) OPT_SKIP_SYMLINKS:
       my_disable_symlinks=1;
       my_use_symdir=0;
       have_symlink=SHOW_OPTION_DISABLED;