From: Sinisa
Date: August 30 2002 7:17pm
Subject: bk commit into 4.0 tree
List-Archive: http://lists.mysql.com/internals/4586
Message-Id: <200208301917.g7UJHRDH021865@sinisa.nasamreza.org>

Below is the list of changes that have just been committed into a local
4.0 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2002-08-30 22:17:24+03:00, Sinisa@stripped
  A nasty fix when all rows are deleted with a write lock

  myisam/mi_delete_all.c
    1.8 02/08/30 22:17:22 Sinisa@stripped +2 -2
    A nasty fix when all rows are deleted with a write lock

  mysql-test/r/delete.result
    1.3 02/08/30 22:17:22 Sinisa@stripped +13 -0
    A nasty fix when all rows are deleted with a write lock

  mysql-test/t/delete.test
    1.4 02/08/30 22:17:22 Sinisa@stripped +8 -0
    A nasty fix when all rows are deleted with a write lock

  sql/mysqld.cc
    1.348 02/08/30 22:17:22 Sinisa@stripped +4 -4
    Some spelling checking error corrections a la Paul Dubois

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.0

--- 1.7/myisam/mi_delete_all.c	Thu Aug  8 03:11:05 2002
+++ 1.8/myisam/mi_delete_all.c	Fri Aug 30 22:17:22 2002
@@ -35,11 +35,11 @@
   if (_mi_mark_file_changed(info))
     goto err;
 
-  info->state->records=info->state->del=state->split=0;
+  state->state.records=info->state->records=info->state->del=state->split=0;
   state->dellink = HA_OFFSET_ERROR;
   state->sortkey=  (ushort) ~0;
   info->state->key_file_length=share->base.keystart;
-  info->state->data_file_length=0;
+  state->state.data_file_length=info->state->data_file_length=0;
   info->state->empty=info->state->key_empty=0;
   state->checksum=0;
 

--- 1.347/sql/mysqld.cc	Fri Aug 30 17:12:50 2002
+++ 1.348/sql/mysqld.cc	Fri Aug 30 22:17:22 2002
@@ -3004,10 +3004,10 @@
   {"delay-key-write", OPT_DELAY_KEY_WRITE, "Type of DELAY_KEY_WRITE",
    0,0,0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"delay-key-write-for-all-tables", OPT_DELAY_KEY_WRITE_ALL,
-   "Don't flush key buffers between writes for any MyISAM table (Depricated option, use --delay-key-write=all instead)",
+   "Don't flush key buffers between writes for any MyISAM table (Deprecated option, use --delay-key-write=all instead)",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"enable-locking", OPT_ENABLE_LOCK,
-   "Depricated option, use --external-locking instead",
+   "Deprecated option, use --external-locking instead",
    (gptr*) &opt_external_locking, (gptr*) &opt_external_locking,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef __NT__
@@ -3244,7 +3244,7 @@
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifndef TO_BE_DELETED
   {"safe-show-database", OPT_SAFE_SHOW_DB,
-   "Depricated option; One should use GRANT SHOW DATABASES instead...",
+   "Deprecated option; One should use GRANT SHOW DATABASES instead...",
    (gptr*) &opt_safe_show_db, (gptr*) &opt_safe_show_db, 0, GET_BOOL, NO_ARG,
    0, 0, 0, 0, 0, 0},
 #endif
@@ -3274,7 +3274,7 @@
   {"skip-innodb", OPT_INNODB_SKIP, "Don't use Innodb (will save memory)",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"skip-locking", OPT_SKIP_LOCK,
-   "Depricated option, use --skip-external-locking instead",
+   "Deprecated option, use --skip-external-locking instead",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"skip-external-locking", OPT_SKIP_LOCK, "Do not use system (external) locking",
    (gptr*) &opt_external_locking, (gptr*) &opt_external_locking,

--- 1.3/mysql-test/t/delete.test	Thu Oct 11 03:59:42 2001
+++ 1.4/mysql-test/t/delete.test	Fri Aug 30 22:17:22 2002
@@ -35,3 +35,11 @@
 insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23),(27);
 delete from t1 where a=27;
 drop table t1;
+CREATE TABLE t1 (a INT);
+INSERT INTO  t1 VALUES (1), (2), (3);
+LOCK TABLES t1 WRITE;
+DELETE FROM t1;
+OPTIMIZE TABLE t1;
+SELECT * FROM t1;
+CHECK TABLE t1;
+drop table if exists t1;

--- 1.2/mysql-test/r/delete.result	Thu Oct 11 03:59:43 2001
+++ 1.3/mysql-test/r/delete.result	Fri Aug 30 22:17:22 2002
@@ -24,3 +24,16 @@
 insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23),(27);
 delete from t1 where a=27;
 drop table t1;
+CREATE TABLE t1 (a INT);
+INSERT INTO  t1 VALUES (1), (2), (3);
+LOCK TABLES t1 WRITE;
+DELETE FROM t1;
+OPTIMIZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	status	OK
+SELECT * FROM t1;
+a
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+drop table if exists t1;