Big code cleanup/review before 4.0.2 release.

(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.


BUILD/SETUP.sh:
  Added -DPEDANTIC_SAFEMALLOC as standard debug option
Docs/manual.texi:
  Changes for new version.
client/mysql.cc:
  Fixed default value for rehash
  cleanup
client/mysqladmin.c:
  Cleanup
client/mysqlbinlog.cc:
  cleanup
client/mysqldump.c:
  Cleanup
client/mysqlmanager-pwgen.c:
  Cleanup
client/mysqlmanagerc.c:
  Cleanup
client/mysqltest.c:
  Cleanup
dbug/dbug.c:
  Cleanup
extra/resolve_stack_dump.c:
  Cleanup & Simple optimizations
include/ft_global.h:
  Cleanup
include/my_alloc.h:
  Cleanup
include/my_global.h:
  Cleanup
include/my_sys.h:
  Cleanup
include/myisam.h:
  Cleanup
libmysql/libmysql.c:
  Cleanup
libmysql/manager.c:
  Cleanup
myisam/ft_boolean_search.c:
  Cleanup
myisam/ft_dump.c:
  Change strcpy -> strmov
myisam/ft_eval.c:
  Cleanup
myisam/ft_nlq_search.c:
  Cleanup
myisam/ft_test1.c:
  strncpy -> strnmov
myisam/ft_update.c:
  Cleanup
myisam/mi_static.c:
  Cleanup
myisam/mi_test2.c:
  Cleanup
myisam/mi_write.c:
  Cleanup
mysys/mf_fn_ext.c:
  Cleanup
mysys/mf_iocache.c:
  Cleanup
mysys/mf_iocache2.c:
  Cleanup
mysys/my_getopt.c:
  Cleanup
mysys/my_read.c:
  Cleanup
mysys/my_thr_init.c:
  Cleanup
mysys/queues.c:
  Cleanup
mysys/safemalloc.c:
  Cleanup
sql/field.cc:
  Indentation cleanups
sql/ha_berkeley.cc:
  Indentation cleanups
sql/ha_myisam.cc:
  Cleanup
sql/item.h:
  Indentation cleanups
sql/item_cmpfunc.cc:
  Indentation cleanups
sql/item_create.cc:
  cleanup
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Indentation cleanups
sql/item_strfunc.cc:
  Indentation cleanups
sql/item_sum.cc:
  Indentation cleanups
sql/item_timefunc.cc:
  Indentation cleanups
sql/lock.cc:
  Indentation cleanups
sql/log.cc:
  Cleanup
  strnmov -> strmake
sql/log_event.cc:
  Cleanup + optimizations
  Fixed memory leak
  Added missing pthread_mutex_unlock()  (On error condition)
sql/log_event.h:
  Indentation and comment cleanup
  Merged #ifdef's into common blocks for better readability
sql/mini_client.cc:
  Indentation cleanup
sql/mysql_priv.h:
  Cleanup
  Changed int function to bool
sql/mysqld.cc:
  Indentation and comment cleanup
sql/net_pkg.cc:
  Indentation cleanup
sql/net_serv.cc:
  Changed int function -> bool
sql/nt_servc.cc:
  Cleanup
sql/opt_range.cc:
  Indentation cleanup
sql/repl_failsafe.cc:
  Cleanup + simple optimization
  strnmov -> strmake
sql/slave.cc:
  strnmov -> strmake
  Cleanups
sql/slave.h:
  Cleanup
sql/sql_acl.cc:
  Indentation and DBUG_PRINT cleanup
  Changed WITH MAX... to not use =
sql/sql_base.cc:
  Indentation cleanup
sql/sql_cache.cc:
  Indentation cleanup
sql/sql_class.cc:
  Indentation cleanup
sql/sql_class.h:
  Renamed some struct slots
sql/sql_delete.cc:
  Indentation cleanup
sql/sql_handler.cc:
  Indentation cleanup
sql/sql_insert.cc:
  Use new slot names.
sql/sql_lex.cc:
  Indentation cleanup
sql/sql_lex.h:
  Indentation cleanup
sql/sql_load.cc:
  Indentation cleanup
sql/sql_parse.cc:
  Indentation cleanup
  Removed not used check from LOCK TABLES
sql/sql_repl.cc:
  strnmov -> strmake
sql/sql_repl.h:
  Removed test if file is included (We want to know if it's included twice to avoid this)
sql/sql_select.cc:
  Indentation cleanup
sql/sql_show.cc:
  Indentation cleanup
sql/sql_string.cc:
  Indentation cleanup
sql/sql_table.cc:
  Indentation cleanup
sql/sql_union.cc:
  Use renamed struct slot
sql/sql_update.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Removed = after GRANT ... MAX_  to make the syntax uniform
sql/table.cc:
  Indentation cleanup
sql/table.h:
  Indentation cleanup
sql/time.cc:
  Indentation cleanup
sql/udf_example.cc:
  Indentation cleanup
sql/unireg.cc:
  strnmov -> strmake
tests/grant.pl:
  Added test for LOCK TABLES
tools/mysqlmanager.c:
  Cleanup
  fopen() -> my_fopen()
vio/viosocket.c:
  DBUG_PRINT cleanups
vio/viosslfactories.c:
  Indentation cleanup
  Checking of results from malloc()
  Fixed possible memory leak
BitKeeper/etc/ignore:
  Added scripts/mysql_secure_installation to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1 files changed, 35 insertions, 25 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 4a8c301e894..accc5219a71 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1502,10 +1502,11 @@ void debug_sync_point(const char* lock_name, uint lock_timeout)
     thd->ull=0;
   }
 
-  /* if the lock has not been aquired by some client, we do not want to
-     create an entry for it, since we immediately release the lock. In
-     this case, we will not be waiting, but rather, just waste CPU and
-     memory on the whole deal
+  /*
+    If the lock has not been aquired by some client, we do not want to
+    create an entry for it, since we immediately release the lock. In
+    this case, we will not be waiting, but rather, just waste CPU and
+    memory on the whole deal
   */
   if (!(ull= ((ULL*) hash_search(&hash_user_locks,lock_name,
 				 lock_name_len))))
@@ -1515,8 +1516,10 @@ void debug_sync_point(const char* lock_name, uint lock_timeout)
   }
   ull->count++;
 
