Bug #4810 "deadlock with KILL when the victim was in a wait state"
(I included mutex unlock into exit_cond() for future safety)
and BUG#4827 "KILL while START SLAVE may lead to replication slave crash"


sql/lock.cc:
  we did exit_cond() before unlock(LOCK_open), which led to deadlocks with THD::awake(). Fixing this.
sql/log.cc:
  mutex unlock is now included in exit_cond()
sql/repl_failsafe.cc:
  we did exit_cond() before unlock(LOCK_rpl_status), which led to deadlocks with THD::awake(). Fixing this.
sql/slave.cc:
  we did exit_cond() before unlock(cond_lock), which led to deadlocks with THD::awake(). Fixing this.
  Fixing also that if killed while waiting for slave thread to start, we don't release the mutex
  (that caused a double release of the mutex => crash).
sql/sql_class.h:
  comments about exit_cond()/enter_cond().
  Mutex unlock is now included in exit_cond() so that it's always done in the good order.
sql/sql_table.cc:
  unlock is now included in exit_cond().

into mysql.com:/home/mysql_src/mysql-4.0

sql/sql_class.h:
  removing the assertion as I don't want to include assert.h (inclusion of assert.h has already been
  reworked in 4.1, so I'll move the assertion to 4.1). Assertion makes compilation fail if non-debug.

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

install-sh:
  copy not move like any reasonably modern install does

into hundin.mysql.fi:/home/marko/k/mysql-4.0

  Add still more diagnostic code to track buffer pool corruption in one AMD64/Linux computer


innobase/include/page0page.ic:
  Add still more diagnostic code to track buffer pool corruption in one AMD64/Linux computer
innobase/row/row0sel.c:
  Add still more diagnostic code to track buffer pool corruption in one AMD64/Linux computer

  Restore accidentally deleted comment to dict_create_sys_tables_tuple()


innobase/dict/dict0crea.c:
  Restore accidentally deleted comment to dict_create_sys_tables_tuple()

into mysql.com:/space/my/mysql-4.0

   "-classic" in the version string

  removing safe_mutex_assert_owner, as it would require an include,
  and Konstantin already has cleaned up things with assert.h in 4.1;
  so I'll put the safe_mutex_assert_owner in 4.1 instead.


sql/sql_class.h:
  removing safe_mutex_assert_owner, as it would require an include,
  and Konstantin already has cleaned up things with assert.h in 4.1;
  so I'll put the safe_mutex_assert_owner in 4.1 instead.

into mysql.com:/home/mysql_src/mysql-4.0

when we come at this place).


sql/slave.cc:
  stupid me; this line is a mistake

