bk commit into 5.0 tree (jani:1.2033)

[jani]

Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2033 05/09/30 13:56:32 jani@stripped +5 -0
  Merge jamppa@stripped:/home/bk/mysql-5.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc

  sql/sql_parse.cc
    1.498 05/09/30 13:56:25 jani@stripped +0 -0
    Auto merged

  myisam/myisampack.c
    1.49 05/09/30 13:56:24 jani@stripped +0 -0
    Auto merged

  myisam/myisamdef.h
    1.81 05/09/30 13:56:24 jani@stripped +0 -0
    Auto merged

  myisam/myisamchk.c
    1.120 05/09/30 13:56:24 jani@stripped +0 -0
    Auto merged

  myisam/mi_open.c
    1.95 05/09/30 13:56:24 jani@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.0-icc/RESYNC

--- 1.94/myisam/mi_open.c	2005-09-23 16:47:00 +03:00
+++ 1.95/myisam/mi_open.c	2005-09-30 13:56:24 +03:00
@@ -823,7 +823,7 @@
   mi_sizestore(ptr,state->state.empty);		ptr +=8;
   mi_sizestore(ptr,state->state.key_empty);	ptr +=8;
   mi_int8store(ptr,state->auto_increment);	ptr +=8;
-  mi_int8store(ptr,(ulonglong) state->checksum);ptr +=8;
+  mi_int8store(ptr,(ulonglong) state->state.checksum);ptr +=8;
   mi_int4store(ptr,state->process);		ptr +=4;
   mi_int4store(ptr,state->unique);		ptr +=4;
   mi_int4store(ptr,state->status);		ptr +=4;
@@ -885,7 +885,7 @@
   state->state.empty	= mi_sizekorr(ptr);	ptr +=8;
   state->state.key_empty= mi_sizekorr(ptr);	ptr +=8;
   state->auto_increment=mi_uint8korr(ptr);	ptr +=8;
-  state->checksum=(ha_checksum) mi_uint8korr(ptr);	ptr +=8;
+  state->state.checksum=(ha_checksum) mi_uint8korr(ptr);	ptr +=8;
   state->process= mi_uint4korr(ptr);		ptr +=4;
   state->unique = mi_uint4korr(ptr);		ptr +=4;
   state->status = mi_uint4korr(ptr);		ptr +=4;

--- 1.119/myisam/myisamchk.c	2005-09-27 21:10:55 +03:00
+++ 1.120/myisam/myisamchk.c	2005-09-30 13:56:24 +03:00
@@ -705,7 +705,7 @@
       fprintf(stderr, "Invalid value of stats_method: %s.\n", argument);
       exit(1);
     }
-    check_param.stats_method= method-1;
+    check_param.stats_method= (enum_mi_stats_method) (method-1);
     break;
   }
 #ifdef DEBUG					/* Only useful if debugging */

--- 1.80/myisam/myisamdef.h	2005-09-30 12:36:13 +03:00
+++ 1.81/myisam/myisamdef.h	2005-09-30 13:56:24 +03:00
@@ -38,6 +38,7 @@
   my_off_t key_empty;			/* lost space in indexfile */
   my_off_t key_file_length;
   my_off_t data_file_length;
+  ha_checksum checksum;
 } MI_STATUS_INFO;
 
 typedef struct st_mi_state_info
@@ -75,7 +76,6 @@
   ulong sec_index_changed;		/* Updated when new sec_index */
   ulong sec_index_used;			/* which extra index are in use */
   ulonglong key_map;			/* Which keys are in use */
-  ha_checksum checksum;
   ulong version;			/* timestamp of create */
   time_t create_time;			/* Time when created database */
   time_t recover_time;			/* Time for last recover */

--- 1.48/myisam/myisampack.c	2005-09-23 16:47:00 +03:00
+++ 1.49/myisam/myisampack.c	2005-09-30 13:56:24 +03:00
@@ -2967,7 +2967,7 @@
     share->state.key_root[key]= HA_OFFSET_ERROR;
   for (key=0 ; key < share->state.header.max_block_size ; key++)
     share->state.key_del[key]= HA_OFFSET_ERROR;
-  share->state.checksum=crc;		/* Save crc here */
+  isam_file->state->checksum=crc;       /* Save crc here */
   share->changed=1;			/* Force write of header */
   share->state.open_count=0;
   share->global_changed=0;
@@ -3003,7 +3003,7 @@
   state.dellink= HA_OFFSET_ERROR;
   state.version=(ulong) time((time_t*) 0);
   mi_clear_all_keys_active(state.key_map);
-  state.checksum=crc;
+  state.state.checksum=crc;
   if (isam_file->s->base.keys)
     isamchk_neaded=1;
   state.changed=STATE_CHANGED | STATE_NOT_ANALYZED; /* Force check of table */

--- 1.497/sql/sql_parse.cc	2005-09-30 12:08:17 +03:00
+++ 1.498/sql/sql_parse.cc	2005-09-30 13:56:25 +03:00
@@ -5644,8 +5644,7 @@
        and so on, the display width is ignored.
     */
     char buf[32];
-    my_snprintf(buf, sizeof(buf),
-                "TIMESTAMP(%s)", length, system_charset_info);
+    my_snprintf(buf, sizeof(buf), "TIMESTAMP(%s)", length);
     push_warning_printf(thd,MYSQL_ERROR::WARN_LEVEL_WARN,
                         ER_WARN_DEPRECATED_SYNTAX,
                         ER(ER_WARN_DEPRECATED_SYNTAX),