-  /* structure is now initialized.  Try to get the lock */
-  /* Set up control struct to allow others to abort locks */
+  /*
+    Structure is now initialized.  Try to get the lock.
+    Set up control struct to allow others to abort locks
+  */
   thd->proc_info="User lock";
   thd->mysys_var->current_mutex= &LOCK_user_locks;
   thd->mysys_var->current_cond=  &ull->cond;
@@ -1603,8 +1606,10 @@ longlong Item_func_get_lock::val_int()
   }
   ull->count++;
 
-  /* structure is now initialized.  Try to get the lock */
-  /* Set up control struct to allow others to abort locks */
+  /*
+    Structure is now initialized.  Try to get the lock.
+    Set up control struct to allow others to abort locks.
+  */
   thd->proc_info="User lock";
   thd->mysys_var->current_mutex= &LOCK_user_locks;
   thd->mysys_var->current_cond=  &ull->cond;
@@ -1645,10 +1650,11 @@ longlong Item_func_get_lock::val_int()
 
 
 /*
-** Release a user level lock.
-** Returns 1 if lock released
-** 0 if lock wasn't held
-** NULL if no such lock
+  Release a user level lock.
+  Return:
+    1 if lock released
+    0 if lock wasn't held
+    (SQL) NULL if no such lock
 */
 
 longlong Item_func_release_lock::val_int()
@@ -1717,6 +1723,7 @@ longlong Item_func_benchmark::val_int()
   return 0;
 }
 
+
 #define extra_size sizeof(double)
 
 static user_var_entry *get_variable(HASH *hash, LEX_STRING &name,
@@ -1980,6 +1987,7 @@ void Item_func_get_user_var::print(String *str)
   str->append(')');
 }
 
+
 bool Item_func_get_user_var::eq(const Item *item, bool binary_cmp) const
 {
   /* Assume we don't have rtti */
@@ -2087,10 +2095,11 @@ bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist)
   maybe_null=1;
   join_key=0;
 
-  /* const_item is assumed in quite a bit of places, so it would be difficult
-     to remove;  If it would ever to be removed, this should include
-     modifications to find_best and auto_close as complement to auto_init code
-     above.
+  /*
+    const_item is assumed in quite a bit of places, so it would be difficult
+    to remove;  If it would ever to be removed, this should include
+    modifications to find_best and auto_close as complement to auto_init code
+    above.
    */
   if (Item_func::fix_fields(thd,tlist) || !const_item())
   {
@@ -2110,7 +2119,7 @@ bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist)
   }
   /* check that all columns come from the same table */
   if (count_bits(used_tables_cache) != 1)
-      key=NO_SUCH_KEY;
+    key=NO_SUCH_KEY;
   const_item_cache=0;
   table=((Item_field *)fields.head())->field->table;
   table->fulltext_searched=1;
@@ -2124,6 +2133,7 @@ bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist)
   return 0;
 }
 
+
 bool Item_func_match::fix_index()
 {
   List_iterator_fast<Item> li(fields);
@@ -2200,16 +2210,15 @@ err:
     return 0;
   }
   my_printf_error(ER_FT_MATCHING_KEY_NOT_FOUND,
-               ER(ER_FT_MATCHING_KEY_NOT_FOUND),MYF(0));
+		  ER(ER_FT_MATCHING_KEY_NOT_FOUND),MYF(0));
   return 1;
 }
 
+
 bool Item_func_match::eq(const Item *item, bool binary_cmp) const
 {
-  if (item->type() != FUNC_ITEM)
-    return 0;
-
-  if (func_name() != ((Item_func*)item)->func_name())
+  if (item->type() != FUNC_ITEM ||
+      func_name() != ((Item_func*)item)->func_name())
     return 0;
 
   Item_func_match *ifm=(Item_func_match*) item;
@@ -2221,6 +2230,7 @@ bool Item_func_match::eq(const Item *item, bool binary_cmp) const
   return 0;
 }
 
+
 double Item_func_match::val()
 {
   if (ft_handler == NULL)
@@ -2230,14 +2240,13 @@ double Item_func_match::val()
   {
     if (table->file->ft_handler)
       return ft_handler->please->get_relevance(ft_handler);
-
     join_key=0;
   }
 
   if (key == NO_SUCH_KEY)
   {
-    String *a=concat->val_str(&value);
-    if ((null_value= (a==0)))
+    String *a= concat->val_str(&value);
+    if ((null_value= (a == 0)))
       return 0;
     return ft_handler->please->find_relevance(ft_handler,
 					      (byte *)a->ptr(), a->length());
@@ -2246,6 +2255,7 @@ double Item_func_match::val()
     return ft_handler->please->find_relevance(ft_handler, record, 0);
 }
 
+
 /***************************************************************************
   System variables
   This has to be recoded after we get more than 3 system variables