Changed --replace to --replace_result in mysqltest

Changed errmsg -> my_errmsg (portability issue)
Fixed that mysqlbinlog writes SET TIMESTAMP before all queries
Fixed comments in default my.cnf files


Docs/manual.texi:
  Updated information about character sets
client/mysqladmin.c:
  Added missing help text
client/mysqltest.c:
  Changed --replace to --replace_result to not conflict with SQL replace command
include/my_sys.h:
  change errmsg -> my_errmsg (portability issue)
libmysql/errmsg.c:
  change errmsg -> my_errmsg (portability issue)
myisam/mi_cache.c:
  Changed seek+read to pread
myisam/mi_check.c:
  Fix bug that caused myisamchk to be very slow under some specific error conditions
myisam/mi_dynrec.c:
  cleanup
myisam/myisamchk.c:
  Write out value of checksum
myisam/myisamdef.h:
  cleanup
mysql-test/r/backup.result:
  Fixed the case where backup caused different error messages
mysql-test/r/bdb.result:
  Added new test case
mysql-test/r/fulltext.result:
  Fix for new CREATE TABLE format
mysql-test/t/backup.test:
  Use --replace_result and --send
mysql-test/t/bdb.test:
  New test case
mysql-test/t/status.test:
  Use --send
mysys/errors.c:
  change errmsg -> my_errmsg (portability issue)
mysys/my_error.c:
  change errmsg -> my_errmsg (portability issue)
mysys/typelib.c:
  Only accept full type names
sql/derror.cc:
  change errmsg -> my_errmsg (portability issue)
sql/ha_berkeley.cc:
  Fixed bug when using key parts that could be NULL
sql/log_event.cc:
  Log SET TIMESTAMP before all queries
sql/mysqlbinlog.cc:
  Incremented version number
sql/mysqld.cc:
  change errmsg -> my_errmsg (portability issue)
  Always accept --skip-gemeni, --skip-bdb and --skip-innobase
sql/slave.cc:
  cleanup
sql/sql_base.cc:
  cleanup
sql/sql_db.cc:
  cleanup
support-files/my-huge.cnf.sh:
  Remove usage of # at end of line
support-files/my-large.cnf.sh:
  Remove usage of # at end of line
support-files/my-medium.cnf.sh:
  Remove usage of # at end of line
support-files/my-small.cnf.sh:
  Remove usage of # at end of line

8 files changed, 31 insertions, 25 deletions

