summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Don't depend on mit-pthreads include files when building libmysqld.aunknown2001-10-094-9/+40
| | | | | | | | | | | BUILD/compile-pentium-pgcc: Update to 4.0 Docs/manual.texi: Added info about --with-embedded-server libmysqld/Makefile.am: Don't depend on mit-pthreads include files tools/mysqlmanager.c: Remove warnings
* type fixunknown2001-10-091-1/+1
| | | | | vio/viossl.c: Don't blame me. Typo fix
* Merge work:/home/bk/mysql-4.0unknown2001-10-0820-283/+118
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * One should not only have to include my_net.h to work with sockets.unknown2001-10-0917-160/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Portability fixes + a couple of bug fixes introduced by last push.unknown2001-10-0811-140/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | fixed error messagesunknown2001-10-084-5/+5
| | | | | | | | | | | | | | | | | | | | | | mysql-test/r/drop.result: error msg fix mysql-test/r/err000001.result: error msg fix mysql-test/r/innodb.result: error msg fix mysql-test/r/overflow.result: error msg fix
* | Merge work:/home/bk/mysql-4.0unknown2001-10-084-4/+28
|\ \ | |/ |/| | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0 mysql-test/mysql-test-run.sh: Auto merged sql/mysqld.cc: Auto merged
| * groundbreaking on fail-safe replication - added a token feature to have anunknown2001-10-084-4/+28
| | | | | | | | | | | | | | | | | | | | excuse to have a test case. Mental trick to get things moving faster... mysql-test/mysql-test-run.sh: recovery rank sql/mysqld.cc: recovery rank
* | Portability fixunknown2001-10-081-0/+3
| |
* | Cleanup after last mergeunknown2001-10-0844-140/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | mergeunknown2001-10-08118-820/+1793
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Updated manual about embedded version.unknown2001-10-08114-742/+1340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | New script: explain_log.shunknown2001-10-049-48/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Mergeunknown2001-10-074-35/+59
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix for 'mysqladmin -w1 unknown-command'unknown2001-10-076-39/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual Changelog update Docs/manual.texi: Changelog client/mysqladmin.c: Fix for 'mysqladmin -w1 unknown-command' libmysql/violite.c: Fix for TCP_NODELAY mysql-test/mysql-test-run.sh: Portability fixes sql/sql_lex.cc: Cleanup sql/sql_lex.h: Cleanup
* | | | Merge work.mysql.com:/home/bk/mysqlunknown2001-10-072-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into work.mysql.com:/home/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union mysql-test/t/rpl000017.test: Auto merged sql/slave.cc: Auto merged
| * | | fixed crash on slave when master aborts a query that has % in it.unknown2001-10-053-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Portability fixunknown2001-10-031-0/+1
| | | |
* | | | SSL fixunknown2001-10-051-1/+1
| |_|/ |/| | | | | | | | | | | acinclude.m4: When libssl.so was installed from RPM and libssl.a from source libssl.a detection worked properly. Fixed.
* | | fixed bug in SSL codeunknown2001-10-043-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Mergeunknown2001-10-0435-605/+403
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Applied a patch for mysqldumpunknown2001-10-041-27/+68
| | | | | | | | | | | | | | | | | | client/mysqldump.c: Applied patch from Brian Aker. Changed rest of the '#' -comment marks to '--' for portability reasons.
| * | manual.texi change notes cleanupunknown2001-10-041-6/+7
| | | | | | | | | | | | | | | Docs/manual.texi: change notes cleanup
| * | Fix mmanual nodesunknown2001-10-041-2/+2
| | | | | | | | | | | | | | | Docs/manual.texi: Fix nodes
| * | Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0unknown2001-10-0435-533/+288
| |\ \ | | | | | | | | | | | | | | | | Docs/manual.texi: Auto merged
| | * \ Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0unknown2001-10-046-47/+53
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Auto merged Build-tools/Do-compile: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/mysqld.cc: Auto merged
| | * | | Fixed some build problems.unknown2001-10-0426-469/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * | | Portability fixes.unknown2001-10-0311-65/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | conflict fixedunknown2001-10-03174-1843/+2679
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge jcole@work.mysql.com:/home/bk/mysql-4.0unknown2001-09-271-43/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into tetra.spaceapes.com:/home/jcole/bk/mysql-4.0 Docs/manual.texi: Auto merged
| | * | | | Fixes to manual.texi to make XML happy.unknown2001-09-271-43/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Fixes to make XML happy.
* | | | | | changes to make things work in the max versionunknown2001-10-0413-13/+1116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | forced addition of manager.cunknown2001-10-031-0/+308
| | | | | |
* | | | | | post-merge fixesunknown2001-10-0313-16/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/fix-result: version update mysql-test/r/bigint.result: post-merge fix mysql-test/r/join.result: post-merge fix mysql-test/r/merge.result: post-merge fix mysql-test/r/null_key.result: post-merge fix mysql-test/r/rpl000002.result: post-merge fix mysql-test/r/rpl000015.result: post-merge fix mysql-test/r/rpl000016.result: post-merge fix mysql-test/r/rpl_log.result: post-merge fix mysql-test/r/show_check.result: post-merge fix mysql-test/t/rpl000002.test: post-merge fix mysql-test/t/rpl000015.test: post-merge fix mysql-test/t/rpl000016.test: post-merge fix
* | | | | | mergedunknown2001-10-03168-1846/+2450
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | mergeunknown2001-10-036-48/+54
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysqlunknown2001-10-032-0/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Auto merged
| | | * | | Cleanup between compilationsunknown2001-10-032-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Cleanups BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | | | Added usage of --master-retry-count to make mysql-test-run safer.unknown2001-10-036-43/+53
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Remove --no-delete Docs/manual.texi: Udated IA64 section mysql-test/mysql-test-run.sh: Added usage of --master-retry-count set LD_LIBRARY_PATH sql/mysqld.cc: Added master-retry-count (needed by mysql-test-run) sql/slave.cc: Added master-retry-count Don't write same error to log on retry sql/slave.h: Added master-retry-count (needed by mysql-test-run)
| | * | | Portability fixunknown2001-10-021-3/+1
| | | | |
| * | | | mergeunknown2001-10-027-13/+44
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Fix for make distunknown2001-10-024-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysqlunknown2001-10-025-18/+35
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Auto merged
| | | * | | Fixed bug in INSERT DELAYEDunknown2001-10-025-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | three column types (added to parser - but not to the manual - long time ago) ↵unknown2001-10-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | documented
| | * | | | Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysqlunknown2001-09-2811-41/+79
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Auto merged
| | | * | | | manual.texi typosunknown2001-09-281-3/+3
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: typos
| | * | | | manual cleanupsunknown2001-09-262-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: cleanups BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | | mergeunknown2001-10-022-33/+32
| |\ \ \ \ \
| | * \ \ \ \ Merge arjen@work.mysql.com:/home/bk/mysql-4.0unknown2001-10-022-23/+28
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into fred.:c:/home/mysql-4.0 Docs/manual.texi: Auto merged