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

(First one is used)


scripts/safe_mysqld.sh:
  Don't allow multiple --user options
sql/mysqld.cc:
  Don't allow multiple --user options

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

Fixed memory leak when replication restarts in debug mode


include/my_sys.h:
  Added option to not overwrite files to my_copy()
mysql-test/mysql-test-run.sh:
  Fixed --ddd option
  Fixed that mysqld is restarted if there is a testname-master.sh file
mysql-test/r/backup.result:
  Update for security fix in BACKUP TABLE
mysql-test/t/backup.test:
  Update for security fix in BACKUP TABLE
mysys/my_copy.c:
  Added option to not overwrite files to my_copy()
sql/ha_myisam.cc:
  Don't allow BACKUP TABLE to overwrite files
sql/slave.cc:
  Fixed problem with --debug output from 'handle_slave'
  Fixed memory leak when replication restarts in debug mode

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

  Delete: innobase/stamp-h.in


BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5:
  Delete: innobase/stamp-h.in

libmysql/libmysql.c:
  Additional fix for connection being established during select()

mysql-test/r/join.result:
  Test of range optimizer bug
mysql-test/t/join.test:
  Test of range optimizer bug
sql/sql_rename.cc:
  Added missing DEBUG_PRINT()

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


sql/mysql_priv.h:
  Auto merged

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

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 sinisa.nasamreza.org:/mnt/work/mysql

include/global.h:
  Portability fix
  (Using errno before including errno.h can give big problems on Linux)

contain NULL values (which is the case for a crashed .frm file).

mysql-test/t/rpl_rotate_logs.slave-mi:
  Rename: mysql-test/t/rpl_rotate_logs-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs.slave-mi
mysql-test/t/rpl000015.slave-mi:
  Rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi

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


sql/share/polish/errmsg.txt:
  Auto merged

Ensured that all errors messages ends with: ",


sql/share/czech/errmsg.txt:
  Fixed new line terminations
sql/share/danish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/dutch/errmsg.txt:
  Fixed "syntax" errors.
sql/share/english/errmsg.txt:
  Fixed "syntax" errors.
sql/share/estonian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/french/errmsg.txt:
  Fixed "syntax" errors.
sql/share/german/errmsg.txt:
  Fixed "syntax" errors.
sql/share/greek/errmsg.txt:
  Fixed "syntax" errors.
sql/share/hungarian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/italian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/japanese/errmsg.txt:
  Fixed "syntax" errors.
sql/share/korean/errmsg.txt:
  Fixed "syntax" errors.
sql/share/norwegian-ny/errmsg.txt:
  Fixed "syntax" errors.
sql/share/norwegian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/polish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/portuguese/errmsg.txt:
  Fixed "syntax" errors.
sql/share/romanian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/russian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/slovak/errmsg.txt:
  Fixed "syntax" errors.
sql/share/spanish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/swedish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/ukrainian/errmsg.txt:
  Fixed "syntax" errors.

  Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records


innobase/ibuf/ibuf0ibuf.c:
  Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records

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

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

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

sql/sql_class.cc:
  backporting Peter's fix for better RAND() initialization from 4.0
  to see what it does try
  perl -e 'while($N=shift) { printf "N=%-10d",$N; @b=@c=(); for (1..$N) { @A=split(" ",`mysql -BNe "select rand(), rand(), rand(), rand()"`); for(0..3) { $b[$_]+=$a[$_]; $c[$_]+=$a[$_]*$a[$_]; }} for (0..3) { printf "%15.14f ",($c[$_]-$b[$_]*$b[$_]/$N)/$N } print "\n" }' 10 10 10 100 100 10 100 1000
  before and after the fix

libmysql/libmysql.c:
  This is a fix for a bug in connect_timeout.
  
  This bug manifested itself on operating systems that do support poll() 
  system call, which resulted in a timeout twice the value specified.
  
  That is because timeout executed on both select() and poll().