summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* merge with 4.0unknown2004-03-162-3/+20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union VC++Files/innobase/innobase.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged acinclude.m4: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-com0shm.c~6a16f0c3d81de1f: Auto merged BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql: Auto merged extra/replace.c: Auto merged include/my_sys.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/btr/btr0pcur.c: Auto merged innobase/btr/btr0sea.c: Auto merged innobase/configure.in: Auto merged innobase/data/data0data.c: Auto merged innobase/dict/dict0boot.c: Auto merged innobase/dict/dict0crea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/dict/dict0mem.c: Auto merged innobase/ha/ha0ha.c: Auto merged innobase/ha/hash0hash.c: Auto merged innobase/include/btr0btr.ic: Auto merged innobase/include/data0type.ic: Auto merged innobase/include/dict0mem.h: Auto merged innobase/include/log0log.ic: Auto merged innobase/include/mach0data.ic: Auto merged innobase/include/mtr0log.h: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/include/os0file.h: Auto merged innobase/include/row0upd.ic: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/include/trx0rseg.ic: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/mtr/mtr0log.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/os/os0file.c: Auto merged innobase/page/page0cur.c: Auto merged innobase/page/page0page.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/read/read0read.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/rem/rem0rec.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0purge.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/row/row0undo.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0rw.c: Auto merged innobase/thr/thr0loc.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0rec.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/trx/trx0undo.c: Auto merged myisam/mi_check.c: Auto merged myisam/myisamchk.c: Auto merged mysql-test/r/multi_update.result: Auto merged mysql-test/r/mysqlbinlog.result: Auto merged mysql-test/r/rpl_error_ignored_table.result: Auto merged mysql-test/t/multi_update.test: Auto merged mysql-test/t/rpl_error_ignored_table.test: Auto merged mysys/mf_iocache.c: Auto merged mysys/mf_pack.c: Auto merged mysys/my_getopt.c: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_list.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged tests/thread_test.c: Auto merged client/mysqldump.c: Keep original indentation mysql-test/r/merge.result: keep old file scripts/mysql_fix_privilege_tables.sh: Keep old structure in merge with 4.0 sql/table.cc: merge with 4.0 + simple optimizations
| * fixed BUG #2874 "Grant table bug" andunknown2004-03-103-11/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added tests for testing structure of mysql db client/mysqltest.c: extend "replace" to column names extend "disable_result_log" to output of --exec commad mysql-test/install_test_db.sh: corrected wrong column definitions (as a result of tests) mysql-test/mysql-test-run.sh: export MYSQL and MYSQL_FIX_SYSTEM_TABLES + added option --result-file for *.opt files scripts/mysql_fix_privilege_tables.sh: added new options to using in tests + added new alters (as a result of new tests) scripts/mysql_fix_privilege_tables.sql: added new alters (as a result of new tests) scripts/mysql_install_db.sh: corrected definition of tables_priv.Table_name
| * Added option chroot to mysqlhotcopy.unknown2004-03-041-1/+4
| | | | | | | | | | | | | | Useful in case mysqld was started with chroot.
* | merge with 4.0unknown2004-02-223-4/+189
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union VC++Files/comp_err/comp_err.dsp: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisampack/myisampack.dsp: Auto merged acinclude.m4: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/com/com0shm.c: Auto merged innobase/data/data0data.c: Auto merged innobase/ha/ha0ha.c: Auto merged innobase/include/buf0buf.ic: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/ibuf0ibuf.h: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/mtr0log.h: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/include/os0proc.h: Auto merged innobase/include/os0thread.h: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/os/os0proc.c: Auto merged innobase/page/page0page.c: Auto merged innobase/que/que0que.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/trx/trx0rec.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/ut/ut0mem.c: Auto merged innobase/ut/ut0ut.c: Auto merged libmysql/libmysql.c: Auto merged scripts/mysql_config.sh: Auto merged sql/net_serv.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-02-201-4/+9
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/bk/mysql-4.0
| | * \| is sed is on-portableunknown2004-02-201-4/+9
| | |
| * | Major work on Windows build automation-- add binary packaging, suffixesunknown2004-02-192-1/+181
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-win-build: Add suffix option, classic build, binary packaging VC++Files/comp_err/comp_err.dsp: Update project file -- binary goes to ../client_release now VC++Files/my_print_defaults/my_print_defaults.dsp: Update project file -- binary goes to ../client_release now VC++Files/myisam_ftdump/myisam_ftdump.dsp: Update project file -- binary goes to ../client_release now VC++Files/myisampack/myisampack.dsp: Update project file -- binary goes to ../client_release now scripts/Makefile.am: Add make_win_binary_distribution to Makefile (for @VERSION@)
* | Merge with 4.0.18unknown2004-02-113-5/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union mysql-test/r/ctype_tis620.result-old: Merge rename: mysql-test/r/ctype_tis620.result -> mysql-test/r/ctype_tis620.result-old BUILD/compile-pentium-max: Auto merged BitKeeper/etc/config: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/Do-compile: Auto merged configure.in: Auto merged mysql-test/t/ctype_tis620.test-old: Merge rename: mysql-test/t/ctype_tis620.test -> mysql-test/t/ctype_tis620.test-old Docs/Makefile.am: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/myisam.h: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/ibuf/ibuf0ibuf.c: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/ut0mem.h: Auto merged innobase/log/log0log.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/ut/ut0mem.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_dynrec.c: Auto merged myisam/mi_key.c: Auto merged myisam/myisam_ftdump.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/bdb.result: Auto merged mysql-test/r/bigint.result: Auto merged mysql-test/r/fulltext.result: Auto merged
| * - renamed myisam/ft_dump to myisam/mysam_ftdump and added it to theunknown2004-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binary distribution and Server RPM myisam/myisam_ftdump.c: Rename: myisam/ft_dump.c -> myisam/myisam_ftdump.c BitKeeper/etc/ignore: Added myisam/myisam_ftdump to the ignore list myisam/Makefile.am: - renamed ft_dump to myisam_ftdump and added it to bin_PROGRAMS scripts/make_binary_distribution.sh: - added myisam_ftdump to the binary distribution support-files/mysql.spec.sh: - added myisam_ftdump to the Server package
| * - fixed early removing of socket file when multiple instances of mysqld areunknown2004-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | started via mysqld_safe (BUG#2114) Thanks to Rodrigo Marchant for the suggestion scripts/mysqld_safe.sh: - fixed early removing of socket file when multiple instances of mysqld are started via the script (BUG#2114) Thanks to Rodrigo Marchant for the suggestion
| * - improved wording in mysql_install_db on what to do to set the password unknown2004-01-131-1/+1
| | | | | | | | | | | | | | | | | | for the MySQL root user (BUG#2375) scripts/mysql_install_db.sh: - improved wording on what to do to set the password for the MySQL root user (BUG#2375)
| * do not put --user into command line if the value comes from [mysqld] or ↵unknown2003-12-191-3/+9
| | | | | | | | | | | | | | | | | | [server] sections Bug #2163
* | Portability fixes for Windowsunknown2003-12-082-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/client/mysqlclient.dsp: Update for windows VC++Files/libmysql/libmysql.dsp: Update for windows VC++Files/strings/strings.dsp: Update for windows libmysqld/lib_sql.cc: Update for windows scripts/make_win_src_distribution.sh: Update for windows scripts/mysql_install_db.sh: Update for windows sql/mysqld.cc: Remove not used variable sql/set_var.cc: Indentation cleanups sql/share/czech/errmsg.txt: Fixed wrong delimiters sql/share/danish/errmsg.txt: Fixed wrong delimiters sql/share/dutch/errmsg.txt: Fixed wrong delimiters sql/share/english/errmsg.txt: Fixed wrong delimiters sql/share/estonian/errmsg.txt: Fixed wrong delimiters sql/share/french/errmsg.txt: Fixed wrong delimiters sql/share/greek/errmsg.txt: Fixed wrong delimiters sql/share/hungarian/errmsg.txt: Fixed wrong delimiters sql/share/italian/errmsg.txt: Fixed wrong delimiters sql/share/japanese/errmsg.txt: Fixed wrong delimiters sql/share/korean/errmsg.txt: Fixed wrong delimiters sql/share/norwegian-ny/errmsg.txt: Fixed wrong delimiters sql/share/norwegian/errmsg.txt: Fixed wrong delimiters sql/share/polish/errmsg.txt: Fixed wrong delimiters sql/share/portuguese/errmsg.txt: Fixed wrong delimiters sql/share/romanian/errmsg.txt: Fixed wrong delimiters sql/share/russian/errmsg.txt: Fixed wrong delimiters sql/share/serbian/errmsg.txt: Fixed wrong delimiters sql/share/slovak/errmsg.txt: Fixed wrong delimiters sql/share/spanish/errmsg.txt: Fixed wrong delimiters sql/share/swedish/errmsg.txt: Fixed wrong delimiters sql/share/ukrainian/errmsg.txt: Fixed wrong delimiters sql/sql_acl.cc: Removed compiler warnings strings/ctype-big5.c: Removed compiler warnings (VC++) strings/ctype-euc_kr.c: Removed compiler warnings (VC++) strings/ctype-gb2312.c: Removed compiler warnings (VC++) strings/ctype-gbk.c: Removed compiler warnings (VC++) strings/ctype-sjis.c: Removed compiler warnings (VC++) strings/ctype-ucs2.c: Removed compiler warnings (VC++) strings/ctype-ujis.c: Removed compiler warnings (VC++)
* | mergedunknown2003-11-253-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/Makefile.am: Auto merged mysql-test/t/rpl_change_master.test: Auto merged mysys/my_getopt.c: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/make_win_src_distribution.sh: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/r/rpl_change_master.result: merged - ul
| * - Removed COPYING.LIB from all source and binary distributionsunknown2003-11-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after it was removed from manual.texi (where it was automatically generated from). Docs/Makefile.am: - don't create COPYING.LIB anymore (was removed from manual.texi) Makefile.am: - Removed COPYING.LIB from the source distribution scripts/make_binary_distribution.sh: - Removed COPYING.LIB from the binary distribution scripts/make_win_src_distribution.sh: - Removed COPYING.LIB from the windows source distribution support-files/mysql.spec.sh: - Removed COPYING.LIB from the Server RPM
| * - Rephrased two option help texts to not start with "use the ..." as this unknown2003-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confuses RPM's Perl module dependency checking (it adds a bogus requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931) scripts/mysqlaccess.sh: - Rephrased option help text so it does not start with "use" as this confuses RPM's Perl module dependency checking (it adds a bogus requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931) sql-bench/bench-init.pl.sh: - Rephrased option help text so it does not start with "use" as this confuses RPM's Perl module dependency checking (it adds a bogus requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)
* | a script that fixes anti-GRANT'ness of privilege tables.unknown2003-11-251-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | It can appear as a result of manual modifications with INSERT/UPDATE/DELETE This script converts privilege table to the state that could be created with GRANT commands only (with the exception of the short password) This is necessary for 5.0
* | Merge mysql.com:/bk/mysql-4.1 into mysql.com:/home/greg/bk/4.1unknown2003-11-181-1/+1
|\ \
| * | Add Docs/internals.texi to Windows source packages.unknown2003-11-181-1/+1
| | | | | | | | | | | | | | | scripts/make_win_src_distribution.sh: Changed to copy Docs/internals.texi to target directory.
* | | Merge with 4.0 treeunknown2003-11-182-1/+2
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union scripts/Makefile.am: Auto merged scripts/mysql_config.sh: Auto merged sql/mysqld.cc: Auto merged sql/sql_handler.cc: Auto merged BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: Auto merged BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql: Auto merged BUILD/compile-pentium-gcov: merge myisam/mi_test2.c: use original code mysql-test/t/range.test: Fixed comment mysys/mf_keycache.c: Fixed comments
| * fixed bug #1650 "mysql_config --libmysqd-libs misses libwrap"unknown2003-11-152-1/+2
| | | | | | | | | | | | | | scripts/Makefile.am: added processing of @WRAPLIBS@ in scripts scripts/mysql_config.sh: added @WRAPLIBS@ to embedded_libs option line
| * Fix for Bug #1752 Wrong letter cases.unknown2003-11-051-2/+2
| | | | | | | | | | | | | | | | Thanks to Daniel Convissor BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge with 4.0unknown2003-11-043-6/+25
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-apply-patch: Delete: netware/BUILD/apply-patch BitKeeper/deleted/.del-save-patch: Delete: netware/BUILD/save-patch BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: Auto merged BitKeeper/triggers/post-commit: Auto merged VC++Files/mysys/mysys.dsp: Auto merged client/mysqlbinlog.cc: Auto merged extra/resolveip.c: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged innobase/include/os0thread.h: Auto merged innobase/os/os0file.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/thr/thr0loc.c: Auto merged libmysql/manager.c: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/ft_boolean_search.c: Auto merged myisam/mi_extra.c: Auto merged myisam/mi_locking.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/fulltext.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/rpl_reset_slave.test: Auto merged mysql-test/t/rpl_trunc_binlog.test: Auto merged mysys/Makefile.am: Auto merged mysys/errors.c: Auto merged mysys/my_symlink.c: Auto merged mysys/my_thr_init.c: Auto merged scripts/mysql_install_db.sh: Auto merged sql/item_func.cc: Auto merged sql/log_event.h: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_repl.cc: Auto merged sql/sql_test.cc: Auto merged sql/unireg.h: Auto merged client/mysqldump.c: merge with 4.0 (quoted names) configure.in: use local file include/my_pthread.h: Use local file innobase/include/srv0srv.h: Use local file innobase/row/row0sel.c: Use local file innobase/srv/srv0srv.c: Use local file libmysql/libmysql.c: Use local file myisam/myisamchk.c: merge fixes mysql-test/r/func_crypt.result: update results mysql-test/r/order_by.result: update results mysql-test/r/query_cache.result: update results mysql-test/r/range.result: update results mysql-test/r/rpl_reset_slave.result: update results mysql-test/r/rpl_trunc_binlog.result: update results mysql-test/t/func_crypt.test: Added disable_warnings/enable warnings mysql-test/t/query_cache.test: merge tests mysql-test/t/range.test: merge tests mysys/charset.c: use local file (will merge patch separately) sql/ha_innodb.cc: use local file sql/log_event.cc: new slave_proxy_id handling sql/slave.h: merge sql/sql_base.cc: merge sql/sql_parse.cc: Fixes for counting user connect resourses Added function comments for involved functions sql/sql_select.cc: Fix for not doing sort with LIMIT when OPTION_FOUND_ROWS is used sql/unireg.cc: merge fixes support-files/mysql.server.sh: merge fixes
| * Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-10-251-3/+7
| |\ | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1228/mysql-4.0
| | * added to mysql_secure_installation unknown2003-10-241-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | changing root password on all hosts (bug 1228) scripts/mysql_secure_installation.sh: added changing root password on all hosts
| * | Reverted a wrong patch from mysqlhotcopy. This is a real bugunknown2003-10-221-3/+3
| | | | | | | | | | | | | | | | | | | | | in MySQL server...
| * | Fixed a bug in mysqlhotcopy, which made special table namesunknown2003-10-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | to cause program to abort. Such table name could have been one with a semicolon (:) in the middle.
| * | Fixed bug #954 mysqlhotcopy permission problem. The databaseunknown2003-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | directory owner ship was not honored.
| * | Applied a patch from Travis Wheeler to mysqlhotcopy that allowsunknown2003-10-221-2/+15
| |/ | | | | | | | | | | | | using regexp with tablenames together with databasenames.
| * - fixed small typo to resolve "test: argument expected" error on Solarisunknown2003-10-161-1/+1
| | | | | | | | | | | | | | and Tru64 when running "mysql_install_db"
* | made more fine error message in scripts/fill_help_tables.shunknown2003-10-191-1/+2
| | | | | | | | | | scripts/fill_help_tables.sh: made more fine error message
* | merge with 4.0unknown2003-10-162-10/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1: Auto merged client/client_priv.h: Auto merged extra/resolveip.c: Auto merged include/mysql.h: Auto merged include/thr_alarm.h: Auto merged myisam/myisamchk.c: Auto merged scripts/mysql_config.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/slave.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_test.cc: Auto merged
| * Merge bk-internal:/home/bk/mysql-4.0/unknown2003-10-142-1/+120
| |\ | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0 sql/slave.cc: Auto merged
| * \ mergedunknown2003-10-072-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/create.result: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged
| * \ \ Merge bk-internal:/home/bk/mysql-4.0/unknown2003-10-062-10/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0 scripts/mysql_config.sh: Auto merged sql/mysqld.cc: Auto merged
| | * | | typo fixed (bug #1390 - incorrect mysql_config output)unknown2003-09-281-1/+1
| | | | |
| | * | | make mysqld to respect socket/port options of mysqld_safe command lineunknown2003-09-271-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and [mysqld_safe] section in my.cnf, even if they are also specified in [mysql] section.
* | | | | merge with 4.0 for more memory allocation variables.unknown2003-10-132-1/+120
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/ha_berkeley.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_udf.cc: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged scripts/Makefile.am: merge sql/log_event.cc: merge sql/mysqld.cc: merge sql/opt_range.cc: merge sql/set_var.cc: merge sql/sql_class.h: merge sql/sql_delete.cc: merge sql/sql_parse.cc: merge
| * | | | Mergeunknown2003-10-082-1/+120
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | scripts/Makefile.am: SCCS merged
| | * | | - added make_sharedlib_distribution.sh to the source distributionunknown2003-10-082-1/+120
| | | | |
* | | | | Merge with 4.0 to get fix for mysqlbinlogunknown2003-10-071-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: Auto merged mysql-test/r/create.result: Auto merged scripts/Makefile.am: Auto merged sql/sql_select.cc: Auto merged mysql-test/mysql-test-run.sh: Cleaned up argument handling for external programs
| * | | | Simple cleanupsunknown2003-10-072-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: Add default handling to mysqlbinlog mysql-test/mysql-test-run.sh: Cleanup of mysqldump/mysqlbinlog argument handling scripts/Makefile.am: Remove duplicate scripts/mysql_install_db.sh: Change -eq to =
* | | | | Merge with 4.0.16unknown2003-10-074-42/+54
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-mysqldump.result: Delete: mysql-test/r/mysqldump.result BitKeeper/deleted/.del-mysqldump.test: Delete: mysql-test/t/mysqldump.test BitKeeper/deleted/.del-compile-netware-max: Delete: netware/BUILD/compile-netware-max BitKeeper/deleted/.del-compile-netware-max-debug: Delete: netware/BUILD/compile-netware-max-debug BitKeeper/deleted/.del-compile-netware-src: Delete: netware/BUILD/compile-netware-src BitKeeper/deleted/.del-knetware.imp: Delete: netware/BUILD/knetware.imp BUILD/compile-pentium-valgrind-max: Auto merged BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: Auto merged BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql: Auto merged BitKeeper/deleted/.del-openssl.imp: Delete: netware/BUILD/openssl.imp acinclude.m4: Auto merged SSL/cacert.pem: Auto merged SSL/client-cert.pem: Auto merged SSL/server-cert.pem: Auto merged client/mysqlbinlog.cc: Auto merged extra/resolveip.c: Auto merged heap/hp_test2.c: Auto merged include/my_global.h: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged libmysql/libmysql.def: Auto merged libmysqld/examples/Makefile.am: Auto merged myisam/mi_check.c: Auto merged myisam/mi_test2.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/r/fulltext_multi.result: Auto merged mysql-test/r/fulltext_order_by.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/std_data/rpl_loaddata2.dat: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/select.test: Auto merged mysql-test/t/user_var.test: Auto merged mysys/mf_dirname.c: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/des_key_file.cc: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.h: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql-bench/test-transactions.sh: Auto merged sql/sql_base.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged support-files/mysql.server.sh: Auto merged client/mysqltest.c: Merge with 4.0.16 Changed version number to '2.0' to avoid confusion with version numbering in 3.23 mysql-test/r/distinct.result: Updated results for merge mysql-test/r/insert.result: Updated results for merge mysql-test/r/insert_select.result: Updated results for merge mysql-test/r/join_outer.result: Updated results for merge mysql-test/r/mix_innodb_myisam_binlog.result: Updated results for merge mysql-test/r/order_by.result: Updated results for merge mysql-test/r/rpl000009.result: Updated results for merge mysql-test/r/rpl_loaddata.result: Updated results for merge mysql-test/r/rpl_log.result: Updated results for merge mysql-test/r/select_safe.result: Updated results for merge scripts/mysql_install_db.sh: Change -eq to = BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483: dummy
| * | | | Merge with 3.23.58unknown2003-10-061-3/+4
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union mytest-old.c: Merge rename: VC++Files/libmysqltest/mytest.c -> mytest-old.c BitKeeper/deleted/.del-mysqlshutdown.c: Delete: VC++Files/mysqlshutdown/mysqlshutdown.c BitKeeper/deleted/.del-mysqlshutdown.rc: Delete: VC++Files/mysqlshutdown/mysqlshutdown.rc BitKeeper/deleted/.del-mysqlwatch.c: Delete: VC++Files/mysqlwatch/mysqlwatch.c BitKeeper/deleted/.del-thr_test.c: Delete: VC++Files/thr_test/thr_test.c BitKeeper/deleted/.del-make_win_src_distribution.sh: Delete: scripts/make_win_src_distribution.sh BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d: Auto merged BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74: Auto merged BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365: Auto merged BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e: Auto merged BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477: Auto merged BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131: Auto merged BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4: Auto merged BitKeeper/deleted/.del-Default.rge~2218627c2a901409: Auto merged BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9: Auto merged BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28: Auto merged BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81: Auto merged BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90: Auto merged BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e: Auto merged BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903: Auto merged BitKeeper/deleted/.del-Servers.fgl~36147accb82f759: Auto merged BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34: Auto merged BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722: Auto merged BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e: Auto merged BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6: Auto merged BitKeeper/deleted/.del-Setup.rul~14510a994d515f19: Auto merged BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a: Auto merged BitKeeper/deleted/.del-infolist.txt~58b203247936d266: Auto merged BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97: Auto merged BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d: Auto merged BitKeeper/deleted/.del-value.shl~98c2851db96b919e: Auto merged BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d: Auto merged configure.in: Merge with 3.23.58 (Keep old code) sql/slave.cc: Merge with 3.23.58 (Keep old code) sql/sql_parse.cc: Merge with 3.23.58 (Keep old code)
| | * | | - added make_win_src_distribution.sh to EXTRA_SCRIPTSunknown2003-09-171-0/+1
| | | | |
| | * | | New Windows source package automation for 3.23unknown2003-09-122-2/+491
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/InstallShield/3.23.XX-com/Component Definitions/.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/Component Definitions/Default.cdf: mvdir VC++Files/InstallShield/3.23.XX-com/Component Definitions/Default.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Clients and Tools.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Default.fdf: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Default.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Development.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Documentation.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Grant Tables.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/File Groups/Servers.fgl: mvdir VC++Files/InstallShield/3.23.XX-com/MySQL 3.23.com.ipr: mvdir VC++Files/InstallShield/3.23.XX-com/Registry Entries/Default.rge: mvdir VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.dbg: mvdir VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.ino: mvdir VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.ins: mvdir VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.obs: mvdir VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.rul: mvdir VC++Files/InstallShield/3.23.XX-com/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP: mvdir VC++Files/InstallShield/3.23.XX-com/Shell Objects/Default.shl: mvdir VC++Files/InstallShield/3.23.XX-com/String Tables/Default.shl: mvdir VC++Files/InstallShield/3.23.XX-com/Text Substitutions/Build.tsb: mvdir VC++Files/InstallShield/3.23.XX-com/Text Substitutions/Setup.tsb: mvdir VC++Files/InstallShield/3.23.XX-com/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt: Add version placeholders for automation VC++Files/InstallShield/3.23.XX-com/String Tables/0009-English/value.shl: Add version placeholders for automation VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt: Add version placeholders for automation VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl: Add version placeholders for automation scripts/Makefile.am: Build make_win_src_distribution script by default BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | Ride hobby horse.unknown2003-10-041-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run.sh: deamon -> daemon scripts/mysql_install_db.sh: deamon -> daemon support-files/my-small.cnf.sh: deamon -> daemon
| * | | Merge script with 4.1unknown2003-09-241-72/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/mysql_fix_privilege_tables.sql: Merge with 4.1 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Block SIGPIPE also for not threaded client programs.unknown2003-09-233-8/+23
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added --include and --libs_r options to mysql_config. Added mysql_get_client_version() to client library Fixed some minor benchmark issues acinclude.m4: Fixed that 'no' is printed if openssl not used configure.in: Fixed error message extra/comp_err.c: Skip lines before first { include/mysql.h: Indentation cleanup libmysql/libmysql.c: Block SIGPIPE also for not threaded programs. This is now done once in mysql_server_init() and not for every call to mysql_init(). Added mysql_get_client_version() libmysql/libmysql.def: added mysql_get_client_version scripts/Makefile.am: Add openssl libraries to mysql_config scripts/mysql_config.sh: Added options --include and --libs_r Added C compiler options to 'cflags' scripts/mysql_install_db.sh: Fixed tests with IN_RPM to not give warnings sql-bench/bench-init.pl.sh: Updated version number sql-bench/server-cfg.sh: Remove duplicate line sql-bench/test-alter-table.sh: Increase loops for more relevant test sql-bench/test-select.sh: Fix wrong test for count_distinct_2 tests/mail_to_db.pl: Default db and table for easier usage
| * | Merge gweir@build.mysql.com:/home/bk/mysql-4.0unknown2003-09-151-30/+31
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/greg/bk/4.0
View Lorry Controller Status