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, 9 insertions, 9 deletions

diff --git a/sql/unireg.cc b/sql/unireg.cc
index a171ba42ff3..1cd38d4d161 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -28,7 +28,7 @@
 #include "mysql_priv.h"
 #include <m_ctype.h>
 
-#define FCOMP			15		/* Bytes for a packed field */
+#define FCOMP			17		/* Bytes for a packed field */
 
 static uchar * pack_screens(List<create_field> &create_fields,
 			    uint *info_length, uint *screens, bool small_file);
@@ -451,15 +451,15 @@ static bool pack_fields(File file,List<create_field> &create_fields)
     buff[0]= (uchar) field->row;
     buff[1]= (uchar) field->col;
     buff[2]= (uchar) field->sc_length;
-    buff[3]= (uchar) field->length;
+    int2store(buff+3, field->length);
     uint recpos=(uint) field->offset+1;
-    int2store(buff+4,recpos);
-    int2store(buff+6,field->pack_flag);
-    int2store(buff+8,field->unireg_check);
-    buff[10]= (uchar) field->interval_id;
-    buff[11]= (uchar) field->sql_type; 
-    buff[12]= (uchar) field->charset->number;
-    int2store(buff+13, field->comment.length);
+    int3store(buff+5,recpos);
+    int2store(buff+8,field->pack_flag);
+    int2store(buff+10,field->unireg_check);
+    buff[12]= (uchar) field->interval_id;
+    buff[13]= (uchar) field->sql_type; 
+    buff[14]= (uchar) field->charset->number;
+    int2store(buff+15, field->comment.length);
     comment_length+= field->comment.length;
     set_if_bigger(int_count,field->interval_id);
     if (my_write(file,(byte*) buff,FCOMP,MYF_RW))