summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* LOAD DATA INFILE is now replicated properly, except for cleanup on unknown2001-08-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop event and bugs the test suite could not catch Did some big restructuring of binlog event classes - most important change is that now each event class has exec_event method and one does not need to modify slave core code to add a new event. Slave code is now much smaller and easier to read include/my_sys.h: pre_code and arg in IO_CACHE mysql-test/r/rpl_log.result: updated result for LOAD DATA INFILE fix mysys/mf_iocache.c: pre_close routine and arg pointer for callback magic sql/log.cc: changed MYSQL_LOG so that write() method is for generic Log_event - removed redundant code sql/log_event.cc: added classes for file events added exec_event() method to all classes restructured/cleaned up event classes sql/log_event.h: added classes for file events added exec_event() method to all classes restructured/cleaned up event classes sql/mf_iocache.cc: pre_close/arg sql/mysqld.cc: added slave-load-tmpdir and old-rpl-compat options sql/slave.cc: changed exec_event() to use Log_event::exec_event() some routines are now needed in log_event.cc and cannot be static/inline general cleanup sql/slave.h: some routines are now extern because they are called from log_event.cc sql/sql_class.cc: added slave_net sql/sql_class.h: added slave_net to THD MYSQL_LOG::write now handles generic Log_event sql/sql_load.cc: changes for new handling of LOAD DATA INFILE replication sql/sql_repl.cc: added log_loaded_block() callback for IO_CACHE sql/sql_repl.h: added structure to pass args to IO_CACHE callback from mysql_load
* Merge work.mysql.com:/home/bk/mysql-4.0unknown2001-07-242-9/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | into x153.internalnet:/home/tonu/mysql-x BitKeeper/etc/logging_ok: auto-union sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged libmysql/libmysql.c: Auto merged
| * OpenSSL fixes. Should not affect anything else.unknown2001-07-242-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile.am: Moved bio dir into server_dirs in acinclude.in client/Makefile.am: We need OpenSSL includes here include/global.h: Workaround for OPENSSL librar bug with defining crypt() include/violite.h: small fixes libmysql/Makefile.am: We need OpenSSL includes here libmysql/Makefile.shared: Yes, we need to compile more programs whtn --with-openssl is used libmysql/libmysql.c: Make it work! (openssl) libmysql_r/Makefile.am: We need OpenSSL includes here sql/mysqld.cc: Memory was not freed before sql/sql_parse.cc: fix vio/Makefile.am: Added testprogram compilation and openssl libraries linking vio/viossl.c: Cleanups, fixes, etc... vio/viosslfactories.c: Copyright was missing. Fixed renamed macros for newer OpenSSL vio/viotest-ssl.c: Made testprogram work again BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | mergedunknown2001-07-201-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged myisam/mi_check.c: Auto merged myisam/myisamchk.c: Auto merged mysql-test/t/rpl_sporadic_master.test: Auto merged sql/Makefile.am: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_update.cc: Auto merged
| * \ mergeunknown2001-07-181-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myisam/mi_check.c: Auto merged myisam/myisamchk.c: Auto merged sql/mysqld.cc: Auto merged mysql-test/t/bdb.test: Auto merged sql/slave.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_update.cc: Auto merged configure.in: New version
| | * | Upgrade TL_WRITE_CONCURRENT_INSERT to TL_WRITE_LOW_PRIORITY ifunknown2001-07-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --low-priority-updates is used and the file has holes. Docs/manual.texi: Changelog sql/sql_insert.cc: Fixed that sleeptime is 0 for new insert delayed threads.
| | * | fixed drop/create database bug when holding global read lockunknown2001-06-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preserve originating server id in Intvar events to avoid inifinite loops include/mysqld_error.h: new error messages mysql-test/r/drop.result: updated result mysql-test/r/flush.result: updated result mysql-test/t/drop.test: test for proper handling of drop/create database when holding global read lock mysql-test/t/flush.test: test to see if other thread would block on drop database if we are holding global read lock sql/log.cc: preserve originating server id in Intvar log event sql/share/czech/errmsg.txt: new error messages sql/share/danish/errmsg.txt: new error messages sql/share/dutch/errmsg.txt: new error messages sql/share/english/errmsg.txt: new error messages sql/share/estonian/errmsg.txt: new error messages sql/share/french/errmsg.txt: new error messages sql/share/german/errmsg.txt: new error messages sql/share/greek/errmsg.txt: new error messages sql/share/hungarian/errmsg.txt: new error messages sql/share/italian/errmsg.txt: new error messages sql/share/japanese/errmsg.txt: new error messages sql/share/korean/errmsg.txt: new error messages sql/share/norwegian-ny/errmsg.txt: new error messages sql/share/norwegian/errmsg.txt: new error messages sql/share/polish/errmsg.txt: new error messages sql/share/portuguese/errmsg.txt: new error messages sql/share/romanian/errmsg.txt: new error messages sql/share/russian/errmsg.txt: new error messages sql/share/slovak/errmsg.txt: new error messages sql/share/spanish/errmsg.txt: new error messages sql/share/swedish/errmsg.txt: new error messages sql/slave.cc: fixed typo in comment sql/sql_db.cc: global read lock should block drop/create database
* | | | added pre/post read callbacks to IO_CACHEunknown2001-07-201-0/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #ifdefed out code not used in the server from log events started on new LOAD DATA INFILE events include/my_sys.h: added pre/post read callbacks to IO_CACHe mysys/mf_iocache.c: pre/post read callbacks sql/log_event.cc: cleanup to #ifdef out unneeded code in the server started work on new Load data infile events sql/log_event.h: clean-up plus start of new LOAD DATA INFILE events work sql/mf_iocache.cc: pre/post read callbacks sql/sql_class.cc: file_id sql/sql_class.h: file_id
* | | Redefinition of myisam_bulk_insert_tree_sizeunknown2001-07-102-50/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed new error message Fixed test case for varbinary Threads are again killable in "merge_buffers" Cleanup of sql_repl.cc SHOW OPEN TABLES now works when no tables are opened Docs/manual.texi: Redefinition of myisam_bulk_insert_tree_size client/insert_test.c: Changed to use mysql_real_connect() include/mysql.h: Moved things in mysql_options to optimize these for 64 bit processors include/mysqld_error.h: Removed new error message myisam/mi_write.c: Use myisam_bulk_insert_tree_size per table instead of per index mysql-test/t/varbinary.test: Fixed test case for varbinary mysys/tree.c: Fixed missing if sql/filesort.cc: Threads are again killable in "merge_buffers" sql/log_event.h: cleanup sql/share/czech/errmsg.txt: Removed new error message sql/share/danish/errmsg.txt: Removed new error message sql/share/dutch/errmsg.txt: Removed new error message sql/share/english/errmsg.txt: Removed new error message sql/share/estonian/errmsg.txt: Removed new error message sql/share/french/errmsg.txt: Removed new error message sql/share/german/errmsg.txt: Removed new error message sql/share/greek/errmsg.txt: Removed new error message sql/share/hungarian/errmsg.txt: Removed new error message sql/share/italian/errmsg.txt: Removed new error message sql/share/japanese/errmsg.txt: Removed new error message sql/share/korean/errmsg.txt: Removed new error message sql/share/norwegian-ny/errmsg.txt: Removed new error message sql/share/norwegian/errmsg.txt: Removed new error message sql/share/polish/errmsg.txt: Removed new error message sql/share/portuguese/errmsg.txt: Removed new error message sql/share/romanian/errmsg.txt: Removed new error message sql/share/russian/errmsg.txt: Removed new error message sql/share/slovak/errmsg.txt: Removed new error message sql/share/spanish/errmsg.txt: Removed new error message sql/share/swedish/errmsg.txt: Removed new error message sql/sql_class.h: Cleanup sql/sql_delete.cc: Cleanup sql/sql_repl.cc: Cleanup sql/sql_show.cc: SHOW OPEN TABLES now works when no tables are opened sql/sql_sort.h: Threads are again killable in "merge_buffers" sql/uniques.cc: Threads are again killable in "merge_buffers"
* | | Merge work:/home/bk/mysql-4.0unknown2001-07-041-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
| * | | SHOW NEW MASTER FOR SLAVE WITH ...unknown2001-07-041-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/mysqld_error.h: new error message mysql-test/r/rpl_log.result: updated results mysql-test/t/rpl_log.test: test show new master for slave sql/lex.h: show new master for slave sql/share/czech/errmsg.txt: new error sql/share/danish/errmsg.txt: new error sql/share/dutch/errmsg.txt: new error sql/share/english/errmsg.txt: new error sql/share/estonian/errmsg.txt: new error sql/share/french/errmsg.txt: new error sql/share/german/errmsg.txt: new error sql/share/greek/errmsg.txt: new error sql/share/hungarian/errmsg.txt: new error sql/share/italian/errmsg.txt: new error sql/share/japanese/errmsg.txt: new error sql/share/korean/errmsg.txt: new error sql/share/norwegian-ny/errmsg.txt: new error sql/share/norwegian/errmsg.txt: new error sql/share/polish/errmsg.txt: new error sql/share/portuguese/errmsg.txt: new error sql/share/romanian/errmsg.txt: new error sql/share/russian/errmsg.txt: new error sql/share/slovak/errmsg.txt: new error sql/share/spanish/errmsg.txt: new error sql/share/swedish/errmsg.txt: new error sql/sql_lex.h: show new master for slave sql/sql_parse.cc: show new master for slave sql/sql_repl.cc: show new master for slave sql/sql_repl.h: show new master for slave sql/sql_yacc.yy: show new master for slave
* | | mergedunknown2001-07-0211-316/+278
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_base.h: Auto merged include/myisam.h: Auto merged myisam/mi_open.c: Auto merged myisam/myisamdef.h: Auto merged myisam/myisampack.c: Auto merged mysql-test/t/alter_table.test: Auto merged mysys/tree.c: Auto merged sql/ha_myisam.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_table.cc: Auto merged
| * | merged new 3.23 errorsunknown2001-06-221-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed bugs in log seq - now starting to look good fixes for SHOW BINLOG EVENTS will push this one include/mysqld_error.h: merged errors from 3.23 mysql-test/mysql-test-run.sh: wrong quotes in --skip-test mysql-test/r/drop.result: updated test mysql-test/r/rpl_log.result: updated test mysql-test/t/drop.test: updated test mysql-test/t/rpl_log.test: fixed bugs in test case sql/item_sum.h: remove compiler warning about re-ordered initialization sql/log.cc: fixed a bunch of loq_seq bugs sql/log_event.cc: fixed log seq bugs, added info for Slave event in SHOW BINLOG EVENTS sql/share/czech/errmsg.txt: merged errors from 3.23 sql/share/danish/errmsg.txt: merged errors from 3.23 sql/share/dutch/errmsg.txt: merged errors from 3.23 sql/share/english/errmsg.txt: merged errors from 3.23 sql/share/estonian/errmsg.txt: merged errors from 3.23 sql/share/french/errmsg.txt: merged errors from 3.23 sql/share/german/errmsg.txt: merged errors from 3.23 sql/share/greek/errmsg.txt: merged errors from 3.23 sql/share/hungarian/errmsg.txt: merged errors from 3.23 sql/share/italian/errmsg.txt: merged errors from 3.23 sql/share/japanese/errmsg.txt: merged errors from 3.23 sql/share/korean/errmsg.txt: merged errors from 3.23 sql/share/norwegian-ny/errmsg.txt: merged errors from 3.23 sql/share/norwegian/errmsg.txt: merged errors from 3.23 sql/share/polish/errmsg.txt: merged errors from 3.23 sql/share/portuguese/errmsg.txt: merged errors from 3.23 sql/share/romanian/errmsg.txt: merged errors from 3.23 sql/share/russian/errmsg.txt: merged errors from 3.23 sql/share/slovak/errmsg.txt: merged errors from 3.23 sql/share/spanish/errmsg.txt: merged errors from 3.23 sql/share/swedish/errmsg.txt: merged errors from 3.23 sql/slave.cc: fixed log_seq bugs
| * | added SHOW BINLOG EVENTSunknown2001-06-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed log sequence bugs fixed bugs in handling Slave event added test case with SHOW BINLOG EVENTS have not fixed all the bugs - found some that are also in 3.23, will fix them there first, then do pull and cleanup will not push this changeset include/mysqld_error.h: new error mysql-test/mysql-test-run.sh: use quotes in expr sql/lex.h: SHOW BINLOG EVENTS sql/log.cc: fixed log sequence bugs sql/log_event.cc: SHOW BINLOG EVENTS fixed bugs Slave event handling sql/log_event.h: SHOW BINLOG EVENTS sql/share/english/errmsg.txt: SHOW BINLOG EVENTS sql/sql_lex.h: SHOW BINLOG EVENTS sql/sql_parse.cc: SHOW BINLOG EVENTS sql/sql_repl.cc: SHOW BINLOG EVENTS sql/sql_repl.h: SHOW BINLOG EVENTS sql/sql_yacc.yy: SHOW BINLOG EVENTS
| * | Merge work:/home/bk/mysql-4.0unknown2001-06-082-4/+42
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0 mysql-test/mysql-test-run.sh: Auto merged client/mysqltest.c: Auto merged
| | * | auto-magic replication redirection logic support in the client,unknown2001-06-082-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compiles, passes test suite, does magic, has bugs, but none that I know at this point. Have not tested everything yet, though. Changed a lot of code in the client, but normal stuff appears to be working. BUILD/SETUP.sh: make sure client link statically client/mysqltest.c: new commands to test replication probe/parse include/errmsg.h: new error messages include/mysql.h: support for replication auto-magic libmysql/errmsg.c: new error messages libmysql/libmysql.c: replication probe/parse auto-magic mysql-test/mysql-test-run.sh: --client-gdb to run the client in debugger
| * | | Fixed compile-time warningsunknown2001-06-081-6/+8
| | | | | | | | | | | | | | | | | | | | vio/viossl.c: Fixed compile-time warnings by moving code around plus small fixes
| * | | Merge work:/my/mysql-4.0 into hundin.mysql.fi:/home/tim/mysql-4.0unknown2001-06-051-5/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | BitKeeper/etc/logging_ok: auto-union
| | * | violite.h Don't define st_vio if EMBEDDED_LIBRARY.unknown2001-06-051-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | include/violite.h: Don't define st_vio if EMBEDDED_LIBRARY. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Merge work:/home/bk/mysql-4.0unknown2001-06-041-5/+8
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
| | * | Merge mysql.sashanet.com:/home/sasha/src/bk/mysqlunknown2001-06-041-5/+8
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Auto merged mysql-test/r/innodb.result: Auto merged mysys/tree.c: Auto merged sql-bench/bench-init.pl.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql/mysqld.cc: Auto merged
| | | * Declare stpcpy() to fix portability problem on AIX with gcc 2.95.3unknown2001-06-031-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed problem with command line arguments on 64 bit machines when we use ~0 to indicate 'no limit' include/m_string.h: Declare stpcpy() to fix portability problem on AIX with gcc 2.95.3 mysys/getvar.c: Fixed problem on 64 bit machines when we use ~0 to indicate 'no limit'. sql-bench/Comments/postgres.benchmark: U
| * | | vio.c Vio code bugfixunknown2001-06-051-3/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | violite.h Code cleanup include/violite.h: Code cleanup vio/vio.c: Vio code bugfix
| * | some code for replication awareness support - this is a temporaryunknown2001-06-021-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit - it compiles, and test suite still passes, but it is not finished . The purpose of the commit is backup/code sharing/code review include/mysql.h: API prototypes for replication-aware client libmysql/libmysql.c: some code for replication awareness support
| * | mergeunknown2001-06-011-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union include/my_sys.h: Auto merged myisam/myisamchk.c: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/sql_table.cc: Auto merged
| | * Added --skip-symlinksunknown2001-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't force repair of tables that are not closed properly. Docs/manual.texi: Added information about symbolic links. include/my_sys.h: symbolic link support myisam/mi_check.c: Don't force repair of tables that are not closed properly. myisam/myisamchk.c: Version number change. mysys/my_static.c: symbolic link support mysys/my_symlink2.c: Disabling of symbolic link support sql/mysqld.cc: Disabling of symbolic link support
| * | Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0unknown2001-06-014-303/+161
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union include/my_sys.h: Auto merged libmysql/Makefile.shared: Auto merged sql/sql_parse.cc: Auto merged
| | * \ Merge work.mysql.com:/home/bk/mysqlunknown2001-06-011-0/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into work.mysql.com:/home/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Auto merged include/my_sys.h: Auto merged libmysql/Makefile.shared: Auto merged sql/slave.cc: Auto merged sql/sql_repl.cc: Auto merged
| | | * Added symlink support to mysys library.unknown2001-06-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Link info change include/my_sys.h: Added functions for symlink support libmysql/Makefile.shared: Added mf_symlink.c to library. mysys/Makefile.am: Added functions for symlink support mysys/mf_same.c: cleanup mysys/my_symlink.c: Added functions for symlink support
| | * | make vio compileunknown2001-05-312-281/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80: Delete: bdb/include/rpc_server_ext.h BitKeeper/deleted/.del-vio.h~c62fd2b86c03da7d: Delete: include/vio.h client/Makefile.am: Added libvio use include/mysql_com.h: Bugfix libmysql/net.c: mysql_com.h added to make it compile sql/mini_client.cc: mysql_com.h added to make it compile sql/mysql_priv.h: Changed place of inlude to make it compile. sql/net_serv.cc: mysql_com.h added to make it compile
| | * | Merge tonu@work.mysql.com:/home/bk/mysql-4.0unknown2001-05-312-22/+155
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/tonu/mysql-4.0 include/mysql_com.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged
| | | * | Support for VIO libraryunknown2001-05-312-22/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile.am: Added vio include/mysql_com.h: Removed ancient defines from Vio++ times include/violite.h: Added vio libmysql/Makefile.shared: Removed sqlobject line with violite.lo libmysql/libmysql.c: Openssl stuff & sons sql/Makefile.am: Added vio sql/mini_client.cc: Added vio sql/mysqld.cc: Added vio sql/net_serv.cc: Added vio sql/sql_parse.cc: Added vio vio/Makefile.am: Removed C++ stuff vio/vio.c: st_vio -> Vio vio/viosocket.c: st_vio -> Vio vio/viossl.c: st_vio -> Vio vio/viosslfactories.c: vio.h-> violite.h
| * | | | Added support for symlinked tables.unknown2001-06-011-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myisamchk: Don't force a repair if the only problem was that the open count wasn't correct. Added missing error messages. include/my_sys.h: Cleanup comments libmysql/Makefile.shared: Added symlink library. myisam/mi_check.c: Added support for symlinked tables myisam/mi_delete_table.c: Added support for symlinked tables myisam/mi_open.c: Added support for symlinked tables myisam/mi_rename.c: Added support for symlinked tables myisam/myisamchk.c: Added support for symlinked tables. Don't force a repair if the only problem was that the open count wasn't correct. pstack/bucomm.c: use mkstemp() instead of mytemp() sql/ha_myisam.cc: Added support for symlinked tables sql/ha_myisam.h: Added support for symlinked tables sql/ha_myisammrg.cc: Added support for symlinked tables sql/handler.cc: Added support for symlinked tables sql/handler.h: Added support for symlinked tables sql/lex.h: Added support for symlinked tables sql/share/czech/errmsg.txt: Added missing error messages sql/share/danish/errmsg.txt: Added missing error messages sql/share/dutch/errmsg.txt: Added missing error messages sql/share/estonian/errmsg.txt: Added missing error messages sql/share/french/errmsg.txt: Added missing error messages sql/share/german/errmsg.txt: Added missing error messages sql/share/greek/errmsg.txt: Added missing error messages sql/share/hungarian/errmsg.txt: Added missing error messages sql/share/italian/errmsg.txt: Added missing error messages sql/share/japanese/errmsg.txt: Added missing error messages sql/share/korean/errmsg.txt: Added missing error messages sql/share/norwegian-ny/errmsg.txt: Added missing error messages sql/share/norwegian/errmsg.txt: Added missing error messages sql/share/polish/errmsg.txt: Added missing error messages sql/share/portuguese/errmsg.txt: Added missing error messages sql/share/romanian/errmsg.txt: Added missing error messages sql/share/russian/errmsg.txt: Added missing error messages sql/share/slovak/errmsg.txt: Added missing error messages sql/share/spanish/errmsg.txt: Added missing error messages sql/share/swedish/errmsg.OLD: Added missing error messages sql/share/swedish/errmsg.txt: Added missing error messages sql/sql_db.cc: Added support for symlinked tables sql/sql_parse.cc: Added support for symlinked tables sql/sql_table.cc: Added support for symlinked tables with ALTER TABLE sql/sql_yacc.yy: Added option to create symlinked tables.
| * | | | Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0unknown2001-05-311-0/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union
| | * | | Removed compiler warnings.unknown2001-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added preliminary handling of symlinks in MyISAM. When using myisamchk to check tables with --force, don't repair tables that are marked as 'not closed' if they are ok. Change fn_format() to use my_real_path and my_symlink include/myisam.h: Added handling of symlinks myisam/ft_boolean_search.c: cleanup myisam/ft_dump.c: cleanup myisam/mi_check.c: Added handling of symlinks. When using check and --force, don't repair tables that are marked as 'not closed' if they are ok. myisam/mi_create.c: Added handling of symlinks. myisam/mi_dbug.c: Added handling of symlinks. myisam/mi_info.c: Added handling of symlinks. myisam/mi_open.c: Added handling of symlinks. myisam/mi_search.c: cleanup myisam/myisamchk.c: Added handling of symlinks. myisam/myisamdef.h: Added handling of symlinks. myisam/myisamlog.c: Fixed bug when using new trees myisam/myisampack.c: cleanup mysys/mf_cache.c: cleanup mysys/mf_format.c: Change to use my_real_path and my_symlink mysys/my_alloc.c: cleanup BitKeeper/etc/ignore: Added libmysqld/sql_command libmysqld/backup_dir libmysqld/simple-test to the ignore list BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | mergeunknown2001-05-314-4/+25
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Auto merged acinclude.m4: Auto merged configure.in: Auto merged Docs/manual.texi: Auto merged include/my_sys.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_table.cc: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | | Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysqlunknown2001-05-312-1/+18
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged Docs/manual.texi: Auto merged
| | | * | | Added functions for symbolic link handling to make it possible tounknown2001-05-312-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backport things from 4.0. This is safe as the functions are not used! Fixed bug in new mutex handling in InnoDB Make allow_break() and dont_break() defines. Docs/manual.texi: Remove -fomit-frame-pointer from default binaries configure.in: Use -lcma library on HPUX include/my_sys.h: Added functions for symbolic link handling to make it possible to backport things from 4.0. (This is safe as the functions are not used!) include/mysys_err.h: Error messages for symlink functions. innobase/include/sync0sync.ic: Fixed bug in new mutex handling mysys/Makefile.am: Symlink handling mysys/errors.c: Symlink handling mysys/mf_brkhant.c: Make allow_break() and dont_break() defines. sql/sql_select.h: Fix for Intel compiler. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | | | Pushing all the Gemini changes above the table handler.unknown2001-05-292-1/+5
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUILD/FINISH.sh: Add Gemini to configure Docs/manual.texi: Added Gemini content to the manual. acinclude.m4: Add Gemini to configure configure.in: Add Gemini to configure include/my_base.h: transaction isolation level READ UNCOMMITTED does not allow updates include/mysqld_error.h: Added new messages for Lock related failures sql/field.cc: Gemini BLOB support - sql/field.h: Gemini BLOB Support sql/ha_gemini.cc: Gemini Table handler sql/ha_gemini.h: Gemini Table handler sql/handler.cc: Added new messages for Lock related failures Provide the ability to turn off recovery for operations like REPAIR TABLE ans ALTER TABLE sql/handler.h: Add a bit to have full text indexes as an option and define the prototype to optionally turn on and off logging sql/lock.cc: Added new messages for Lock related failures sql/share/czech/errmsg.txt: Added new messages for Lock related failures sql/share/danish/errmsg.txt: Added new messages for Lock related failures sql/share/dutch/errmsg.txt: Added new messages for Lock related failures sql/share/english/errmsg.txt: Added new messages for Lock related failures sql/share/estonian/errmsg.txt: Added new messages for Lock related failures sql/share/french/errmsg.txt: Added new messages for Lock related failures sql/share/german/errmsg.txt: Added new messages for Lock related failures sql/share/greek/errmsg.txt: Added new messages for Lock related failures sql/share/hungarian/errmsg.txt: Added new messages for Lock related failures sql/share/italian/errmsg.txt: Added new messages for Lock related failures sql/share/japanese/errmsg.txt: Added new messages for Lock related failures sql/share/korean/errmsg.txt: Added new messages for Lock related failures sql/share/norwegian-ny/errmsg.txt: Added new messages for Lock related failures sql/share/norwegian/errmsg.txt: Added new messages for Lock related failures sql/share/polish/errmsg.txt: Added new messages for Lock related failures sql/share/portuguese/errmsg.txt: Added new messages for Lock related failures sql/share/romanian/errmsg.txt: Added new messages for Lock related failures sql/share/russian/errmsg.txt: Added new messages for Lock related failures sql/share/slovak/errmsg.txt: Added new messages for Lock related failures sql/share/spanish/errmsg.txt: Added new messages for Lock related failures sql/share/swedish/errmsg.txt: Added new messages for Lock related failures sql/sql_base.cc: Avoidlock table overflow issues when doing an alter table on Windows. This is Gemini specific. sql/sql_table.cc: Add a bit to have full text indexes as an option and define the prototype to optionally turn on and off logging BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | A slave now can optionally register with the master providing the unknown2001-05-301-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info on how to connect to the slave for the clients that connect to the master, but would like to know where the slaves are include/mysql_com.h: register slaves mysql-test/mysql-test-run.sh: parameters to test slave registration mysql-test/r/rpl000002.result: test of slave registration mysql-test/t/rpl000002.test: test slave registration sql/mysql_priv.h: slave registration sql/mysqld.cc: slave registration sql/slave.cc: slave registration sql/slave.h: slave registration sql/sql_lex.h: slave registration sql/sql_parse.cc: slave registration sql/sql_repl.cc: slave registration sql/sql_repl.h: slave registration sql/sql_yacc.yy: slave registration
| * | | updates for LOAD DATA FROM MASTER + some cleanup of replication codeunknown2001-05-281-1/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/mysqld_error.h: new errors mysql-test/r/rpl000009.result: test load data from master mysql-test/t/rpl000009.test: test load data from master sql/mini_client.cc: extra functionality needed for load data from master and other things sql/mini_client.h: addition to API sql/mysql_priv.h: mysql_create_db()/mysql_rm_db() now return a value sql/share/english/errmsg.txt: more error messages sql/slave.cc: cleanup of fetch_nx_table() sql/slave.h: cleanup of fetch_nx_table() sql/sql_base.cc: remove unused code originally written for retrieving a non-existent table in slave thread sql/sql_class.cc: remove unused replication variables sql/sql_class.h: remove unused replication variabled sql/sql_db.cc: make mysql_create_db()/mysql_rm_db() work with thd == 0 (do not write messages to the net) and instead return success/error sql/sql_lex.h: added SQLCOM_LOAD_MASTER_DATA sql/sql_parse.cc: LOAD MASTER DATA, cleanup of LOAD TABLE FROM MASTER sql/sql_repl.cc: LOAD DATA FROM MASTER sql/sql_repl.h: LOAD DATA FROM MASTER sql/sql_yacc.yy: LOAD DATA FROM MASTER
* | | memory-limited treeunknown2001-07-023-7/+13
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bulk inserts optimization: caching keys in binary tree include/my_base.h: bulk inserts optimization: caching keys in binary tree include/my_tree.h: memory-limited tree include/myisam.h: bulk inserts optimization: caching keys in binary tree isam/isamlog.c: memory-limited tree isam/pack_isam.c: memory-limited tree myisam/ft_boolean_search.c: memory-limited tree myisam/ft_nlq_search.c: memory-limited tree myisam/ft_parser.c: memory-limited tree myisam/ft_stopwords.c: memory-limited tree myisam/mi_extra.c: bulk inserts optimization: caching keys in binary tree myisam/mi_open.c: bulk inserts optimization: caching keys in binary tree myisam/mi_static.c: bulk inserts optimization: caching keys in binary tree myisam/mi_write.c: bulk inserts optimization: caching keys in binary tree myisam/myisamdef.h: bulk inserts optimization: caching keys in binary tree myisam/myisamlog.c: memory-limited tree myisam/myisampack.c: memory-limited tree mysql-test/mysql-test-run.sh: memory-limited tree mysql-test/t/alter_table.test: make it faster mysys/tree.c: memory-limited tree sql/ha_myisam.cc: bulk inserts optimization: caching keys in binary tree sql/item_sum.cc: memory-limited tree sql/mysqld.cc: bulk inserts optimization: caching keys in binary tree sql/sql_analyse.h: memory-limited tree sql/uniques.cc: memory-limited tree
* | Merge work:/home/bk/mysql-4.0 into donna.mysql.fi:/home/my/bk/mysql-4.0unknown2001-05-231-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/Makefile.am: Auto merged sql/mysqld.cc: Auto merged
| * | Don't write rows in MyISAM tables when using count(distinct)unknown2001-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't read MyISAM header when running without locking include/myisam.h: Don't read header when running without locking. myisam/mi_locking.c: Don't update changed flag for temporary files. myisam/mi_open.c: Don't read header when running without locking. myisam/mi_static.c: Don't read header when running without locking. sql/item_sum.cc: Don't write rows in MyISAM tables when using count(distinct) sql/mysqld.cc: Don't read MyISAM header when running without locking. Remove -Sg option. sql/sql_analyse.h: Remove duplicate header. sql/sql_select.cc: Cleaned up prototypes. Don't write rows to count(DISTINCT) MyISAM tables. sql/sql_select.h: Cleaned up prototypes. sql/table.h: A BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | vio.h BitKeeper file /home/tonu/bk/mysql-4.0/include/vio.hunknown2001-05-201-0/+278
|/ /
* | option to free_root() to not my_free() the blocksunknown2001-05-122-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed bug/updated count_distinct2 test changed reset in count distinct to avoid calls to my_free() include/my_sys.h: option to free_root() not to do my_free() include/my_tree.h: reset_tree() mysql-test/r/count_distinct2.result: added group by test mysql-test/t/count_distinct2.test: group by test + fixed bug - need to drop table mysys/my_alloc.c: mark_blocks_free() mysys/tree.c: reset_tree() sql/item_sum.cc: in count distinct reset_tree instead of delete_tree
* | use tree for count(distinct) when possibleunknown2001-05-111-1/+1
| | | | | | | | | | | | | | | | | | include/my_tree.h: fixed typo in comment mysys/tree.c: fixed typo in comment sql/item_sum.h: use tree for count distinct when possible
* | change tree to use qsort_cmp2 - compare function with 3 instead of 2 argumentsunknown2001-05-102-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/global.h: qsort_cmp2 include/my_tree.h: use qsort_cmp2 myisam/ft_boolean_search.c: use qsort_cmp2 myisam/ft_nlq_search.c: use qsort_cmp2 myisam/ft_parser.c: use qsort_cmp2 myisam/ft_stopwords.c: use qsort_cmp2 myisam/myisampack.c: use qsort_cmp2 mysys/tree.c: use qsort_cmp2 sql/sql_analyse.cc: use qsort_cmp2 sql/sql_analyse.h: use qsort_cmp2
* | Merged with 3.23, needs further fix-upunknown2001-05-104-4/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union acconfig.h: Auto merged acinclude.m4: Auto merged include/myisam.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7: Auto merged BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439: Auto merged client/mysqltest.c: Auto merged sql/lex.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/table.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged Docs/manual.texi: merged client/errmsg.c: merged configure.in: merged sql/mysqld.cc: merged sql/sql_select.cc: merged, needs manual fixing sql/sql_yacc.yy: merged, needs manual fixing
| * Portability fixes for Ia64 and Sgi compilerunknown2001-04-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DROP DATABASE in mysqladmin asks for confirmation (again) Added examined_rows to slow query log SHOW CREATE for TEMPORARY table BitKeeper/deleted/.del-shw000001.result~8b20b03d8319b9a5: Delete: mysql-test/r/shw000001.result BitKeeper/deleted/.del-shw000001.test~770d96a2c1c65b20: Delete: mysql-test/t/shw000001.test Docs/manual.texi: Added information about InnoDB and TEMPORARY tables acinclude.m4: Portability fixes client/errmsg.c: merge with libmysqd/errmsg.c client/mysqladmin.c: DROP DATABASE asks for confirmation (again) client/mysqltest.c: Portability fixes configure.in: Portability fixes for SGI compiler on Ia64 extra/resolve_stack_dump.c: Portability fixes include/global.h: Portability fixes isam/_dbug.c: Portability fixes mysql-test/mysql-test-run.sh: Portability fixes mysql-test/r/show_check.result: New test for SHOW CREATE mysql-test/t/show_check.test: New test for SHOW CREATE scripts/make_binary_distribution.sh: Added missing files sql/filesort.cc: Added examined_rows to slow query log sql/log.cc: Added examined_rows to slow query log sql/mysql_priv.h: Added examined_rows to slow query log sql/mysqlbinlog.cc: Fixed core dump when using wrong option sql/mysqld.cc: Removed not used argument sql/sql_base.cc: Fixed name problem with SHOW CREATE for TEMPORARY table sql/sql_class.h: Added examined_rows to slow query log sql/sql_parse.cc: Added examined_rows to slow query log sql/sql_select.cc: Added examined_rows to slow query log sql/sql_select.h: Added examined_rows to slow query log sql/sql_show.cc: Fixed SHOW CREATE for TEMPORARY table sql/sql_table.cc: Added examined_rows to slow query log