into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
mysql-test/r/drop.result:
Auto merged
mysql-test/r/err000001.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/overflow.result:
Auto merged
Do-rpm remove the file before doing a cp
Do-rpm print out the log file name
Build-tools/Do-rpm:
remove the file before doing a cp
print out the log file name
support-files/mysql.spec.sh:
fix typo in embedded section
This wrapper noew will include all the necessary, system specific files,
which makes all normal source files much easier to write and maintain.
Portability fixes.
Docs/manual.texi:
Updated upgrading from 3.23 -> 4.0
client/mysqladmin.c:
Portability fixes
client/mysqlshow.c:
Portability fixes
extra/resolveip.c:
Portability fixes
include/my_global.h:
Portability fixes
include/my_net.h:
One should not only have to include my_net.h to work with sockets.
This wrapper noew will include all the necessary, system specific files,
which makes all normal source files much easier to write and maintain.
include/mysql_com.h:
Portability fixes
libmysql/net.c:
Portability fixes
libmysqld/lib_vio.c:
Portability fixes
mysql-test/r/drop.result:
Fix crashed tests
mysql-test/r/err000001.result:
Fix crashed tests
mysql-test/r/innodb.result:
Fix crashed tests
mysql-test/r/overflow.result:
Fix crashed tests
sql/net_serv.cc:
Use new my_net.h
vio/vio.c:
Use new my_net.h
vio/viosocket.c:
Use new my_net.h
vio/viossl.c:
Use new my_net.h
Docs/manual.texi:
Removed wrong web links
include/mysql_com.h:
Portability fix
libmysqld/Makefile.am:
Fix 'make dist'
mysys/mf_dirname.c:
Bugfix for last push
scripts/explain_log.sh:
Nicer output
scripts/mysql_install_db.sh:
Removed warnings when using 'mysql_install_db'
sql/sql_parse.cc:
Ensure that thd->query_length is always set
sql/sql_show.cc:
cleanup
sql/sql_yacc.yy:
Fix bug in last push
vio/vio.c:
Merge with violite.cc
vio/viosocket.c:
Merge with violite.cc
client/mysqltest.c:
Don't write error message to log if there is more than one possible error message
include/mysqld_error.h:
Made error messages more general
libmysqld/Makefile.am:
md5 is now in mysys
mysql-test/include/have_isam.inc:
Update to new result format
mysql-test/include/not_embedded.inc:
Update to new result format
mysql-test/mysql-test-run.sh:
Update to new result format
mysql-test/r/auto_increment.result:
Update to new result format
mysql-test/r/count_distinct2.result:
Update to new result format
mysql-test/r/create.result:
Update to new result format
mysql-test/r/func_system.result:
Update to new result format
mysql-test/r/isam.result:
Update to new result format
mysql-test/r/lock.result:
Update to new result format
mysql-test/r/lock_multi.result:
Update to new result format
mysql-test/r/rename.result:
Update to new result format
mysql-test/r/rpl000001.result:
Fix wrong test
mysql-test/r/tablelock.result:
Update to new result format
mysql-test/t/rename.test:
Update to new result format
sql/share/czech/errmsg.txt:
Made error messages more general
sql/share/danish/errmsg.txt:
Made error messages more general
sql/share/dutch/errmsg.txt:
Made error messages more general
sql/share/english/errmsg.txt:
Made error messages more general
sql/share/estonian/errmsg.txt:
Made error messages more general
sql/share/french/errmsg.txt:
Made error messages more general
sql/share/german/errmsg.txt:
Made error messages more general
sql/share/greek/errmsg.txt:
Made error messages more general
sql/share/hungarian/errmsg.txt:
Made error messages more general
sql/share/italian/errmsg.txt:
Made error messages more general
sql/share/japanese/errmsg.txt:
Made error messages more general
sql/share/korean/errmsg.txt:
Made error messages more general
sql/share/norwegian-ny/errmsg.txt:
Made error messages more general
sql/share/norwegian/errmsg.txt:
Made error messages more general
sql/share/polish/errmsg.txt:
Made error messages more general
sql/share/portuguese/errmsg.txt:
Made error messages more general
sql/share/romanian/errmsg.txt:
Made error messages more general
sql/share/russian/errmsg.txt:
Made error messages more general
sql/share/slovak/errmsg.txt:
Made error messages more general
sql/share/spanish/errmsg.txt:
Made error messages more general
sql/share/swedish/errmsg.txt:
Made error messages more general
sql/share/ukrainian/errmsg.txt:
Made error messages more general
sql/sql_lex.cc:
We can't remove lex->thd because sql_yacc uses it.
sql/sql_lex.h:
We can't remove lex->thd because sql_yacc uses it.
sql/sql_yacc.yy:
Cleanup
support-files/mysql.spec.sh:
Create MySQL-embedded rpm
tools/mysqlmanager.c:
Fix bug in merge
BitKeeper/etc/ignore:
auto-union
acinclude.m4:
Auto merged
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/count_distinct2.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
libmysqld/Makefile.am:
Added back md5.c
Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version. All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86
BitKeeper/deleted/.del-mf_pack2.c~f07795bbcf57be7:
Delete: mysys/mf_pack2.c
Docs/manual.texi:
Updated chapter about embedded version
acinclude.m4:
Fix for using BDB and InnoDB with embedded
client/completion_hash.cc:
Speed up memory allocation
client/completion_hash.h:
Speed up memory allocation
client/mysql.cc:
Speed up memory allocation
client/mysqldump.c:
Fix to use now convert_dirname
client/mysqltest.c:
Fixed memory allocation bugs.
Added --basedir=#, --compress=#, --server-arg, --server-file.
Fixes for embedded version
Changed silent mode to -s instead of -q
include/my_global.h:
Update to use HAVE_ISAM
include/my_sys.h:
Cleanup of fn_format()
include/mysql.h:
Prepare FIELD struct for 4.1
include/mysql_embed.h:
Don't use ISAM in embedded version
innobase/include/srv0srv.h:
Make InnoDB startup/shutdown silent in embedded version
innobase/log/log0log.c:
Make InnoDB startup/shutdown silent in embedded version
innobase/srv/srv0srv.c:
Make InnoDB startup/shutdown silent in embedded version
innobase/srv/srv0start.c:
Make InnoDB startup/shutdown silent in embedded version
isam/isamlog.c:
new convert_dirname
libmysql/libmysql.c:
Prepare for 4.1
libmysqld/Makefile.am:
Changed to create one libmysqld.a file that includes all other libraries.
libmysqld/examples/Makefile.am:
Changed to use new libmysqld.a
libmysqld/examples/test-run:
Lot's of fixes to get new mysqltest with embedded MySQL to work.
libmysqld/lib_sql.cc:
Changed type of arguments for mysql_server_init() to make code more portable.
libmysqld/libmysqld.c:
Cleanup
merge/Makefile.am:
Rename to use common prefix.
merge/mrg_close.c:
Rename to use common prefix.
merge/mrg_create.c:
Rename to use common prefix.
merge/mrg_def.h:
Rename to use common prefix.
merge/mrg_delete.c:
Rename to use common prefix.
merge/mrg_extra.c:
Rename to use common prefix.
merge/mrg_info.c:
Rename to use common prefix.
merge/mrg_locking.c:
Rename to use common prefix.
merge/mrg_open.c:
Rename to use common prefix.
merge/mrg_panic.c:
Rename to use common prefix.
merge/mrg_rrnd.c:
Rename to use common prefix.
merge/mrg_rsame.c:
Rename to use common prefix.
merge/mrg_static.c:
Rename to use common prefix.
merge/mrg_update.c:
Rename to use common prefix.
myisam/myisamlog.c:
Use new convert_dirname
myisammrg/Makefile.am:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_close.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_create.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_def.h:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_delete.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_extra.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_info.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_locking.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_open.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_panic.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_queue.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rfirst.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rkey.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rlast.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rnext.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rprev.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rrnd.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rsame.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_static.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_update.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_write.c:
Renamed mymrgdef.h -> myrg_def.h
mysql-test/include/master-slave.inc:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/mysql-test-run.sh:
cleanup
mysql-test/r/auto_increment.result:
Cleanup of tests for embedded version
mysql-test/r/func_system.result:
Cleanup of tests for embedded version
mysql-test/r/isam.result:
Cleanup of tests for embedded version
mysql-test/r/lock.result:
Cleanup of tests for embedded version
mysql-test/r/show_check.result:
Cleanup of tests for embedded version
mysql-test/t/auto_increment.test:
Cleanup of tests for embedded version
mysql-test/t/backup.test:
Cleanup of tests for embedded version
mysql-test/t/count_distinct2-master.opt:
Cleanup of tests for embedded version
mysql-test/t/count_distinct2.test:
Cleanup of tests for embedded version
mysql-test/t/create.test:
Cleanup of tests for embedded version
mysql-test/t/flush.test:
Cleanup of tests for embedded version
mysql-test/t/func_system.test:
Cleanup of tests for embedded version
mysql-test/t/isam.test:
Cleanup of tests for embedded version
mysql-test/t/kill.test:
Cleanup of tests for embedded version
mysql-test/t/lock.test:
Cleanup of tests for embedded version
mysql-test/t/order_fill_sortbuf-master.opt:
Cleanup of tests for embedded version
mysql-test/t/rpl000015.test:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000016.test:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000017.test:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000018.test:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/show_check.test:
Move ISAM specific tests to isam.test
mysql-test/t/status.test:
Cleanup of tests for embedded version
mysql-test/t/tablelock.test:
Cleanup
mysys/Makefile.am:
Removed not used mf_pack2.c
mysys/charset.c:
new convert_dirname
mysys/default.c:
new convert_dirname
mysys/mf_dirname.c:
Changed convert_dirname() to be more general
mysys/mf_format.c:
Changed bit flags to fn_format() to defines.
Added handling of relative filenames
BitKeeper/etc/ignore:
Added libmysqld/examples/test-gdbinit scripts/mysql_explain_log to the ignore list
mysys/mf_pack.c:
new convert_dirname
mysys/mf_tempfile.c:
new convert_dirname
scripts/Makefile.am:
Adde mysql_explain_log
scripts/mysql_config.sh:
Added support of --libmysqld-libs
sql/Makefile.am:
Fix to use 'innodb_system_libs'
sql/ha_innobase.cc:
Make InnoDB startup/shutdown silent in embedded version
sql/ha_isam.cc:
Added handling of HAVE_ISAM
sql/ha_isammrg.cc:
Added handling of HAVE_ISAM
sql/ha_myisam.cc:
Handle relative paths; Needed to support BACKUP TABLE in embedded version
sql/ha_myisammrg.cc:
Rename of filenames
sql/handler.cc:
Added handling of HAVE_ISAM
sql/item_func.cc:
Fix for ecc (Intel Compiler)
sql/mysql_priv.h:
Added global variable 'mysql_embedded'
sql/mysqld.cc:
Use HAVE_ISAM
sql/sql_parse.cc:
Use new convert_dirname
sql/sql_select.cc:
Fix for ecc (Intel Compiler)
sql/sql_table.cc:
Added handling of relative filenames
strings/Makefile.am:
Don't compile both assembler and C functions on x86
strings/bchange.c:
cleanup
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
Docs/manual.texi:
Auto merged
client/mysqladmin.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_lex.cc:
SCCS merged
mysql-test/t/rpl000001.test:
test for coredump on slave while trying to print aborted query
sql/slave.cc:
do not coredump printing aborted query if it has % in it.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
updated results - now ready to push
mysql-test/r/rpl000017.result:
fix for new test format
mysql-test/r/type_enum.result:
updated result
sql/mysqld.cc:
fixed freeing NULL pointer
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
acinclude.m4:
SCCS merged
acinclude.m4:
automatically detect installation paths of OpenSSL instead of hard-coding
automatically enable --with-vio if --with-openssl is enabled
client/mysqltest.c:
fixes for embedded library
libmysqld/Makefile.am:
md5 is now in mysys
libmysqld/libmysqld.c:
added my_connect(), but now can be removed - will do in the next
changeset
mysql-test/include/have_bdb.inc:
disable query log so that result file will not have unneeded
show variables
mysql-test/include/have_gemini.inc:
disable query log so that result file will not have unneeded
show variables
mysql-test/include/have_innodb.inc:
disable query log so that result file will not have unneeded
show variables
mysql-test/include/have_openssl.inc:
disable query log so that result file will not have unneeded
show variables
mysql-test/include/have_openssl_1.inc:
disable query log so that result file will not have unneeded
show variables
mysql-test/include/have_openssl_2.inc:
disable query log so that result file will not have unneeded
show variables
mysql-test/r/bdb.result:
fix for new format
mysql-test/r/have_openssl.require:
ssl->openssl
mysql-test/r/innodb.result:
fix for query logging
Portability fixes.
Handle cleanup when we get an error before the message file is read.
Fix bug in multi-table delete
include/mysql.h:
Portability fix
mysql-test/mysql-test-run.sh:
Don't use long names for sockets (portability fix)
sql/derror.cc:
Better cleanup
sql/mysqld.cc:
Fix that --enable-locking works.
Handle case when we get an error before the message file is read
sql/sql_delete.cc:
Fix bug in multi-table delete
sql/sql_select.cc:
Fix bug in multi-table delete
sql/table.h:
Fix bug in multi-table delete
tools/mysqlmanager.c:
Portability fixes
Fix that compressed packets and normal packets looks indentical before calling net_real_write()
(Needed for query cache)
Optimize IS NULL handling
Build-tools/Do-compile:
Fix for machines with clocks in an earlier timezone
Docs/manual.texi:
Fixed typo
acinclude.m4:
Fixed typo
client/mysqlbinlog.cc:
Cleanup
client/mysqltest.c:
Added --compress to test the compressed protocol
configure.in:
Increment shared library number (because structs changed)
include/mysql.h:
Optimize structs for Ia64
include/mysql_com.h:
Optimize structs for Ia64
libmysql/libmysql.c:
Portability fixes
libmysql/net.c:
Fix that compressed packets and normal packets looks indentical before calling net_real_write()
(Needed for query cache)
libmysqld/examples/Makefile.am:
Portability fix
libmysqld/libmysqld.c:
Portability fixes
mysql-test/mysql-test-run.sh:
Added --compress to test the compressed protocol
mysql-test/t/type_enum.test:
A
mysys/mf_casecnv.c:
Portability fixes
mysys/mf_tempfile.c:
Portability fixes
scripts/make_binary_distribution.sh:
Add libmysqld to binary distribution
sql-bench/server-cfg.sh:
Fix for Interbase
sql/item.h:
Optimize IS NULL handling
sql/item_cmpfunc.cc:
Optimize IS NULL handling
sql/item_cmpfunc.h:
Optimize IS NULL handling
sql/item_func.cc:
cleanup
sql/item_func.h:
Optimize IS NULL handling
sql/mysql_priv.h:
c
sql/net_serv.cc:
Fix that compressed packets and normal packets looks indentical before calling net_real_write()
(Needed for query cache)
client/Makefile.am:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
sql/lex.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
instrumented the server with DBUG_SYNC_POINT() macro
mysql-test/t/rpl_log.test:
no change
sql/item_func.cc:
debug_sync_point()
sql/log_event.cc:
clead load data file tmpdir on slave on start/stop events
sql/mysql_priv.h:
DBUG_SYNC_POINT
sql/sql_repl.cc:
DBUG_SYNC_POINT in Create_file_event
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
sql/mysqld.cc:
merge
Don't give an error even if one uses master-ssl options and SSL is
not used.
Build-tools/Do-compile:
Don't delete distribution if not using --delete
Docs/manual.texi:
Added information about default values
mysql-test/t/rpl000017.test:
Fixed replication test to be more portable
mysys/mf_iocache2.c:
More comments
sql/item_sum.cc:
Cleanup
sql/log_event.cc:
Cleanup
sql/mysqld.cc:
Fixed typos in output
sql/sql_base.cc:
Cleanup
sql/sql_delete.cc:
Cleanup
sql/sql_select.cc:
Cleanup
sql/uniques.cc:
Portability fix
BitKeeper/etc/logging_ok:
auto-union
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
myisam/mi_check.c:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
strings/strmake.c:
Auto merged
mysql-test/t/rpl000017-slave.sh:
Auto merged
Made replication test portable
Fixed buffer overrun bug in replication
client/Makefile.am:
Fix for make dist
mysql-test/t/rpl000017-slave.sh:
Made replication test portable
sql/slave.cc:
Fixed buffer overrun bug
strings/strmake.c:
More documentation
Fixed some problems in SHOW CREATE TABLE
Fixed calculation of checksums in myisamchk
Docs/manual.texi:
ChangelogWh
client/mysql.cc:
Added comment
myisam/mi_check.c:
Fixed calcualtion of checksums
sql/sql_insert.cc:
Fixed bug in INSERT DELAYED
sql/sql_show.cc:
Fixed some problems in SHOW CREATE TABLE
Fixes for embedded server
Made key_cache more configurable
Fixed that one can change key blocksize in MyISAM
A lot of optimizations to make MyISAM slightly faster
Docs/manual.texi:
Cleaned up SSL documentation
client/mysql.cc:
Fixes for embedded server
client/mysqltest.c:
Fixes for embedded server
Removed memory and file leaks
include/my_global.h:
Added C_MODE_START / C_MODE_END macros
include/my_sys.h:
Made key_cache more configurable
include/myisam.h:
Fixed that one can change MyISAM key block size
include/mysql.h:
Fixes for embedded server
libmysql/libmysql.c:
Cleanup
libmysqld/Makefile.am:
Cleanup
libmysqld/examples/test-run:
Added --debug
libmysqld/lib_sql.cc:
Cleanup
libmysqld/libmysqld.c:
Cleanup
myisam/ft_boolean_search.c:
Optimized mi_key_cmp to be faster
myisam/ft_nlq_search.c:
Optimized mi_key_cmp to be faster
myisam/ft_search.c:
Optimized mi_key_cmp to be faster
myisam/mi_changed.c:
Optimized mi_key_cmp to be faster
myisam/mi_check.c:
Optimized mi_key_cmp to be faster
myisam/mi_create.c:
Fixed that one can change blocksize by changing myisam_block_size
myisam/mi_delete.c:
Optimized mi_key_cmp to be faster
myisam/mi_delete_all.c:
Optimized mi_key_cmp to be faster
myisam/mi_dynrec.c:
Speed optimizations
myisam/mi_info.c:
Speed optimizations
myisam/mi_key.c:
Speed optimizations
myisam/mi_locking.c:
Speed optimizations
myisam/mi_open.c:
Fixed that one can change blocksize by changing myisam_block_size
myisam/mi_page.c:
Fixed that one can change blocksize by changing myisam_block_size
myisam/mi_range.c:
Speed optimizations
myisam/mi_rkey.c:
Speed optimizations
myisam/mi_rnext.c:
Speed optimizations
myisam/mi_rnext_same.c:
Speed optimizations
myisam/mi_rprev.c:
Speed optimizations
myisam/mi_rsame.c:
Speed optimizations
myisam/mi_search.c:
Speed optimizations
myisam/mi_static.c:
Fixed that one can change blocksize by changing myisam_block_size
myisam/mi_statrec.c:
Speed optimizations
myisam/mi_test2.c:
Added more test options
myisam/mi_test_all.res:
Added more test options
myisam/mi_test_all.sh:
Added more test options
myisam/mi_write.c:
Speed optimizations
myisam/myisamchk.c:
Added options to change block size and repair checksums
myisam/myisamdef.h:
Speed optimizations
mysys/Makefile.am:
Added bit handling functions
mysys/mf_keycache.c:
Made key_cache more configurable
mysys/my_init.c:
made my_init_done global
scripts/mysql_fix_privilege_tables.sh:
Fixes for SSL
scripts/mysql_install_db.sh:
Fixes for SSL
sql/derror.cc:
Don't call exit, call unireg_abort()
sql/item_cmpfunc.cc:
Speed optimizations
sql/item_cmpfunc.h:
Speed optimizations
sql/mysql_priv.h:
Fixes for embedded server
sql/mysqld.cc:
Fixes for embedded server
