After merge fixes & remove compiler warnings

Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files


configure.in:
  After merge fixes
include/ft_global.h:
  Fixed copyright
include/my_sys.h:
  Remove compiler warnings
include/mysql.h:
  Added lengths for all MYSQL_FIELD string parameters
include/mysql_com.h:
  Remove compiler warning
myisam/ft_boolean_search.c:
  Removed compiler warnings
myisam/ft_dump.c:
  Removed compiler warnings
myisam/ft_stopwords.c:
  Copy file from MySQL 4.0
myisam/mi_delete.c:
  Fixed compiler warning
myisam/sort.c:
  Indentation changes
myisam/sp_test.c:
  Remove compiler warnings
mysql-test/r/func_group.result:
  After merge fixes
mysql-test/r/group_by.result:
  After merge fixes
mysql-test/r/rpl_insert_id.result:
  After merge fixes
mysql-test/r/rpl_master_pos_wait.result:
  After merge fixes
mysql-test/t/rpl000009.test:
  After merge fixes
mysql-test/t/rpl_insert_id.test:
  After merge fixes
mysql-test/t/subselect.test:
  After merge fixes
sql/item_cmpfunc.cc:
  After merge fixes
sql/item_cmpfunc.h:
  After merge fixes
sql/item_func.cc:
  After merge fixes
sql/item_func.h:
  After merge fixes
sql/item_strfunc.cc:
  After merge fixes
sql/item_strfunc.h:
  After merge fixes
sql/log.cc:
  After merge fixes
sql/mysql_priv.h:
  After merge fixes
sql/mysqld.cc:
  After merge fixes
sql/sql_db.cc:
  After merge fixes
sql/sql_handler.cc:
  After merge fixes
sql/sql_parse.cc:
  After merge fixes
sql/sql_show.cc:
  After merge fixes
sql/sql_udf.cc:
  After merge fixes
sql/table.cc:
  Changed field length to 2 byte in .frm files
sql/unireg.cc:
  Changed field length to 2 byte in .frm files

1 files changed, 4 insertions, 3 deletions

diff --git a/myisam/ft_dump.c b/myisam/ft_dump.c
index 3ecb0652eea..fc3252273e9 100644
--- a/myisam/ft_dump.c
+++ b/myisam/ft_dump.c
@@ -58,7 +58,7 @@ int main(int argc,char *argv[])
 {
   int error=0, subkeys;
   uint keylen, keylen2=0, inx, doc_cnt=0;
-  float weight;
+  float weight= 1.0;
   double gws, min_gws=0, avg_gws=0;
   MI_INFO *info;
   char buf[MAX_LEN], buf2[MAX_LEN], buf_maxlen[MAX_LEN], buf_min_gws[MAX_LEN];
@@ -166,12 +166,13 @@ int main(int argc,char *argv[])
         }
       }
       if (dump)
+      {
         if (subkeys>=0)
           printf("%9qx %20.7f %s\n",info->lastpos,weight,buf);
         else
           printf("%9qx => %17d %s\n",info->lastpos,-subkeys,buf);
-
-      if(verbose && (total%HOW_OFTEN_TO_WRITE)==0)
+      }
+      if (verbose && (total%HOW_OFTEN_TO_WRITE)==0)
         printf("%10ld\r",total);
     }