Added macros for nice TIMESPEC usage.

Fixes for building MySQL with gcc 3.0
Added SIGNED / UNSIGNED casts
Fixed core dump bug in net_clear() with libmysqld.
Back to using semaphores in query cache.
Added 'Null' and 'Index_type' to SHOW INDEX.


BUILD/FINISH.sh:
  Fixes for gcc 3.0
BUILD/SETUP.sh:
  Fixes for gcc 3.0
Docs/manual.texi:
  Changelog + SIGNED/UNSIGNED casts.
Makefile.am:
  include BUILD scripts in source distribution.
client/Makefile.am:
  Fixes for gcc 3.0
client/mysql.cc:
  Cleanup
client/mysqldump.c:
  Changed 'K' to mean 'disable-keys' instead of 'no-disabled-keys'
client/readline.cc:
  Cleanup
configure.in:
  Include BUILD in source distrbution
extra/my_print_defaults.c:
  Cleanup
include/my_global.h:
  Fix for HPUX and setrlimit.
  Portability fix.
  Added macros for nice TIMESPEC usage.
innobase/include/dyn0dyn.h:
  Fix for AIX
libmysql/Makefile.shared:
  Added strxmov to libmysqld
libmysqld/examples/Makefile.am:
  Fixes for gcc 3.0
libmysqld/lib_vio.c:
  Cleanup
myisam/ft_dump.c:
  Portability fixes
myisam/ftdefs.h:
  Portability fixes
mysql-test/r/bdb.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/bigint.result:
  New test for SIGNED/UNSIGNED
mysql-test/r/fulltext.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/heap.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/innodb.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/isam.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/key.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/myisam.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/query_cache.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/select.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/show_check.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/type_ranges.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/t/bigint.test:
  New test for SIGNED/UNSIGNED
mysql-test/t/key.test:
  New test for SIGNED/UNSIGNED
mysql-test/t/query_cache.test:
  Test for FOUND_ROWS()
sql-bench/crash-me.sh:
  Safety fixes
sql/derror.cc:
  Cleanup
sql/ha_berkeley.h:
  New test for SIGNED/UNSIGNED
sql/ha_heap.h:
  New test for SIGNED/UNSIGNED
sql/ha_innobase.cc:
  New test for SIGNED/UNSIGNED
sql/ha_innobase.h:
  New test for SIGNED/UNSIGNED
sql/ha_isam.h:
  New test for SIGNED/UNSIGNED
sql/ha_myisam.cc:
  New test for SIGNED/UNSIGNED
sql/ha_myisam.h:
  New test for SIGNED/UNSIGNED
sql/handler.h:
  New test for SIGNED/UNSIGNED
sql/item_func.cc:
  Cleanup TIMESPEC usage
sql/item_func.h:
  Added SIGNED / UNSIGNED casts
sql/lex.h:
  Added SIGNED / UNSIGNED casts
sql/mysqld.cc:
  Cleanup TIMESPEC usage
sql/net_pkg.cc:
  Cleanup
sql/net_serv.cc:
  Fixed core dump bug in net_clear()
sql/slave.cc:
  Cleanup
sql/sql_cache.cc:
  Back to using semaphores
sql/sql_cache.h:
  Back to using semaphores
sql/sql_insert.cc:
  Cleanup TIMESPEC usage
sql/sql_manager.cc:
  Cleanup TIMESPEC usage
sql/sql_parse.cc:
  Cleanup
sql/sql_repl.cc:
  Cleanup TIMESPEC usage
sql/sql_show.cc:
  Added 'Null' and 'Index_type' to SHOW INDEX.
sql/sql_table.cc:
  Sort keys in table in a more logical order.
sql/sql_yacc.yy:
  Support for SIGNED/UNSIGNED casts.

1 files changed, 18 insertions, 16 deletions

diff --git a/sql/derror.cc b/sql/derror.cc
index d0519c37dca..7ebe6e4b3c5 100644
--- a/sql/derror.cc
+++ b/sql/derror.cc
@@ -44,7 +44,7 @@ static void read_texts(const char *file_name,const char ***point,
 		       uint error_messages)
 {
   register uint i;
-  uint ant,funktpos,length,textant;
+  uint count,funktpos,length,textcount;
   File file;
   char name[FN_REFLEN];
   const char *buff;
@@ -64,36 +64,38 @@ static void read_texts(const char *file_name,const char ***point,
   if (head[0] != (uchar) 254 || head[1] != (uchar) 254 ||
       head[2] != 2 || head[3] != 1)
     goto err; /* purecov: inspected */
-  textant=head[4];
-  length=uint2korr(head+6); ant=uint2korr(head+8);
+  textcount=head[4];
+  length=uint2korr(head+6); count=uint2korr(head+8);
 
-  if (ant < error_messages)
+  if (count < error_messages)
   {
-    fprintf(stderr,"\n%s: Fatal error: Error message file '%s' had only %d error messages, but it should have at least %d error messages.\n\
-Check that the above file is the right version for this program!\n\n",
-	    my_progname,name,ant,error_messages);
+    sql_print_error("\
+Error message file '%s' had only %d error messages,\n\
+but it should contain at least %d error messages.\n\
+Check that the above file is the right version for this program!",
+		    name,count,error_messages);
     VOID(my_close(file,MYF(MY_WME)));
     unireg_abort(1);
   }
 
   x_free((gptr) *point);		/* Free old language */
   if (!(*point= (const char**)
-	my_malloc((uint) (length+ant*sizeof(char*)),MYF(0))))
+	my_malloc((uint) (length+count*sizeof(char*)),MYF(0))))
   {
     funktpos=2;					/* purecov: inspected */
     goto err;					/* purecov: inspected */
   }
-  buff= (char*) (*point + ant);
+  buff= (char*) (*point + count);
 
-  if (my_read(file,(byte*) buff,(uint) ant*2,MYF(MY_NABP))) goto err;
-  for (i=0, pos= (uchar*) buff ; i< ant ; i++)
+  if (my_read(file,(byte*) buff,(uint) count*2,MYF(MY_NABP))) goto err;
+  for (i=0, pos= (uchar*) buff ; i< count ; i++)
   {
     (*point)[i]=buff+uint2korr(pos);
     pos+=2;
   }
   if (my_read(file,(byte*) buff,(uint) length,MYF(MY_NABP))) goto err;
 
-  for (i=1 ; i < textant ; i++)
+  for (i=1 ; i < textcount ; i++)
   {
     point[i]= *point +uint2korr(head+10+i+i);
   }
@@ -103,18 +105,18 @@ Check that the above file is the right version for this program!\n\n",
 err:
   switch (funktpos) {
   case 2:
-    buff="\n%s: Fatal error: Not enough memory for messagefile '%s'\n\n";
+    buff="Not enough memory for messagefile '%s'";
     break;
   case 1:
-    buff="\n%s: Fatal error: Can't read from messagefile '%s'\n\n";
+    buff="Can't read from messagefile '%s'";
     break;
   default:
-    buff="\n%s: Fatal error: Can't find messagefile '%s'\n\n";
+    buff="Can't find messagefile '%s'";
     break;
   }
   if (file != FERR)
     VOID(my_close(file,MYF(MY_WME)));
-  fprintf(stderr,buff,my_progname,name);
+  sql_print_error(buff,name);
   unireg_abort(1);
 } /* read_texts */