into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1


sql/ha_archive.h:
  Auto merged
sql/ha_archive.cc:
  Merge to  change gzio to azio. Good thing I am not lazy about doing merges  since I suspect this might have given someone else a headache.

Discoved while debugging in 5.1 that there was a bug where a certain crash could lead to two problems. 1) An additional share in memory that was allocated but did not have the correct use_count (so it would never be fulled deleted). Also discovered that a thread that called repair would write new rows, but would not see them. All other threads were ok, and the data was fine, but the thread doing the repair was unable to see the new rows.


sql/ha_archive.cc:
  Fix for leaked share and hidden rows.
sql/ha_archive.h:
  Change in method

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1

Cleanup's from Kostja's review. Plus I added a bit more documentation to the --lock-tables option. If selected it disables threads (since you can't quite do it with threads).


client/mysqlimport.c:
  Cleanups from Kostja's review

'--log-bin-trust-function-creators' affects not only replication of the
stored functions, but also replication of the triggers.


sql/mysqld.cc:
  Updated the description of mysqld '--log-bin-trust-function-creators' option
  to reflect that after introducing TRIGGER privilege this option also controls
  replication of triggers.
sql/sql_trigger.cc:
  Updated the comment to be consistent with the new behaviour,
  introduced by TRIGGER privilege.

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1

Adding thread support for mysqlimport. You can now specify a number of threads to use and it will thread the loading of the database. Anyone who has had to go through the pain of loading the database will immediatly get the reason for this.


client/Makefile.am:
  Adding client_thread_libs for mysqlimport (aka it gets pthreads)
client/client_priv.h:
  New option
client/mysqlimport.c:
  Reworked logic to allow someone to use threads.
mysql-test/r/mysqldump.result:
  New results
mysql-test/t/mysqldump.test:
  Added tests for threads.

into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

  new file
Many files:
  WL#757 RENAME DATABASE


sql/mysql_priv.h:
  WL#757 RENAME DATABASE
sql/mysqld.cc:
  WL#757 RENAME DATABASE
sql/sql_db.cc:
  WL#757 RENAME DATABASE
sql/sql_lex.h:
  WL#757 RENAME DATABASE
sql/sql_parse.cc:
  WL#757 RENAME DATABASE
sql/sql_rename.cc:
  WL#757 RENAME DATABASE
sql/sql_table.cc:
  WL#757 RENAME DATABASE
sql/sql_yacc.yy:
  WL#757 RENAME DATABASE

sql/mysql_priv.h:
  Removing isam option
sql/mysqld.cc:
  Removing isam option
sql/set_var.cc:
  Removing isam option.

into  zim.tangent.org:/home/brian/mysql/dep-5.1

This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 


BitKeeper/deleted/.del-raid.test~501e9e00b3c27a55:
  Delete: mysql-test/t/raid.test
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Test change
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  New results
mysql-test/r/ctype_ujis.result:
  New results
mysql-test/r/innodb_concurrent.result:
  New results.
mysql-test/r/rpl_heap.result:
  New results
mysql-test/r/warnings.result:
  New results
mysql-test/t/ctype_ujis.test:
  Fixed ENGINE=, test should now actually function
mysql-test/t/innodb_concurrent.test:
  Fixed test for engine
mysql-test/t/rpl_heap.test:
  Fixed test for engine
mysql-test/t/system_mysql_db_fix.test:
  Fixed setup.
mysql-test/t/warnings.test:
  Removed deprecated tests
scripts/fill_func_tables.sh:
  Fixed script
scripts/mysql_convert_table_format.sh:
  Fixed script
sql/ha_innodb.cc:
  Fixed comment
sql/sql_yacc.yy:
  Removed deprecated syntax
tests/fork_big.pl:
  Fixed scipt
tests/fork_big2.pl:
  Fixed script
tests/mail_to_db.pl:
  Fixed script
tests/mysql_client_test.c:
  Fixed test

include/config-netware.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
netware/BUILD/compile-AUTOTOOLS:
  Auto merged
netware/Makefile.am:
  Auto merged
netware/my_manage.h:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
netware/BUILD/mwenv:
  Auto merged
netware/BUILD/nwbootstrap:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/os/os0thread.c:
  Auto merged
storage/myisam/mi_locking.c:
  Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


mysql-test/lib/mtr_process.pl:
  Auto merged

  Reenabled tests 'innodb_concurrent', 'innodb_unsafe_binlog', 'rpl_ndb_log' as bugs 3300 15650 17081 are solved


mysql-test/t/disabled.def:
  Reenabled tests 'innodb_concurrent', 'innodb_unsafe_binlog', 'rpl_ndb_log' as bugs 3300 15650 17081 are solved

VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged

  Disabled 'rpl_until' until 15886 is solved
libmysqld.vcproj:
  Added "my_user.c"


VC++Files/libmysqld/libmysqld.vcproj:
  Added "my_user.c"
mysql-test/t/disabled.def:
  Disabled 'rpl_until' until 15886 is solved

mysql-test/t/log_tables.test:
  fix race condidtion

mysql-test/lib/mtr_cases.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged

mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/spatial.cc:
  Auto merged

  Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"
mtr_report.pl:
  Parse error logs to create "warnings" file
mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test-run.pl, mtr_process.pl:
  Back port of changes from 5.0


mysql-test/lib/mtr_process.pl:
  Back port of changes from 5.0
mysql-test/mysql-test-run.pl:
  Back port of changes from 5.0
mysql-test/lib/mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test/lib/mtr_report.pl:
  Parse error logs to create "warnings" file
sql/spatial.cc:
  Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"

into  zim.tangent.org:/home/brian/raid/mysql-5.1-new


sql/ha_myisam.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/sql_yacc.yy:
  SCCS merged

This patch is to further remove the RAID code. We removed support for people creating tables with RAID. This patch remove most of the source for this. 


sql/ha_myisam.cc:
  Remove RAID code
sql/ha_partition.cc:
  Remove RAID code.
sql/handler.h:
  Remove RAID code
sql/lex.h:
  Remove RAID code.
sql/mysqld.cc:
  Remove RAID code.
sql/set_var.cc:
  Remove RAID code.
sql/sql_show.cc:
  Remove RAID code
sql/sql_yacc.yy:
  Remove more of the RAID code
sql/table.cc:
  Remove RAID code.

into mysql.com:/Users/kent/mysql/bk/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged

  print => echo in shell script


scripts/make_binary_distribution.sh:
  print => echo in shell script

into  mysql.com:/usr/local/mysql/mysql-5.0


mysql-test/lib/mtr_process.pl:
  Auto merged

mysql-test/mysql-test-run.sh:
  Auto merged

mysql-test/mysql-test-run.sh:
  Auto merged

  Give space for second and third slave port


mysql-test/mysql-test-run.pl:
  Give space for second and third slave port
  Define shell variables for all ports, and
  list these at startup
mysql-test/mysql-test-run.sh:
  Give space for second and third slave port

into  mysql.com:/usr/local/mysql/mysql-5.1-new


mysql-test/lib/mtr_process.pl:
  Auto merged

mysql-test/mysql-test-run.sh:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.


mysql-test/lib/mtr_process.pl:
  Fix race (on some platforms) when killing processes.

into lmy004.:/work/mysql-5.1-new-clean

into lmy004.:/work/mysql-5.1-new-clean


tests/mysql_client_test.c:
  Auto merged

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

into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg

After merge fix.

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