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

Changed the semantics of open_count so that it is decremented
at every unlock (if it was incremented due to data changes).
So it indicates a crash, if it is non-zero after a lock.
The table will then be repaired.


myisam/mi_close.c:
  bug#2831 - --extenral-locking does not fully work with --myisam-recover.
  To avoid flushing the open_count at every unlock,
  we need to do so at close at least.
myisam/mi_locking.c:
  bug#2831 - --extenral-locking does not fully work with --myisam-recover.
  open_count is now decremented at unlock (from a writelock) with
  mi_unlock_open_count(). After every new lock the state is read
  from the index file and the open_count checked. If not zero,
  another server must have crashed, so the table is marked as crashed.
  In certain situations the decremented open_count mut be flushed to
  the index file. I tried to keep these extra flushes as seldom as possible.
sql/ha_myisam.cc:
  bug#2831 - --extenral-locking does not fully work with --myisam-recover.
  Added code to repair the table, if it is marked crashed after
  successful locking and the --myisam-recover option is set.
sql/sql_table.cc:
  This does not really belong to the bugfix for #2831.
  But it was detected during fixing the external locking.

  We don't want the update to abort when IGNORE is specified


mysql-test/r/update.result:
  Bug#5553 - UPDATE IGNORE fails on dup key
    New test
mysql-test/t/update.test:
  Bug#5553 - UPDATE IGNORE fails on dup key
    New test
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Fix bug #5180: having a column prefix index in the primary key, and the same column fully in a secondary key could cause an assertion failure in row_build_row_ref()


innobase/pars/pars0opt.c:
  Fix bug #5180: having a column prefix index in the primary key, and the same column fully in a secondary key could cause an assertion failure in row_build_row_ref()
innobase/row/row0row.c:
  Fix bug #5180: having a column prefix index in the primary key, and the same column fully in a secondary key could cause an assertion failure in row_build_row_ref()
innobase/dict/dict0dict.c:
  Fix bug #5180: having a column prefix index in the primary key, and the same column fully in a secondary key could cause an assertion failure in row_build_row_ref()
innobase/include/dict0dict.h:
  Fix bug #5180: having a column prefix index in the primary key, and the same column fully in a secondary key could cause an assertion failure in row_build_row_ref()

scripts/mysqlhotcopy.sh:
  one more \' to remove for bugfix 5531!

scripts/mysqlhotcopy.sh:
  small fix to help options per bug 5531

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5498

into deer.(none):/home/hf/work/mysql-4.0.4809

  Correct the comment on the 'waiting' field in sync_cell_struct


innobase/sync/sync0arr.c:
  Correct the comment on the 'waiting' field in sync_cell_struct

  Improve the comment on stored_select_lock_type
ha_innodb.cc:
  Let InnoDB remember select_lock_type inside LOCK TABLES, also over plain consistent read SELECTs; fix Bug #5538 : assertion failure when using mysqldump with the -l option; in MERGING this patch to 4.1, there may be PROBLEMS; that is because previous patch was never merged to 4.1; Heikki Tuuri has to polish the code in 4.1 after this patch has been merged.


sql/ha_innodb.cc:
  Let InnoDB remember select_lock_type inside LOCK TABLES, also over plain consistent read SELECTs; fix Bug #5538 : assertion failure when using mysqldump with the -l option; in MERGING this patch to 4.1, there may be PROBLEMS; that is because previous patch was never merged to 4.1; Heikki Tuuri has to polish the code in 4.1 after this patch has been merged.
innobase/include/row0mysql.h:
  Improve the comment on stored_select_lock_type

client/mysql.cc:
  Code added to handle backticks

  Add more precise diagnostics about the state of the I/O threads of InnoDB; print in SHOW INNODB STATUS if the event wait semaphore of each I/O thread is set


innobase/os/os0file.c:
  Add more precise diagnostics about the state of the I/O threads of InnoDB; print in SHOW INNODB STATUS if the event wait semaphore of each I/O thread is set

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

  Fixed typo


innobase/dict/dict0dict.c:
  Fixed typo

  Updated to 4.0.22


configure.in:
  Updated to 4.0.22
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/M40/mysql-4.0

from generating a non-working top level 'libtool'.


ltmain.sh:
  Some combinations of autotools and libtool leave 'max_cmd'len'
  (in top-level 'libtool') unset, this eventually causes a
  'ld' command without input files to be generated.
  Prevent this error by supplying a 4 kB default value.

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

   autom4te.cache directory and update the headers of the message files.


Build-tools/mysql-copyright-2:
   - make sure to fix the copyright in the recently added GPL
     headers of the message files, too
Build-tools/mysql-copyright:
   - remove the autom4te.cache directory (leftover from running
     autotools after modifying configure.in)

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

Note, there is no need to propagate this change into 4.1.


mysql-test/r/ctype_latin1_de.result:
  Bug #5447 Select does not find records
mysql-test/t/ctype_latin1_de.test:
  Bug #5447 Select does not find records
strings/ctype-latin1_de.c:
  Bug #5447 Select does not find records

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3120

into brian-akers-computer.local:/Users/brian/mysql/mysql-4.0

sql/repl_failsafe.cc:
  Removed reference to old maintainer.
sql/repl_failsafe.h:
  Added license header.
sql/slave.h:
  Added license header.
sql/sql_repl.cc:
  Removed old maintainer.
sql/sql_repl.h:
  Added license header
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

[This patch has already been approved by Serge.  I am recommitting and pushing from a new repository because there were other changesets that couldn't be pushed.]

BUG# 5229 --password=foobar does not override the empty 'password' option in the my.cnf
This is a backport of a change made by jani in the 4.1 tree.

mysql.cc:
  Add tty_password=0 in the p case handling in get_one_option


client/mysql.cc:
  Add tty_password=0 in the p case handling in get_one_option

innobase/btr/btr0btr.c:
  Update links to the user manual
innobase/buf/buf0buf.c:
  Update links to the user manual
innobase/dict/dict0dict.c:
  Update links to the user manual
innobase/fsp/fsp0fsp.c:
  Update links to the user manual
innobase/log/log0log.c:
  Update links to the user manual
innobase/log/log0recv.c:
  Update links to the user manual
innobase/os/os0file.c:
  Update links to the user manual
innobase/row/row0mysql.c:
  Update links to the user manual
innobase/ut/ut0dbg.c:
  Update links to the user manual

into rurik.mysql.com:/home/igor/dev/mysql-4.0-0

  Added newline at the end of file.


mysql-test/t/select.test:
  Added newline at the end of file.

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

This does not fix any known bug, but is still a good idea.


sql/log_event.cc:
  when we update thd->db in replication, it's safer to update thd->db_length too.
sql/slave.cc:
  when we update thd->db in replication, it's safer to update thd->db_length too.
sql/sql_db.cc:
  comment

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2205

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2205

mysql-test/r/rpl_set_charset.result:
  result update
mysql-test/t/rpl_set_charset.test:
  clean up on slave too.

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