mysql-test/r/func_str.result:
  cleanup
sql/item_strfunc.cc:
  cleanup

into ram.(none):/home/ram/work/mysql-4.0

sql/sql_yacc.yy:
  Auto merged

Fix for syntax error bug in SET TRANSACTION ISOLATION



BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
  Delete: include/sslopt-case.h
client/mysql.cc:
  Fix for SSL and new my_getopt
client/mysqladmin.c:
  Fix for SSL and new my_getopt
client/mysqlcheck.c:
  Fix for SSL and new my_getopt
client/mysqldump.c:
  Fix for SSL and new my_getopt
client/mysqlimport.c:
  Fix for SSL and new my_getopt
client/mysqlshow.c:
  Fix for SSL and new my_getopt
include/Makefile.am:
  Fix for SSL and new my_getopt
include/sslopt-longopts.h:
  Fix for SSL and new my_getopt
libmysql/libmysql.c:
  Fix for SSL and new my_getopt
mysql-test/r/innodb.result:
  Simple test of transaction isolations
mysql-test/t/innodb.test:
  Simple test of transaction isolations
sql/mini_client.cc:
  Merge of mysql_real_connect() with libmysql.c
sql/mysqld.cc:
  Simple test of transaction isolations
  Remove use of current_thd in get_options()
sql/slave.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Fix for SET TRANSACTION ...

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

sql/sql_acl.cc:
  I revert my last change, as this requires further elaboration.
  For the moment we should document it in the manual.
  
  If MySQL 4.0.2 or higher is used with pre-4.0.2 user privilege table, 
  then user with no global privs at all will have privileges to:
  
  * LOCK TABLES
  * CREATE TEMPORARY TABLES
  * run commsnd SHOW DATABASES

into ram.(none):/home/ram/work/mysql-4.0

into ram.(none):/home/ram/work/mysql-4.0


sql/item_strfunc.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

sql/item_strfunc.cc:
  added bitmap for QUOTE() func
sql/item_strfunc.h:
  moved fix_length_and_dec code to .h file
sql/sql_yacc.yy:
  removed QUOTE stuff

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

   OpenSSL, enabled RAID)
 - added compatibility link safe_mysqld -> mysqld_safe


support-files/mysql.spec.sh:
   - Turn off OpenSSL in MySQL-Max for now until it works properly again
   - enable RAID for the Max binary instead
   - added compatibility link: safe_mysqld -> mysqld_safe to ease the
     transition from 3.23

sql/share/dutch/errmsg.txt:
  Fix wrongly placed comma.

server-cert.pem	regenerated
client-key.pem	Regenerated
client-cert.pem	Regenerated
cacert.pem	Regenerated (previous exprired)


SSL/cacert.pem:
  Regenerated (previous exprired)
SSL/client-cert.pem:
  Regenerated
SSL/client-key.pem:
  Regenerated
SSL/server-cert.pem:
  regenerated
SSL/server-key.pem:
  regenerated

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

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

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

include/sslopt-case.h:
  changed optarg to argument, decomment ssl-key option

sql/item_timefunc.h:
  Auto merged
Docs/manual.texi:
  Merge

Make safe_mysqld a symlink to mysqld_safe in binary distribution
Fixed problem with CTRL-C when using mysqld --bootstrap


Docs/manual.texi:
  Added nety_retry_count as a changeable variables
include/mysql_com.h:
  Added nety_retry_count as a changeable variables
libmysql/libmysql.c:
  Added nety_retry_count as a changeable variables
mysql-test/r/olap.result:
  Fixed wrong error message
mysql-test/r/variables.result:
  Update for freebsd
mysql-test/t/variables.test:
  Update for freebsd
scripts/make_binary_distribution.sh:
  Make safe_mysqld a symlink to mysqld_safe in binary distribution.
sql/item_func.cc:
  Cleaned up tmp_table_field() handling.
sql/item_func.h:
  Cleaned up tmp_table_field() handling.
sql/item_strfunc.h:
  Cleaned up tmp_table_field() handling.
sql/item_timefunc.h:
  Cleaned up tmp_table_field() handling.
sql/mysql_priv.h:
  Added nety_retry_count as a changeable variables