Avoiding a theoretically possible crash (pthread_mutex_lock(0)) which could (at least in POSIX Threads books)
happen on SMP machines, when a thread is going to wait on a condition and it is KILLed at the
same time.
Cleaning code a bit by adding a test in enter_cond() that we have the mutex (was already the case in all places
where it's called except one which is fixed here).


sql/log.cc:
  safe_mutex_assert_owner() is now in THD::enter_cond()
sql/slave.cc:
  lock mutex before waiting on condition.
sql/sql_class.cc:
  THD::awake(): before locking the mutex, let's test it's not zero;
  in theory indeed, the killer thread may see current_cond non-zero and current_mutex zero
  (order of assignments is not guaranteed by POSIX).
  A comment noting that there is still a small chance a KILL does not work and needs
  being re-issued.
sql/sql_class.h:
  Assert in enter_cond() that we have the mutex.
  It is already the case in all places where we call enter_cond(), so better ensure it there.

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

when compiled with metroworks compiler for Netware.

into mysql.com:/home/mydev/mysql-4.0

  Add more diagnostic code to determine when an lsn field gets corrupt; tracks a crash reported from one Itanium computer


innobase/os/os0file.c:
  Add more diagnostic code to determine when an lsn field gets corrupt; tracks a crash reported from one Itanium computer
innobase/buf/buf0flu.c:
  Add more diagnostic code to determine when an lsn field gets corrupt; tracks a crash reported from one Itanium computer

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

  Add diagnostic code to print hex dumps and track corruption of next record offsets in an index page


innobase/include/page0page.ic:
  Add diagnostic code to print hex dumps and track corruption of next record offsets in an index page
innobase/row/row0sel.c:
  Add diagnostic code to print hex dumps and track corruption of next record offsets in an index page

into serg.mylan:/usr/home/serg/Abk/mysql-4.0


configure.in:
  Auto merged

BUG#4681


BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
  Delete: mytest-old.c

   and HP-UX (.sl) for creating "mysql-shared" packages there


scripts/make_sharedlib_distribution.sh:
   - match shared library file name suffixes on Mac OS X (.dylib)
     and HP-UX (.sl)

   configure.in (thanks to Al Begley from Apple for the hint)


configure.in:
   - Use the same compile options for the upcoming darwin8 OS
     (thanks to Al Begley from Apple for the hint)

	rm -f lex_hash.h
BUG#4583

into mysql.com:/space/my/mysql-4.0

There is some 'ulong'<->'uint' mess in libmysqld.c


libmysqld/libmysqld.c:
  Several local variables made 'ulong' from 'uint'

   man page that can be used as a default man page for programs that
   do not have their own man page)

   exception (it only applies to 4.0 and above)

The problem was that (for any storage engine), the created temporary table was not removed if CREATE SELECT failed (because
of a constraint violation for example). This was not consistent with the manual and with CREATE SELECT (no TEMPORARY).


sql/sql_insert.cc:
  Fix for BUG#4551 "Temporary InnoDB tables not replicated properly with CREATE TABLE .. SELECT"
  The problem was that (for any storage engine), the created temporary table was not removed if CREATE SELECT failed (because
  of a constraint violation for example). This was not consistent with the manual and with CREATE SELECT (no TEMPORARY).
  And it led to the above bug, because the binlogging of CREATE SELECT is done by select_insert::send_eof() (same function
  as INSERT SELECT) and so, if the table is transactional and there is a failure, the statement is considered as rolled
  back and so nothing is written in the binlog. So temp table MUST be deleted.

into mysql.com:/home/mysql_src/mysql-4.0

BUG#4506 "mysqlbinlog --position --read-from-remote-server has wrong "# at" lines",
BUG#4553 "Multi-table DROP TABLE replicates improperly for nonexistent table" with a test file.
It was not possible to add a test for BUG#4506 as in the test suite we must use --short-form
which does not display the "# at" lines.


client/mysqlbinlog.cc:
  Fix for BUG#4506 "mysqlbinlog --position --read-from-remote-server has wrong "# at" lines"
  when reading a remote binlog, the start position is not always BIN_LOG_HEADER_SIZE (4).
sql/sql_table.cc:
  Fix for BUG#4553 "Multi-table DROP TABLE replicates improperly for nonexistent table"
  we must my_error() _before_ we write to the binlog, so that a meaningful error code is available
  in thd->net.last_errno for storage of the DROP TABLE statement into the binlog.

(Bug #4446)


innobase/row/row0ins.c:
  row_ins_foreign_check_on_constraint(): limit recursion for UPDATE too
mysql-test/r/innodb.result:
  Add test for recursion depth limit
mysql-test/t/innodb.test:
  Add test for recursion depth limit

  Do not add + 1 to the InnoDB index cardinality estimate if the B-tree just contains one page; the fix made in March 2004 caused InnoDB systematically to overestimate the cardinality of empty or small tables by 1


innobase/btr/btr0cur.c:
  Do not add + 1 to the InnoDB index cardinality estimate if the B-tree just contains one page; the fix made in March 2004 caused InnoDB systematically to overestimate the cardinality of empty or small tables by 1