summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* merge with 4.0unknown2004-03-16195-4109/+2651
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Remove not needed patchunknown2004-03-162-15/+15
| |
| * Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-03-1337-90/+90
| |\ | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/l/mysql-4.0
| | * InnoDB: Replace ut_a(0) with ut_errorunknown2004-03-1337-90/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/btr/btr0btr.c: Replace ut_a(0) with ut_error innobase/buf/buf0flu.c: Replace ut_a(0) with ut_error innobase/buf/buf0lru.c: Replace ut_a(0) with ut_error innobase/data/data0data.c: Replace ut_a(0) with ut_error innobase/dict/dict0crea.c: Replace ut_a(0) with ut_error innobase/dict/dict0dict.c: Replace ut_a(0) with ut_error innobase/dict/dict0load.c: Replace ut_a(0) with ut_error innobase/fil/fil0fil.c: Replace ut_a(0) with ut_error innobase/fsp/fsp0fsp.c: Replace ut_a(0) with ut_error innobase/ibuf/ibuf0ibuf.c: Replace ut_a(0) with ut_error innobase/include/buf0buf.ic: Replace ut_a(0) with ut_error innobase/include/data0type.ic: Replace ut_a(0) with ut_error innobase/include/mtr0log.ic: Replace ut_a(0) with ut_error innobase/include/trx0rseg.ic: Replace ut_a(0) with ut_error innobase/lock/lock0lock.c: Replace ut_a(0) with ut_error innobase/log/log0log.c: Replace ut_a(0) with ut_error innobase/log/log0recv.c: Replace ut_a(0) with ut_error innobase/mem/mem0pool.c: Replace ut_a(0) with ut_error innobase/mtr/mtr0log.c: Replace ut_a(0) with ut_error innobase/os/os0file.c: Replace ut_a(0) with ut_error innobase/page/page0cur.c: Replace ut_a(0) with ut_error innobase/page/page0page.c: Replace ut_a(0) with ut_error innobase/pars/lexyy.c: Replace ut_a(0) with ut_error innobase/que/que0que.c: Replace ut_a(0) with ut_error innobase/rem/rem0cmp.c: Replace ut_a(0) with ut_error innobase/rem/rem0rec.c: Replace ut_a(0) with ut_error innobase/row/row0ins.c: Replace ut_a(0) with ut_error innobase/row/row0mysql.c: Replace ut_a(0) with ut_error innobase/row/row0purge.c: Replace ut_a(0) with ut_error innobase/row/row0row.c: Replace ut_a(0) with ut_error innobase/row/row0sel.c: Replace ut_a(0) with ut_error innobase/row/row0undo.c: Replace ut_a(0) with ut_error innobase/srv/srv0srv.c: Replace ut_a(0) with ut_error innobase/sync/sync0arr.c: Replace ut_a(0) with ut_error innobase/trx/trx0purge.c: Replace ut_a(0) with ut_error innobase/trx/trx0trx.c: Replace ut_a(0) with ut_error innobase/trx/trx0undo.c: Replace ut_a(0) with ut_error
| * | after merge fixes.unknown2004-03-132-15/+15
| |\ \ | | |/ | |/|
| | * multi_update.result:unknown2004-03-132-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for a bug in the result multi_update.test: Fix for a bug in the test mysql-test/t/multi_update.test: Fix for a bug in the test mysql-test/r/multi_update.result: Fix for a bug in the result
| * | Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-03-122-13/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/l/mysql-4.0
| | * | InnoDB: disable unreachable debug functions unless #ifdef UNIV_MEM_DEBUGunknown2004-03-122-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/mem0dbg.ic: Disable debug functions unless #ifdef UNIV_MEM_DEBUG innobase/mem/mem0dbg.c: Disable debug functions unless #ifdef UNIV_MEM_DEBUG Make some global variables static
| * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-121-3/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0 client/mysqlbinlog.cc: Auto merged
| | * | Force mysqlbinlog to require an argument if --local-load is usedunknown2004-03-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (--local-load alone means "I want files to be prepared for LOAD DATA INFILE, in the default temp directory", and mysqlbinlog already does this without --local-load). client/mysqlbinlog.cc: --local-load always needs an argument; --local-load alone is of no use.
| * | | InnoDB: remove redundant functions mach_write() and mach_read()unknown2004-03-123-63/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/mach0data.h: Remove mach_write() and mach_read() innobase/include/mach0data.ic: Remove mach_write() and mach_read() innobase/mem/mem0dbg.c: Replace mach_write() with mach_write_to_4() Replace mach_read() with mach_read_from_4()
| * | | Remove constant parameter MLOG_8BYTES from mtr_read_dulint() and ↵unknown2004-03-1211-76/+53
| | | | | | | | | | | | | | | | mlog_write_dulint()
| * | | Allow UNIV_SYNC_DEBUG to be disabled while UNIV_DEBUG is enabledunknown2004-03-1256-208/+830
| | | |
| * | | Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-03-126-102/+49
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/l/mysql-4.0
| | * | | Replace ut_anp with ut_aunknown2004-03-126-102/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/ut0dbg.h: Remove ut_anp Replace fprintf with fputs Move string constants to .c file innobase/ut/ut0dbg.c: Move string constants to .c file
| * | | | Fixes to newly pushed codeunknown2004-03-122-3/+4
| | | | |
| * | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-125-13/+47
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2985/mysql-4.0 sql/sql_db.cc: Auto merged sql/sql_parse.cc: Auto merged sql/table.cc: Auto merged
| | * | | | extra correction of check_db_name, check_table_name and check_column_nameunknown2004-03-121-18/+14
| | | | | |
| | * | | | fixed Bug #2985 unknown2004-03-055-11/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Table truncated when creating another table name with Spaces" added to check_db_name, check_table_name and check_column_name test for end space mysql-test/r/create.result: added test for Bug #2985 "Table truncated when creating another table name with Spaces" mysql-test/t/create.test: added test for Bug #2985 "Table truncated when creating another table name with Spaces" sql/sql_db.cc: cancel strip end spaces for database name sql/sql_parse.cc: cancel strip end spaces for database name sql/table.cc: added to check_db_name, check_table_name and check_column_name test for end space
| * | | | | Portability fixes & fixing of test suiteunknown2004-03-125-22/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_math.result: Updated tests after merge with 3.23 mysql-test/r/multi_update.result: Fixed not portable test mysql-test/r/mysqlbinlog.result: Fixed test after push without doing 'make test' mysql-test/t/multi_update.test: Fixed not portable test sql/sql_parse.cc: Don't use static inline, as this is not portable
| * | | | | Mergeunknown2004-03-1213-30/+59
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/install_test_db.sh: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged mysql-test/mysql-test-run.sh: SCCS merged
| | * | | | Merge with 3.23 to get patch for floor()unknown2004-03-125-4/+21
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union myisam/mi_check.c: Auto merged mysql-test/r/func_math.result: Auto merged mysql-test/t/func_math.test: Auto merged sql/item_func.cc: Auto merged
| | | * | | | fixed Bug #3051 "FLOOR returns invalid"unknown2004-03-043-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_math.result: added test for Bug #3051 "FLOOR returns invalid" mysql-test/t/func_math.test: added test for Bug #3051 "FLOOR returns invalid"
| | | * | | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-3.23unknown2004-02-161-1/+3
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2762/mysql-3.23
| | | | * | | | fixed bug #2762 "grammar error in myisam/mi_check.c"unknown2004-02-161-1/+3
| | | | | | | |
| | | * | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-3.23unknown2004-02-112-4/+3
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-3.23.bug BitKeeper/etc/logging_ok: auto-union
| | | | * | | | | Fix for bug#2021: Wron error message from the clientunknown2004-02-112-4/+3
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | | | | | Ensure that install_test_db.sh script works with both 'make install' and ↵unknown2004-03-128-26/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'make_binary_distribution' layouts Abort if we can't allocate memory for table cache Fix bug with multi-update-tables and BDB tables. extra/replace.c: Fix comments mysql-test/install_test_db.sh: Change internal option from -bin to --bin Ensure that script works with both 'make install' and 'make_binary_distribution' layouts (Bug #3031) mysql-test/mysql-test-run.sh: Change internal option from -bin to --bin sql/ha_berkeley.cc: More debug sql/mysql_priv.h: Change table_cache_init to return error sql/mysqld.cc: Abort if we can't allocate memory for table cache. (Bug #3085) Enable warnings by default sql/sql_base.cc: Change table_cache_init to return error sql/sql_update.cc: Fix bug with multi-update-tables and BDB tables. Bug #3098 Problem was that we didn't initialize BDB for calls to rnd_pos()
| * | | | | | | Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-03-1113-81/+68
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/l/mysql-4.0
| | * | | | | | More consistent handling of magic numbersunknown2004-03-1113-81/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/data0data.h: dtuple_struct:magic_n: Enclose in #ifdef UNIV_DEBUG innobase/dict/dict0dict.c: Use magic_n only #ifdef UNIV_DEBUG innobase/dict/dict0mem.c: Use magic_n only #ifdef UNIV_DEBUG innobase/ha/hash0hash.c: Remove unused functions hash_mutex_enter_all and hash_mutex_exit_all Use magic_n only #ifdef UNIV_DEBUG Add ut_ad(table->magic_n == HASH_TABLE_MAGIC_N) innobase/include/dict0mem.h: Use magic_n only #ifdef UNIV_DEBUG innobase/include/hash0hash.h: Remove unused functions hash_mutex_enter_all and hash_mutex_exit_all Use magic_n only #ifdef UNIV_DEBUG innobase/include/hash0hash.ic: Add ut_ad(table->magic_n == HASH_TABLE_MAGIC_N) innobase/include/mtr0mtr.h: Use state, magic_n only #ifdef UNIV_DEBUG innobase/include/row0ins.h: Use magic_n only #ifdef UNIV_DEBUG innobase/include/row0upd.h: Use magic_n only #ifdef UNIV_DEBUG innobase/row/row0ins.c: Use magic_n only #ifdef UNIV_DEBUG Add ut_ad(node->magic_n == INS_NODE_MAGIC_N) innobase/row/row0upd.c: Use magic_n only #ifdef UNIV_DEBUG Add ut_ad(node->magic_n == UPD_NODE_MAGIC_N) innobase/thr/thr0loc.c: Use magic_n only #ifdef UNIV_DEBUG
| * | | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-1120-572/+268
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| | * | | | | | | Fixed error in version.unknown2004-03-111-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Fix for BUG#2983 "If statement was killed on master, slave errors despite ↵unknown2004-03-117-85/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replicate-wild-ignore-t" We introduce a new function mysql_test_parse_for_slave(). If the slave sees that the query got a really bad error on master (killed e.g.), then it calls this function to know if this query can be ignored because of replicate-*-table rules (do not worry about replicate-*-db rules: they are checked so early that they have no bug). If the answer is yes, it skips the query and continues. If it's no, then it stops and say "fix your slave data manually" (like it did before this change). mysql-test/r/rpl_error_ignored_table.result: result update mysql-test/t/rpl_error_ignored_table-slave.opt: ignore more tables mysql-test/t/rpl_error_ignored_table.test: we test if a killed query on the master, is ignored on the slave if the tables it involves should be excluded because of replicate-*-table rules. sql/log_event.cc: If the query got a really bad error on the master (thread killed etc), parse it to test the table names: if the replicate-*-do|ignore-table rules say "this query must be ignored" then we exit gracefully; otherwise we warn about the bad error and tell DBA to check/fix it. Before this change, we always warned and stopped. sql/mysql_priv.h: new function sql/slave.cc: don't print error immediately as we need to do one more test to be sure. sql/sql_parse.cc: we add a function mysql_test_parse_for_slave(), to be used only by the slave if it wants to know if the query should be ignored or not; so this function only parses the query, does not execute it.
| | * | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-117-50/+57
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0 sql/set_var.cc: Auto merged
| | | * | | | | Fix for BUG#2921 "Replication problem on mutex lock in mySQL-4.0.18":unknown2004-03-117-50/+57
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | re-using unused LOCK_active_mi to serialize all administrative commands related to replication: START SLAVE, STOP SLAVE, RESET SLAVE, CHANGE MASTER, init_slave() (replication autostart at server startup), end_slave() (replication autostop at server shutdown), LOAD DATA FROM MASTER. This protects us against a handful of deadlocks (like BUG#2921 when two START SLAVE, but when two STOP SLAVE too). Removing unused variables. sql/item_func.cc: We don't need LOCK_active_mi just to MASTER_POS_WAIT(). sql/repl_failsafe.cc: no need for macro sql/set_var.cc: no need for macro sql/slave.cc: Re-using unused LOCK_active_mi to serialize all administrative commands related to replication: START SLAVE, STOP SLAVE, RESET SLAVE, CHANGE MASTER, init_slave() (replication autostart at server startup), end_slave() (replication autostop at server shutdown), LOAD DATA FROM MASTER. This protects us against a handful of deadlocks. Removing unused variables. sql/slave.h: Re-using LOCK_active_mi to serialize administrative replication commands. Macros unneeded. Removing unneeded variables. sql/sql_parse.cc: found unused variable. Replacing macros. sql/sql_show.cc: replacing macros
| | * | | | | Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-03-117-436/+28
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/l/mysql-4.0
| | | * | | | | Remove remaining references to the built-in ODBC driver of InnoDBunknown2004-03-116-435/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-ib_odbc.h~6882a6fe66f9b3e: Delete: innobase/include/ib_odbc.h BitKeeper/deleted/.del-odbc0odbc.h~6cdf5ecedbf3b3f0: Delete: innobase/include/odbc0odbc.h innobase/include/Makefile.am: Remove odbc0odbc.h and ib_odbc.h innobase/srv/srv0srv.c: Remove reference to odbc0odbc.h innobase/include/pars0pars.h: Remove unused functions related to ODBC and stored procedures Made pars_print_lexed conditional [UNIV_SQL_DEBUG] innobase/pars/pars0pars.c: Remove unused functions related to ODBC and stored procedures Made pars_print_lexed conditional [UNIV_SQL_DEBUG] Output to stderr instead of stdout
| | | * | | | | Remove libcom.a from acinclude.m4 (should have been done in ChangeSet 1.1741)unknown2004-03-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acinclude.m4: innodb_libs: Remove libcom.a
| * | | | | | | multi_update.result:unknown2004-03-113-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test case for a #2996 bug fix multi_update.test: test case for a #2996 bug fix sql_select.cc: Fix for a bug #2996 involving multi-table updates over the const tables sql/sql_select.cc: Fix for a bug #2996 involving multi-table updates over the const tables mysql-test/t/multi_update.test: test case for a #2996 bug fix mysql-test/r/multi_update.result: Test case for a #2996 bug fix
| * | | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-111-7/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| | * | | | | | mysqldump.c:unknown2004-03-111-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverting fix client/mysqldump.c: reverting fix
| | * | | | | | mysqldump.c:unknown2004-03-091-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix mysqldump problem when local-infile option is present under [client] options header. It will not start. This must be fixed as other programs use that option under [client] options header. client/mysqldump.c: This is to fix mysqldump problem when local-infile option is present under [client] options header. It will not start. This must be fixed as other programs use that option under [client] options header.
| * | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-112-2/+5
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.0
| | * | | | | | Small fixes.unknown2004-03-112-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: Patched patch for Bug#2491. sql/set_var.cc: Added max_insert_delayed_threads into 'SHOW VARIABLES'.
| * | | | | | | Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-03-1113-51/+474
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/l/mysql-4.0
| | * | | | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-1113-51/+474
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
| | | * \ \ \ \ \ Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-1013-51/+474
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0 mysql-test/install_test_db.sh: Auto merged mysql-test/mysql-test-run.sh: Auto merged
| | | | * \ \ \ \ \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2004-03-1013-51/+474
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0 mysql-test/mysql-test-run.sh: Auto merged
| | | | | * | | | | | fixed BUG #2874 "Grant table bug" andunknown2004-03-1013-51/+474
| | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Remove unneeded module "com"unknown2004-03-1126-2733/+104
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-Makefile.am~2b013aa835a140c4: Delete: innobase/com/Makefile.am BitKeeper/deleted/.del-com0com.c~473a1f0f440ce91b: Delete: innobase/com/com0com.c BitKeeper/deleted/.del-com0shm.c~6a16f0c3d81de1f: Delete: innobase/com/com0shm.c BitKeeper/deleted/.del-makefilewin~3e26f0df100887f2: Delete: innobase/com/makefilewin BitKeeper/deleted/.del-com0com.h~533a7eaa16ec585a: Delete: innobase/include/com0com.h BitKeeper/deleted/.del-com0com.ic~671e309916e285b: Delete: innobase/include/com0com.ic BitKeeper/deleted/.del-com0shm.h~5f3df7c04221b0fe: Delete: innobase/include/com0shm.h BitKeeper/deleted/.del-com0shm.ic~f827cfca1603fa6b: Delete: innobase/include/com0shm.ic innobase/configure.in: Remove com/Makefile innobase/include/Makefile.am: Remove com*.h innobase/include/usr0sess.h: Remove unused communication functions innobase/include/usr0sess.ic: Remove unused communication functions innobase/include/usr0types.h: Remove sess_sys_t and sess_sig_t innobase/usr/usr0sess.c: Remove unused functions innobase/dict/dict0crea.c: Remove unneeded params of que_fork_start_command() innobase/include/que0que.h: Remove unneeded params of que_fork_start_command() innobase/row/row0mysql.c: Remove unneeded params of que_fork_start_command() innobase/include/srv0srv.h: Remove references to the com module innobase/srv/srv0srv.c: Remove references to the com module Remove unused vars srv_n_{com,worker}_threads Make some global vars static innobase/que/que0que.c: Remove references to odbc Add #ifdef UNIV_SYNC_DEBUG around some ut_ad() Remove unneeded params of que_fork_start_command() Remove unreachable code Output diagnostics to stderr, not stdout innobase/include/trx0trx.h: Remove unneeded params of trx_sig_send() and trx_sig_reply() innobase/trx/trx0trx.c: Remove unneeded params of trx_sig_send() and trx_sig_reply() Remove params of sess_open() innobase/srv/srv0start.c: Remove reference to com0com.h Remove call to sess_sys_init_at_db_start() innobase/trx/trx0purge.c: Remove references to the com module Remove params of sess_open() Remove unneeded params of que_fork_start_command() innobase/trx/trx0roll.c: Remove params of sess_open() Remove unneeded params of que_fork_start_command() Remove unneeded params of trx_sig_send() and trx_sig_reply()