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, 39 insertions, 24 deletions

diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c
index 42f7d7fc8cf..5670edde7c0 100644
--- a/myisam/ft_nlq_search.c
+++ b/myisam/ft_nlq_search.c
@@ -21,12 +21,14 @@
 
 /* search with natural language queries */
 
-typedef struct ft_doc_rec {
+typedef struct ft_doc_rec
+{
   my_off_t  dpos;
   double    weight;
 } FT_DOC;
 
-struct st_ft_info {
+struct st_ft_info
+{
   struct _ft_vft *please;
   MI_INFO  *info;
   int       ndocs;
@@ -34,7 +36,8 @@ struct st_ft_info {
   FT_DOC    doc[1];
 };
 
-typedef struct st_all_in_one {
+typedef struct st_all_in_one
+{
   MI_INFO    *info;
   uint	      keynr;
   CHARSET_INFO *charset;
@@ -44,7 +47,8 @@ typedef struct st_all_in_one {
   TREE	      dtree;
 } ALL_IN_ONE;
 
-typedef struct st_ft_superdoc {
+typedef struct st_ft_superdoc
+{
     FT_DOC   doc;
     FT_WORD *word_ptr;
     double   tmp_weight;
@@ -92,7 +96,7 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
   r=_mi_search(aio->info, aio->keyinfo, aio->keybuff, keylen,
 	       SEARCH_FIND | SEARCH_PREFIX, aio->key_root);
 
-  while(!r)
+  while (!r)
   {
     if (_mi_compare_text(aio->charset,
 			 aio->info->lastkey,keylen,
@@ -116,11 +120,12 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
     sdoc.doc.dpos=aio->info->lastpos;
 
     /* saving document matched into dtree */
-    if(!(selem=tree_insert(&aio->dtree, &sdoc, 0))) return 1;
+    if (!(selem=tree_insert(&aio->dtree, &sdoc, 0)))
+      return 1;
 
     sptr=(FT_SUPERDOC *)ELEMENT_KEY((&aio->dtree), selem);
 
-    if(selem->count==1) /* document's first match */
+    if (selem->count==1) /* document's first match */
       sptr->doc.weight=0;
     else
       sptr->doc.weight+=sptr->tmp_weight*sptr->word_ptr->weight;
@@ -144,31 +149,35 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
 		     aio->info->lastkey_length, SEARCH_BIGGER,
 		     aio->key_root);
   }
-  if(doc_cnt) {
+  if (doc_cnt)
+  {
     word->weight*=GWS_IN_USE;
-    if(word->weight < 0) word->weight=0;
+    if (word->weight < 0)
+      word->weight=0;
   }
-
   return 0;
 }
 
+
 static int walk_and_copy(FT_SUPERDOC *from,
 			 uint32 count __attribute__((unused)), FT_DOC **to)
 {
-    from->doc.weight+=from->tmp_weight*from->word_ptr->weight;
-    (*to)->dpos=from->doc.dpos;
-    (*to)->weight=from->doc.weight;
-    (*to)++;
-    return 0;
+  from->doc.weight+=from->tmp_weight*from->word_ptr->weight;
+  (*to)->dpos=from->doc.dpos;
+  (*to)->weight=from->doc.weight;
+  (*to)++;
+  return 0;
 }
 
+
 static int FT_DOC_cmp(FT_DOC *a, FT_DOC *b)
 {
-    return sgn(b->weight - a->weight);
+  return sgn(b->weight - a->weight);
 }
 
+
 FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, byte *query,
-                                 uint query_len, my_bool presort)
+			    uint query_len, my_bool presort)
 {
   TREE	     allocated_wtree, *wtree=&allocated_wtree;
   ALL_IN_ONE  aio;
@@ -196,15 +205,16 @@ FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, byte *query,
             NULL, NULL);
 
   ft_parse_init(&allocated_wtree, aio.charset);
-  if(ft_parse(&allocated_wtree,query,query_len))
+  if (ft_parse(&allocated_wtree,query,query_len))
     goto err;
 
-  if(tree_walk(wtree, (tree_walk_action)&walk_and_match, &aio,
-	     left_root_right))
+  if (tree_walk(wtree, (tree_walk_action)&walk_and_match, &aio,
+		left_root_right))
     goto err2;
 
   dlist=(FT_INFO *)my_malloc(sizeof(FT_INFO)+
-                     sizeof(FT_DOC)*(aio.dtree.elements_in_tree-1),MYF(0));
+			     sizeof(FT_DOC)*(aio.dtree.elements_in_tree-1),
+			     MYF(0));
   if(!dlist)
     goto err2;
 
@@ -214,10 +224,10 @@ FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, byte *query,
   dlist->info=aio.info;
   dptr=dlist->doc;
 
-  tree_walk(&aio.dtree, (tree_walk_action)&walk_and_copy,
-                                   &dptr, left_root_right);
+  tree_walk(&aio.dtree, (tree_walk_action) &walk_and_copy,
+	    &dptr, left_root_right);
 
-  if(presort)
+  if (presort)
     qsort(dlist->doc, dlist->ndocs, sizeof(FT_DOC), (qsort_cmp)&FT_DOC_cmp);
 
 err2:
@@ -229,6 +239,7 @@ err:
   return dlist;
 }
 
+
 int ft_nlq_read_next(FT_INFO *handler, char *record)
 {
   MI_INFO *info= (MI_INFO *) handler->info;
@@ -250,6 +261,7 @@ int ft_nlq_read_next(FT_INFO *handler, char *record)
   return my_errno;
 }
 
+
 float ft_nlq_find_relevance(FT_INFO *handler,
 			    byte *record __attribute__((unused)),
 			    uint length __attribute__((unused)))
@@ -276,16 +288,19 @@ float ft_nlq_find_relevance(FT_INFO *handler,
     return 0.0;
 }
 
+
 void ft_nlq_close_search(FT_INFO *handler)
 {
   my_free((gptr)handler,MYF(0));
 }
 
+
 float ft_nlq_get_relevance(FT_INFO *handler)
 {
   return (float) handler->doc[handler->curdoc].weight;
 }
 
+
 void ft_nlq_reinit_search(FT_INFO *handler)
 {
   handler->curdoc=-1;