diff --git a/sql/derror.cc b/sql/derror.cc
index 3b29d2c511b..7a5bcd360a2 100644
--- a/sql/derror.cc
+++ b/sql/derror.cc
@@ -30,8 +30,8 @@ void init_errmessage(void)
 {
   DBUG_ENTER("init_errmessage");
 
-  read_texts(ERRMSG_FILE,&errmsg[ERRMAPP],ER_ERROR_MESSAGES);
-  errmesg=errmsg[ERRMAPP];		/* Init global variabel */
+  read_texts(ERRMSG_FILE,&my_errmsg[ERRMAPP],ER_ERROR_MESSAGES);
+  errmesg=my_errmsg[ERRMAPP];		/* Init global variabel */
   init_myfunc_errs();			/* Init myfunc messages */
   DBUG_VOID_RETURN;
 }
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index 9f31064cc54..9a6df95193a 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -779,6 +779,7 @@ DBT *ha_berkeley::pack_key(DBT *key, uint keynr, char *buff,
 
   for (; key_part != end && (int) key_length > 0 ; key_part++)
   {
+    uint offset=0;
     if (key_part->null_bit)
     {
       if (!(*buff++ = (*key_ptr == 0)))		// Store 0 if NULL
@@ -788,9 +789,9 @@ DBT *ha_berkeley::pack_key(DBT *key, uint keynr, char *buff,
 	key->flags|=DB_DBT_DUPOK;
 	continue;
       }
-      key_ptr++;
+      offset=1;					// Data is at key_ptr+1
     }
-    buff=key_part->field->pack_key_from_key_image(buff,key_ptr,
+    buff=key_part->field->pack_key_from_key_image(buff,key_ptr+offset,
 						  key_part->length);
     key_ptr+=key_part->store_length;
     key_length-=key_part->store_length;
diff --git a/sql/log_event.cc b/sql/log_event.cc
index dfe8d71f146..38f353d4ec7 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -442,6 +442,7 @@ Query_log_event::Query_log_event(const char* buf, int event_len):
 
 void Query_log_event::print(FILE* file, bool short_form)
 {
+  char buff[40],*end;				// Enough for SET TIMESTAMP
   if (!short_form)
   {
     print_header(file);
@@ -449,8 +450,12 @@ void Query_log_event::print(FILE* file, bool short_form)
 	    (ulong) thread_id, (ulong) exec_time, error_code);
   }
 
-  if(db && db[0])
+  if (db && db[0])
     fprintf(file, "use %s;\n", db);
+  end=int10_to_str((long) when, strmov(buff,"SET TIMESTAMP="),10);
+  *end++=';';
+  *end++='\n';
+  my_fwrite(file, (byte*) buff, (uint) (end-buff),MYF(MY_NABP | MY_WME));
   my_fwrite(file, (byte*) query, q_len, MYF(MY_NABP | MY_WME));
   fprintf(file, ";\n");
 }
diff --git a/sql/mysqlbinlog.cc b/sql/mysqlbinlog.cc
index 563250d9e30..49daa04ffff 100644
--- a/sql/mysqlbinlog.cc
+++ b/sql/mysqlbinlog.cc
@@ -106,7 +106,7 @@ static void die(const char* fmt, ...)
 
 static void print_version()
 {
-  printf("%s  Ver 1.1 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE);
+  printf("%s  Ver 1.2 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE);
 }
 
 
@@ -377,7 +377,7 @@ static void dump_local_log_entries(const char* logname)
       die("Bad magic number;  The file is probably not a MySQL binary log");
   }
  
-  while(1)
+  for (;;)
   {
     char llbuff[21];
     my_off_t old_off = my_b_tell(file);
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 3c56120e542..1ca7d5ff2ef 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -642,7 +642,7 @@ void clean_up(void)
 #ifdef USE_RAID
   end_raid();
 #endif
-  x_free((gptr) errmsg[ERRMAPP]);	/* Free messages */
+  x_free((gptr) my_errmsg[ERRMAPP]);	/* Free messages */
   free_defaults(defaults_argv);
   my_free(mysql_tmpdir,MYF(0));
   x_free(opt_bin_logname);
@@ -1677,7 +1677,7 @@ int main(int argc, char **argv)
     case 1:
       sql_print_error("\
 Warning: one should set server-id to a non-0 value if log-bin is enabled.\n\
-Will log updates to binary log, but will not accept connections from slaves.");
+mysqld log updates to binary log, but will not accept connections from slaves.");
       break;
 #endif
     case 2:
@@ -2409,7 +2409,7 @@ enum options {
 	       OPT_INNOBASE_LOG_GROUP_HOME_DIR,
 	       OPT_INNOBASE_LOG_ARCH_DIR, OPT_INNOBASE_LOG_ARCHIVE,
 	       OPT_INNOBASE_FLUSH_LOG_AT_TRX_COMMIT, OPT_SAFE_SHOW_DB,
-	       OPT_GEMINI_SKIP,
+	       OPT_GEMINI_SKIP, OPT_INNOBASE_SKIP,
                OPT_TEMP_POOL
 };
 
@@ -2516,15 +2516,9 @@ static struct option long_options[] = {
   {"socket",                required_argument, 0, (int) OPT_SOCKET},
   {"server-id",		    required_argument, 0, (int) OPT_SERVER_ID},
   {"set-variable",          required_argument, 0, 'O'},
-#ifdef HAVE_BERKELEY_DB
   {"skip-bdb",              no_argument,       0, (int) OPT_BDB_SKIP},
-#endif
-#ifdef HAVE_INNOBASE_DB
   {"skip-innobase",         no_argument,       0, (int) OPT_INNOBASE_SKIP},
-#endif
-#ifdef HAVE_GEMINI_DB
   {"skip-gemini",           no_argument,       0, (int) OPT_GEMINI_SKIP},
-#endif
   {"skip-concurrent-insert", no_argument,      0, (int) OPT_SKIP_CONCURRENT_INSERT},
   {"skip-delay-key-write",  no_argument,       0, (int) OPT_SKIP_DELAY_KEY_WRITE},
   {"skip-grant-tables",     no_argument,       0, (int) OPT_SKIP_GRANT},
@@ -3459,22 +3453,26 @@ static void get_options(int argc,char **argv)
       berkeley_init_flags&= ~(DB_PRIVATE);
       berkeley_shared_data=1;
       break;
+#endif /* HAVE_BERKELEY_DB */
     case OPT_BDB_SKIP:
+#ifdef HAVE_BERKELEY_DB
       berkeley_skip=1;
       have_berkeley_db=SHOW_OPTION_DISABLED;
-      break;
 #endif
-#ifdef HAVE_GEMINI_DB
+      break;
     case OPT_GEMINI_SKIP:
+#ifdef HAVE_GEMINI_DB
       gemini_skip=1;
       have_gemini_db=SHOW_OPTION_DISABLED;  
-      break;
 #endif
-#ifdef HAVE_INNOBASE_DB
+      break;
     case OPT_INNOBASE_SKIP:
+#ifdef HAVE_INNOBASE_DB
       innobase_skip=1;
       have_innobase_db=SHOW_HAVE_DISABLED;
+#endif
       break;
+#ifdef HAVE_INNOBASE_DB
     case OPT_INNOBASE_DATA_HOME_DIR:
       innobase_data_home_dir=optarg;
       break;
@@ -3493,7 +3491,7 @@ static void get_options(int argc,char **argv)
     case OPT_INNOBASE_FLUSH_LOG_AT_TRX_COMMIT:
       innobase_flush_log_at_trx_commit= optarg ? test(atoi(optarg)) : 1;
       break;
-#endif
+#endif /* HAVE_INNOBASE_DB */
     case OPT_MYISAM_RECOVER:
     {
       if (!optarg || !optarg[0])
diff --git a/sql/slave.cc b/sql/slave.cc
index 5a110b6921b..e704f471781 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1250,8 +1250,10 @@ reconnecting to retry, log '%s' position %ld", RPL_LOG_NAME,
 	  thd->proc_info = "processing master log event"; 
 	  if(exec_event(thd, &mysql->net, &glob_mi, event_len))
 	    {
-	      sql_print_error("Error running query, slave aborted. Fix the problem, and re-start\
- the slave thread with mysqladmin start-slave - log '%s' position %ld",
+	      sql_print_error("\
+Error running query, slave aborted. Fix the problem, and re-start \
+the slave thread with \"mysqladmin start-slave\". We stopped at log \
+'%s' position %ld",
 			      RPL_LOG_NAME, glob_mi.pos);
 	      goto err;
 	      // there was an error running the query
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index d69bc905c31..97e6879a3a1 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1784,7 +1784,7 @@ static key_map get_key_map_from_key_list(THD *thd, TABLE *table,
   uint pos;
   while ((name=it++))
   {
-    if ((pos=find_type(name->c_ptr(), &table->keynames, 1)) <= 0)
+    if ((pos=find_type(name->c_ptr(), &table->keynames, 1+2)) <= 0)
     {
       my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(),
 	       table->real_name);
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 3786e771ecb..ed55c2b77ed 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -187,7 +187,7 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *org_path,
       }
       continue;
     }
-    if (find_type(fn_ext(file->name),&deletable_extentions,1) <= 0)
+    if (find_type(fn_ext(file->name),&deletable_extentions,1+2) <= 0)
     {
       found_other_files++;
       continue;