into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


include/mysql_h.ic:
  C
  Use local
include/Makefile.am:
  Manual merge

include/Makefile.am:
  Move m_ctype.h from BUILT_SOURCES, it's in vcs
  Update the rule for abi_check
include/mysql_h.ic:
  Update the refernce and rename it to mysql_h.ic

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/t/ctype_utf8.test:
  Auto merged

 - Improve icheck rules in Makefile.am


include/Makefile.am:
  Remove m_ctype from BUILT_SOURCES, it has been in bk for a looong time.
  Improve the icheck rules
   - Abort make if icheck fails to compare, very important.
   - Don't include include files from /usr into the icheck file. Avoids problem when running
     icheck on different machines.
   - If no icheck is availabel, touch the mysql_h.ic file so it exists for "make dist"
include/mysql_h_abi.ic:
  Remove all include files from /usr, no need to check that!

 - Add two null bytes in  "buff" variable allowing us to call
   get_arg two times also for strings longer than sizeof(buff) 


client/mysql.cc:
  Make sure there are _two_ zero bytes at the end of buff, to allow 'get_arg' to be
  called twice on long strings. The first time it will mark end of string with a
  zero and the second time it will "skip ahead" to the first zero, and the find the
  second one indicating end of buff.
mysql-test/r/mysql.result:
  Update test results
mysql-test/t/mysql.test:
  Add tests for "com_connect" function in mysql
  Add test reported in bug

into  siva.hindu.god:/usr/home/tim/m/bk/50


configure.in:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


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

Remove one warning


tests/mysql_client_test.c:
  Fix memory leaks
  Remove one warning

Disable warnings around the create table statements, we want to use innodb when possible but they work just fine without.


mysql-test/t/ctype_utf8.test:
  Disable warnings around the create table statements, we want to use innodb when possible but they work just fine without.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


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

Update the binlog format parse routine to only be avaliable in 5.1 and allow for any binlog_format to be specified

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
tests/mysql_client_test.c:
  Use local in 5.0

Fix two memory leaks in mysql_client_test


mysql-test/mysql-test-run.pl:
  Add valgrinding support for mysql_client_test
tests/mysql_client_test.c:
  Fix two memory leaks

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


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

Add comments
Deperlify

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/50


configure.in:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
myisam/sort.c:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge

include/mysql_h_abi.ic:
  Update the reference file for mysql API/ABI

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
include/Makefile.am:
  Merge, SUPERCLEANFILES and CLEANFILES has dissapeared in 5.0

BitKeeper/etc/ignore:
  Added mysql-test/r/blackhole.log to the ignore list

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

BUG#23427 incompatible ABI change in 5.0.26?
   - Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file 


BitKeeper/etc/ignore:
  Added include/check_abi include/mysql_h.ic to the ignore list
configure.in:
  Look for icheck in configure
include/Makefile.am:
  Add rule to build mysql_h.ic if icheck is avaliable
  Add rule to compare mysql_h.ic to the version
  controlled reference file mysql_h_abi.ic
include/mysql.h:
  Add comment about taking care when editing mysql.h
  Add example how to add reserved fiels in the structs to
  allow for features to be added without breaking ABI
include/mysql_h_abi.ic:
  Add new file describing the libmysqlclient ABI used as a reference to detect ABI breakage

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


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

 - Fix check in mysql_client_test to reflect the change of datatype
   for DEFAULT column


tests/mysql_client_test.c:
  Update check of datatype for field DEFAULT returned from "explain"
  as datatype has changed after patch for bug 23037

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
tests/mysql_client_test.c:
  Remove the fflush(NULL) and instead explicitly fflush stdout and then stderr

Flush both stdout and stderr before abort'ing mysql_client_test


mysql-test/mysql-test-run.pl:
  Run mysql_client_test wihtout --silent flag
tests/mysql_client_test.c:
  Before aborting mysql_client_test in die, make sure
  to first flush stdout and finally after the error message 
  has been printed also fflush stderr

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


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

mysql-test/r/mysqldump-max.result:
  Update test result after fix of spelling error
mysql-test/r/rpl_trigger.result:
  Update test result after fix of spelling error
mysql-test/r/type_newdecimal.result:
  Update test result after fix of spelling error
mysql-test/t/mysqldump-max.test:
  Fix spelling error "disable_warnings"
  Write shorter "drop table..."
mysql-test/t/rpl_trigger.test:
  Fix spelling error, there is no --ignore_warnings
mysql-test/t/type_newdecimal.test:
  Fix spelling error

with error 1 and we are running with --force
The specific "analyze" code is enclosed in a .test file fwich can easily
be modified to be more advanced 


mysql-test/mysql-test-run.pl:
  Attempt to run some quick queries to analyze the failure when mysqltest returns 1 indicating test has failed
  Initially only code to analyze "could not sync with master" is added as that is a blackbox
  and all problems looks the same
mysql-test/include/analyze_failure_sync_with_master.test:
  New BitKeeper file ``mysql-test/include/analyze_failure_sync_with_master.test''

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

to their .libs/*.a library
Add comment describing why mwldnlm is called with "x" flag


configure.in:
  Replace references to yassl .la libraries with direct reference to
  the .a libraries
netware/BUILD/mwldnlm:
  Add comment about why mwldnlm is called with the "x" flag and how
  to avoid it

netware/BUILD/compile-netware-END:
  If running as user pushbuild don't run autotools again
netware/BUILD/mwenv:
  Set ARFLAGS to value of AR_FLAGS

vio/viossl.c:
  No need for special code to switch from WinSock to BSD sockets when using yaSSL
vio/viosslfactories.c:
  The OpenSSL port to NetWare has added some extra functions to free up memory, no need
  to call them when using yaSSL