into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0

in case of an empty string. Bug ID 586.

More debugging variables
Increment aborted_threads in case of killed or too big packet


include/thr_alarm.h:
  made prototype more portable
mysys/thr_alarm.c:
  Print error if we can't delete an alarm
sql/mysqld.cc:
  Statistics variable (for debugging)
sql/net_serv.cc:
  statistics variable (for debugging)
sql/sql_parse.cc:
  Increment aborted_threads in case of killed or too big packet

into narttu.mysql.fi:/my/mysql-4.0

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

   to set CXX=gcc (cannot link the code with g++) - this should help to
   recompile the RPM on Distributions using gcc 3
 - Added a symlink /usr/sbin/rcmysql -> /etc/init.d/mysql

into narttu.mysql.fi:/my/mysql-4.0

   Red Hat's chkconfig (Bug #272) (The LSB spec is a bit ambigous about
   what actually needs to be put into this field)

  If the autocommit is on, let handler.cc commit or rollback the whole transaction at an updating SQL statement end. This probably fixes bug number 578. The problem was that when explicit LOCK TABLES is used, then the lock count method in autocommit does not work.


sql/handler.cc:
  If the autocommit is on, let handler.cc commit or rollback the whole transaction at an updating SQL statement end. This probably fixes bug number 578. The problem was that when explicit LOCK TABLES is used, then the lock count method in autocommit does not work.

Portability fix for Windows 64


include/config-win.h:
  Portability fix for Windows 64
include/my_global.h:
  Portability fix for Windows 64
include/mysql_version.h.in:
  Added [mysqld-base-version] as a default group for the mysqld server
innobase/include/univ.i:
  Portability fix for Windows 64
sql/mysqld.cc:
  Added [mysqld-base-version] as a default group for the mysqld server

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

Plus a changeset which I had committed but forgot to push (and this changeset is lost on
another computer, so I recreate it here). This changeset is "user-friendly SHOW BINLOG EVENTS
and CHANGE MASTER TO when log positions < 4 are used.


sql/slave.cc:
  fix for bug 576 (DBUG_ASSERT failure when using CHANGE MASTER TO RELAY_LOG_POS=4).
sql/sql_repl.cc:
  User-friendly SHOW BINLOG EVENTS:
  SHOW BINLOG EVENTS FROM 0: currently one gets
      MASTER> show binlog events from 0;
      ERROR 1220: Error when executing command SHOW BINLOG EVENTS: Invalid log position
  so we silently convert <4 to 4.
sql/sql_yacc.yy:
  User-friendly CHANGE MASTER TO:
  presently when one does CHANGE MASTER TO MASTER_LOG_POS=0 he gets
      030425 10:12:41  Slave I/O thread: connected to master 'root@localhost:3306',  r
      eplication started in log 'gbichot-bin.013' at position 151
      030425 10:12:41  Error reading packet from server: Client requested master to st
      art replication from impossible position (server_errno=1236)
      030425 10:12:41  Got fatal error 1236: 'Client requested master to start replica
      tion from impossible position' from master when reading data from binary log
      030425 10:12:41  Slave I/O thread exiting, read up to log 'gbichot-bin.013', pos
      ition 151
      
  while she/he probably just wanted to start at the beginning of the
  binlog, which is 4. So we silently convert <4 to 4 in sql_yacc.yy
  (i.e. in the slave code; fortunately all versions have the same
  BIN_LOG_HEADER_SIZE=4 and we should not change this). See comments
  for an explaination of why we have to do this in sql_yacc.yy,
  not in sql_repl.cc.
  Same thing for CHANGE MASTER TO RELAY_LOG_POS.
sql/unireg.h:
  warning comment

Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master: 
if it was with IGNORE, do it with IGNORE,
if it was with REPLACE, do it with REPLACE,
and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
on the slave, i.e. a message where the keyname and key value appear :
'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'


mysql-test/r/rpl_loaddata.result:
  result update
mysql-test/t/rpl_loaddata.test:
  check if duplicate entries on the slave trigger an error 
  when the slave replicates LOAD DATA INFILE (without IGNORE or REPLACE)
  (bug 571).
sql/log_event.cc:
  Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master: 
  if it was with IGNORE, do it with IGNORE,
  if it was with REPLACE, do it with REPLACE,
  and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
  Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
  on the slave, i.e. a message where the keyname and key value appear :
  'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'

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

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

not the master's binlog) (SW 1571).