sql/mysqld.cc:
  Added nety_retry_count as a changeable variables
  Allow one to specify a defaults file to be read when installing MySQL as a service.
sql/net_pkg.cc:
  Added nety_retry_count as a changeable variables
sql/net_serv.cc:
  Added nety_retry_count as a changeable variables
sql/set_var.cc:
  Added nety_retry_count as a changeable variables
sql/share/czech/errmsg.txt:
  Fixed wrong error message
sql/share/danish/errmsg.txt:
  Fixed wrong error message
sql/share/english/errmsg.txt:
  Fixed wrong error message
sql/share/estonian/errmsg.txt:
  Fixed wrong error message
sql/share/french/errmsg.txt:
  Fixed wrong error message
sql/share/german/errmsg.txt:
  Fixed wrong error message
sql/share/greek/errmsg.txt:
  Fixed wrong error message
sql/share/hungarian/errmsg.txt:
  Fixed wrong error message
sql/share/italian/errmsg.txt:
  Fixed wrong error message
sql/share/japanese/errmsg.txt:
  Fixed wrong error message
sql/share/korean/errmsg.txt:
  Fixed wrong error message
sql/share/norwegian-ny/errmsg.txt:
  Fixed wrong error message
sql/share/norwegian/errmsg.txt:
  Fixed wrong error message
sql/share/polish/errmsg.txt:
  Fixed wrong error message
sql/share/portuguese/errmsg.txt:
  Fixed wrong error message
sql/share/romanian/errmsg.txt:
  Fixed wrong error message
sql/share/russian/errmsg.txt:
  Fixed wrong error message
sql/share/slovak/errmsg.txt:
  Fixed wrong error message
sql/share/spanish/errmsg.txt:
  Fixed wrong error message
sql/share/swedish/errmsg.txt:
  Fixed wrong error message
sql/share/ukrainian/errmsg.txt:
  Fixed wrong error message
sql/sql_class.cc:
  Indentaion cleanup
sql/sql_class.h:
  Fixed wrong error message
sql/sql_parse.cc:
  Fixed problem with CTRL-C when using mysqld --bootstrap
sql/sql_select.cc:
  Ensure that select terminates if create_myisam_from_heap() fails.
sql/sql_yacc.yy:
  Portability fix

into mysql.com:/home/pz/mysql/mysql-4.0-root

mysys/mf_casecnv.c:
  Add doccumentation for some functions.

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/sql_acl.cc:
  Auto merged

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

Updated WEEK() and DATE information in the manual.


Docs/manual.texi:
  Updated WEEK() information.
  Added more information of how MySQL stores dates.
libmysql/Makefile.am:
  Fix after merge
libmysqld/lib_vio.c:
  Use new vio_blocking()
mysql-test/r/group_by.result:
  Update results after merge
sql/ha_innodb.cc:
  Fix after merge
sql/lex.h:
  Fix after merge
sql/slave.cc:
  Added missing include file
sql/sql_base.cc:
  Added function comments
vio/test-ssl.c:
  Fix after merge

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql_com.h:
  Auto merged
include/mysql_version.h.in:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/configure.in:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/fsp/fsp0fsp.c:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/dyn0dyn.ic:
  Auto merged
innobase/include/ha0ha.ic:
  Auto merged
innobase/include/sync0rw.ic:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
innobase/page/page0cur.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
include/my_base.h:
  merge with 3.23.52 (use local file)
include/sslopt-usage.h:
  merge with 3.23.52 (use local file)
myisam/mi_search.c:
  merge with 3.23.52 (use local file)
myisam/mi_write.c:
  merge with 3.23.52 (use local file)
mysql-test/r/group_by.result:
  merge with 3.23.52
  (Need to be fixed before push)
mysys/my_pthread.c:
  merge with 3.23.52 (use local file)
sql/gen_lex_hash.cc:
  merge with 3.23.52 (use local file)
sql/ha_innodb.cc:
  Total hand-merge with 3.23.52
sql/sql_yacc.yy:
  merge with 3.23.52 (use local file)
support-files/mysql.spec.sh:
  merge with 3.23.52 (use local file)

Don't know what created the above three files ..

BK does not let me discard those ...


sql/item_func.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
Docs/manual.texi:
  bk resolve

configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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