BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged

Some after merge fixes


mysql-test/r/ctype_latin1_de.result:
  Changed test to have more relevant results
mysql-test/r/delete.result:
  Updated results after merge
mysql-test/r/select.result:
  Remove explicit database usage
mysql-test/r/type_datetime.result:
  Updated results after merge
mysql-test/t/ctype_latin1_de.test:
  Changed test to have more relevant results
mysql-test/t/select.test:
  Remove explicit database usage
sql/ha_myisam.cc:
  Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)

  Fix bug in previous push


innobase/os/os0file.c:
  Fix bug in previous push

  Print and error message also if a read from file results in the Linux error EEXIST; may happen if the disk is broken


innobase/os/os0file.c:
  Print and error message also if a read from file results in the Linux error EEXIST; may happen if the disk is broken

BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Delete: mysql-test/r/delete.result
client/mysqlbinlog.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/field.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/type_datetime.result:
  Update results after merge
sql/log_event.h:
  Use local version
sql/mysql_priv.h:
  Use local version
sql/mysqld.cc:
  Use local version
sql/sql_repl.h:
  Use local version

configure.in:
  Remove duplicated configure line
sql-bench/crash-me.sh:
  Fix for connect test

Now log_pos is the real position of the event. For events that are between BEGIN and COMMIT,
log_pos is still the BEGIN's log_pos.
This fixes bug #52 (If only transactions are run on the master then t

BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee:
  Delete: netware/netware.patch

into sinisa.nasamreza.org:/mnt/work/mysql


sql/mysql_priv.h:
  Auto merged

   redirected to the new location

   (Bug #121)

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

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

  Change mode to -rwxrwxr-x


netware/BUILD/compile-AUTOTOOLS:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-linux-tools:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-END:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-START:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-all:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-debug:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-standard:
  Change mode to -rwxrwxr-x
netware/BUILD/mwasmnlm:
  Change mode to -rwxrwxr-x
netware/BUILD/mwccnlm:
  Change mode to -rwxrwxr-x
netware/BUILD/mwenv:
  Change mode to -rwxrwxr-x
netware/BUILD/mwldnlm:
  Change mode to -rwxrwxr-x
netware/BUILD/nwbootstrap:
  Change mode to -rwxrwxr-x

   distribution to fix a test failure in test "func_encrypt"

  Add comment that Guilhem should check master_log_name, pending etc are right if the master log gets rotated


sql/ha_innodb.cc:
  Add comment that Guilhem should check master_log_name, pending etc are right if the master log gets rotated

  Remove (already commented out) code about storing the latest relay log pos info to InnoDB: we will probably use only the master log pos info when we restart a slave after a crash


sql/ha_innodb.cc:
  Remove (already commented out) code about storing the latest relay log pos info to InnoDB: we will probably use only the master log pos info when we restart a slave after a crash

BitKeeper/etc/ignore:
  Added configure.lineno innobase/configure.lineno to the ignore list

  Do not try to resolve the table name of a corrupt page if the code is in ibbackup, i.e., the dict system is not initialized


innobase/buf/buf0buf.c:
  Do not try to resolve the table name of a corrupt page if the code is in ibbackup, i.e., the dict system is not initialized

client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/handler.cc:
  Auto merged

Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped


client/mysqltest.c:
  Fixed bug that comments did a ping
include/thr_lock.h:
  Added function to abort a lock for a specific thread
mysql-test/mysql-test-run.sh:
  Fixed where mysqltest traces are put
mysql-test/r/lock_multi.result:
  Test for LOCK TABLE + DROP TABLE bug
mysql-test/t/lock_multi.test:
  Test for LOCK TABLE + DROP TABLE bug
mysys/thr_lock.c:
  Added function to abort a lock for a specific thread
sql/handler.cc:
  Indentation cleanup
sql/lock.cc:
  Added function to abort a lock for a specific thread
sql/mysql_priv.h:
  Added function to abort a lock for a specific thread
sql/mysqld.cc:
  Use automatic recover even with --safe

BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
  Delete: netware/mw/mwenv
BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5:
  Delete: netware/mw/mwasmnlm
BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f:
  Delete: netware/mw/mwccnlm
BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980:
  Delete: netware/mw/mwldnlm

netware/mysql_fix_privilege_tables.pl:
  Import patch novell40b.patch

sql/lock.cc:
  Added functions to handle list of table name locks
sql/mysql_priv.h:
  Added functions to handle list of named locks
sql/sql_rename.cc:
  Use new general table name lock functions
sql/sql_table.cc:
  Require table name locks when doing drop table.
  This fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another

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

  Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time


sql/sql_class.cc:
  Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/handler.cc:
  Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/handler.h:
  Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/ha_innodb.cc:
  Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/ha_innodb.h:
  Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

into sinisa.nasamreza.org:/mnt/work/mysql

   packaging
 - enclosed some variables in quotes for safeguarding
 - add a license file (GPL or MySQLEULA) to the package so it will be
   displayed during installation (needs to be tested)

  Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf


innobase/srv/srv0start.c:
  Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf

+ fix for #70 
+ test result fix for LOAD DATA LOCAL bug #82


client/mysqltest.c:
  Removed wrong comment and useless sleep
mysql-test/mysql-test-run.sh:
  Fix $slave_datadir variable because this
    if [ -n "$1" ] ; 
     slave_datadir="var/$slave_ident-data/"
    else
      slave_datadir=$SLAVE_MYDDIR
  was not coherent and led to problems of master.info not being deleted.
  Delete relay-log.info too.
mysql-test/r/rpl000001.result:
  SUM is 1022 (1021 was when we had the LOAD DATA LOCAL bug #82).
  It's logical to have an even number as we load the same file twice.
sql/slave.cc:
  When we RESET SLAVE, clear rli->master_log_* to give a good display in SHOW SLAVE STATUS ;
  seeing the old values may confuse the user.
  When we START SLAVE, clear rli->master_log_name, not only rli->master_log_pos.
sql/sql_repl.cc:
  When we RESET SLAVE, clear mi->master_log_* to give a good display in SHOW SLAVE STATUS (bug #70)

  Print trx rollback progress info in crash recovery


innobase/include/srv0start.h:
  Print trx rollback progress info in crash recovery
innobase/trx/trx0roll.c:
  Print trx rollback progress info in crash recovery
innobase/trx/trx0sys.c:
  Print trx rollback progress info in crash recovery

mysql-test/r/rpl_loaddatalocal.result:
  ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)
mysql-test/t/rpl_loaddatalocal.test:
  ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)
sql/mf_iocache.cc:
  ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)

BitKeeper/etc/ignore:
  Added configure.lineno innobase/configure.lineno to the ignore list

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