sql/slave.cc:
  Clearer error message (in the customer's case, the relay log was corrupted,
  not the master's binlog).

  Do not try to reserve os_sync_mutex in shutdown after it has been freed


innobase/os/os0sync.c:
  Do not try to reserve os_sync_mutex in shutdown after it has been freed

  Removed auto event creation because it is not needed in any MySQL/InnoDB code


innobase/com/com0shm.c:
  Removed auto event creation because it is not needed in any MySQL/InnoDB code

  Put back Monty's patch which the previous push accidentally erased: print also operation type in os_file_handle_error()


innobase/os/os0file.c:
  Put back Monty's patch which the previous push accidentally erased: print also operation type in os_file_handle_error()

  Release all event semaphores at shutdown also in Windows
srv0start.c, srv0srv.c:
  make test sometimes failed because lock timeout thread exited without decrementing the InnoDB thread counter


innobase/srv/srv0srv.c:
  make test sometimes failed because lock timeout thread exited without decrementing the InnoDB thread counter
innobase/srv/srv0start.c:
  make test sometimes failed because lock timeout thread exited without decrementing the InnoDB thread counter
innobase/os/os0file.c:
  Release all event semaphores at shutdown also in Windows
innobase/os/os0sync.c:
  Release all event semaphores at shutdown also in Windows
innobase/os/os0thread.c:
  Release all event semaphores at shutdown also in Windows
innobase/include/os0sync.h:
  Release all event semaphores at shutdown also in Windows
innobase/include/os0sync.ic:
  Release all event semaphores at shutdown also in Windows
innobase/include/os0thread.h:
  Release all event semaphores at shutdown also in Windows

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


BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
  Auto merged

mysql-test/r/errors.result:
  Rename: mysql-test/r/err000001.result -> mysql-test/r/errors.result
include/my_global.h:
  typedef for future functions that needs string length as an argument
innobase/os/os0file.c:
  Added operation to error messages
mysql-test/t/errors.test:
  Cleaned up file to new error number standard
mysys/thr_alarm.c:
  Made end_thr_alarm() work also with internal alarm thread.
  (Not critical for MySQL)
sql/mysqld.cc:
  Added sigemptyset() (bug found by valgrind)
  Removed some wrong usage of thd when writing variable values

BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
  Auto merged
innobase/srv/srv0srv.c:
  Use local version. Heikki needs to check if the os_thread_sleep() should go to 4.0 or not

into narttu.mysql.fi:/my/mysql-4.0


sql/mysql_priv.h:
  Auto merged

mysql-test/r/alter_table.result:
  new results
mysql-test/r/lowercase_table.result:
  new results
mysql-test/t/alter_table.test:
  Test of ALTER TABLE DISABLE KEYS + INSERT DELAYED
mysql-test/t/lowercase_table.test:
  Added test of alias name comparison
sql/mysql_priv.h:
  Made closed_cached_table local
sql/sql_table.cc:
  Fixed bug in ALTER TABLE DISABLE KEYS and INSERT DELAYED

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0

into narttu.mysql.fi:/my/mysql-3.23

(Casused problems in GIS functions in 4.1)


include/global.h:
  Fixed compiler optimization problem with doubleget()

  Cleanup
os0sync.c:
  Free all OS sync primitives and allocated memory in InnoDB shutdown


innobase/os/os0sync.c:
  Free all OS sync primitives and allocated memory in InnoDB shutdown
innobase/include/os0sync.h:
  Cleanup
innobase/include/os0thread.h:
  Cleanup
innobase/os/os0thread.c:
  Cleanup

  Free all OS sync primitives and allocated memory in InnoDB shutdown


innobase/os/os0sync.c:
  Free all OS sync primitives and allocated memory in InnoDB shutdown
innobase/os/os0thread.c:
  Free all OS sync primitives and allocated memory in InnoDB shutdown
innobase/include/os0sync.h:
  Free all OS sync primitives and allocated memory in InnoDB shutdown
innobase/include/srv0srv.h:
  Free all OS sync primitives and allocated memory in InnoDB shutdown
innobase/include/srv0start.h:
  Free all OS sync primitives and allocated memory in InnoDB shutdown
innobase/ibuf/ibuf0ibuf.c:
  Free all OS sync primitives and allocated memory in InnoDB shutdown
innobase/srv/srv0srv.c:
  Free all OS sync primitives and allocated memory in InnoDB shutdown
innobase/srv/srv0start.c:
  Free all OS sync primitives and allocated memory in InnoDB shutdown
innobase/sync/sync0sync.c:
  Free all OS sync primitives and allocated memory in InnoDB shutdown
innobase/ut/ut0mem.c:
  Free all OS sync primitives and allocated memory in InnoDB shutdown

mysql-test/r/query_cache.result:
  test of 2 parts of bug 549
mysql-test/t/query_cache.test:
  test of 2 parts of bug 549
sql/sql_cache.cc:
  fixed query cache size showing
  fixed query cache low memory detection

  Cleanup


innobase/srv/srv0start.c:
  Cleanup

  Exit all threads created by innoDB at shutdown


innobase/os/os0file.c:
  Exit all threads created by innoDB at shutdown
innobase/os/os0sync.c:
  Exit all threads created by innoDB at shutdown
innobase/os/os0thread.c:
  Exit all threads created by innoDB at shutdown
innobase/include/os0file.h:
  Exit all threads created by innoDB at shutdown
innobase/include/os0sync.h:
  Exit all threads created by innoDB at shutdown
innobase/include/os0thread.h:
  Exit all threads created by innoDB at shutdown
innobase/log/log0log.c:
  Exit all threads created by innoDB at shutdown
innobase/srv/srv0srv.c:
  Exit all threads created by innoDB at shutdown
innobase/srv/srv0start.c:
  Exit all threads created by innoDB at shutdown

  Prevent the InnoDB main thread from hogging CPU if a table lingers in the background drop queue (though it is essentially a bug if a table end up there at all)


innobase/srv/srv0srv.c:
  Prevent the InnoDB main thread from hogging CPU if a table lingers in the background drop queue (though it is essentially a bug if a table end up there at all)

  Fix for multibyte charsets


sql/item_cmpfunc.cc:
  Fix for multibyte charsets