summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* trx0trx.c:unknown2005-03-041-3/+14
| | | | | | | | Do not assert, but print diagnostics if MySQL tries to free a trx where n_mysql_tables_in_use > 0 innobase/trx/trx0trx.c: Do not assert, but print diagnostics if MySQL tries to free a trx where n_mysql_tables_in_use > 0
* ha_innodb.cc:unknown2005-03-041-0/+1
| | | | | | | | | | write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE will commit at every 10,000 copied rows. sql/ha_innodb.cc: write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE will commit at every 10,000 copied rows.
* Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-041-2/+3
|\ | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1
| * row0sel.c:unknown2005-03-011-2/+3
| | | | | | | | | | | | | | | | row_sel_store_mysql_rec(): Do not try to space-pad BLOB fields. (Bug #8771) innobase/row/row0sel.c: row_sel_store_mysql_rec(): Do not try to space-pad BLOB fields. (Bug #8771)
* | type_blob.result, func_system.result, func_str.result, ctype_collate.result:unknown2005-03-0411-57/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixing test results accordingly. func_system.test: New test that illegal mix of collations does not happen anymore. item_strfunc.h: safe_charset_converter() was added for system constants. item_strfunc.cc: safe_charset_converter() was added for system constants. item_func.cc, item.h, item.cc: Bug#8291: Illegal collation mix with USER() function. After discussion with PeterG and Serge, a new coercibility level for "system constants" was introduced, between COERRIBLE and IMPLICIT. Thus: SELECT col1 = USER() FROM t1; - is done according to col1 collation. SELECT 'string' = USER(); - is done according to USER() collation. At the same time, "nagg" and "strong" members were removed as unused. item_create.cc: Version is a system constant too. sql/item.cc: Bug#8291: Illegal collation mix with USER() function. After discussion with PeterG and Serge, a new coercibility level for "system constants" was introduced, between COERRIBLE and IMPLICIT. Thus: SELECT col1 = USER() FROM t1; - is done according to col1 collation. SELECT 'string' = USER(); - is done according to USER() collation. At the same time, "nagg" and "strong" members were removed as unused. sql/item.h: Bug#8291: Illegal collation mix with USER() function. After discussion with PeterG and Serge, a new coercibility level for "system constants" was introduced, between COERRIBLE and IMPLICIT. Thus: SELECT col1 = USER() FROM t1; - is done according to col1 collation. SELECT 'string' = USER(); - is done according to USER() collation. At the same time, "nagg" and "strong" members were removed as unused. sql/item_create.cc: Version is a system constant too. sql/item_func.cc: Bug#8291: Illegal collation mix with USER() function. After discussion with PeterG and Serge, a new coercibility level for "system constants" was introduced, between COERRIBLE and IMPLICIT. Thus: SELECT col1 = USER() FROM t1; - is done according to col1 collation. SELECT 'string' = USER(); - is done according to USER() collation. At the same time, "nagg" and "strong" members were removed as unused. sql/item_strfunc.cc: safe_charset_converter() was added for system constants. sql/item_strfunc.h: safe_charset_converter() was added for system constants. mysql-test/t/func_system.test: New test that illegal mix of collations does not happen anymore. mysql-test/r/ctype_collate.result: fixing test results accordingly. mysql-test/r/func_str.result: fixing test results accordingly. mysql-test/r/func_system.result: fixing test results accordingly. mysql-test/r/type_blob.result: fixing test results accordingly.
* | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-03-040-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100 myisam/mi_create.c: Auto merged
| * | Fix compilation failure in mi_create.cunknown2005-03-041-1/+1
| | | | | | | | | | | | | | | myisam/mi_create.c: Fix typo.
* | | Merge mysql.com:/home/mydev/mysql-4.0unknown2005-03-042-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100 myisam/mi_create.c: Auto merged sql/mysqld.cc: Auto merged
| * | Fix for a build bug.unknown2005-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | Added a missing comma.
| * | typos fixedunknown2005-03-031-2/+2
| | |
* | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-03-0412-63/+115
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | after merge fixesunknown2005-03-031-7/+7
| | | |
| * | | mergeunknown2005-03-0312-63/+115
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: Auto merged mysys/mf_tempfile.c: Auto merged sql/ha_myisam.cc: Auto merged sql/share/english/errmsg.txt: Auto merged sql/table.cc: Auto merged
| | * | Merge bk-internal:/home/bk/mysql-4.0/unknown2005-03-0312-59/+114
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | * | uninit variable fixedunknown2005-03-031-1/+1
| | | | |
| | | * | Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)unknown2005-03-0312-59/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: O_NOFOLLOW isam/create.c: create table files with O_EXCL|O_NOFOLLOW merge/mrg_create.c: create table files with O_EXCL|O_NOFOLLOW myisam/mi_create.c: create files of temporary tables with O_EXCL|O_NOFOLLOW myisammrg/myrg_create.c: create table files with O_EXCL|O_NOFOLLOW mysys/mf_tempfile.c: create temporary files with O_EXCL|O_NOFOLLOW sql/ha_myisam.cc: let mi_create know if the table is TEMPORARY sql/mysql_priv.h: --allow_suspicious_udfs sql/mysqld.cc: --allow_suspicious_udfs sql/share/english/errmsg.txt: typo sql/sql_udf.cc: --allow_suspicious_udfs don't allow xxx() udf without any of xxx_init/deinit/add/reset check paths when loading from mysql.func sql/table.cc: create frm of temporary table with O_EXCL|O_NOFOLLOW
* | | | | Fix symlink test to avoid filenames with pathsunknown2005-03-032-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/symlink.result: Update test results mysql-test/t/symlink.test: Fix test to avoid filenames including path in results
* | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-8707unknown2005-03-033-1/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * | | | | Don't try to create a symlink if the DATA DIRECTORY specified for a tableunknown2005-02-233-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is the same as the normal datadir for that database. (Bug #8707) mysys/my_symlink2.c: Expand path of linkname before checking it against filename to decide if we need to create a link. mysql-test/t/symlink.test: Add new regression test mysql-test/r/symlink.result: Add new results
* | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-8136unknown2005-03-031-4/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * | | | | | Remove doubled quotes (used for escaping) in table names in mysqlhotcopy.unknown2005-02-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fix for Bug #8136. scripts/mysqlhotcopy.sh: Un-escape doubled quotes within table names.
| * | | | | | Fix handling of table-name matching in mysqlhotcopy when newer versions ofunknown2005-01-271-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DBD::mysql that quote table names are used by removing the quoting. Also fix a bug that stripped all '~' characters out of the table regex instead of just the leading one used to negate the expression. (Bug #8136) scripts/mysqlhotcopy.sh: remove quotes around table names
* | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-3309unknown2005-03-033-28/+44
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * | | | | | Fix bug in checking of table-specific grats that caused IP/NETMASKunknown2005-03-023-28/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hostnames to not be matched correctly. (Bug #3309) sql/sql_acl.cc: Use an acl_host_or_ip in the GRANT_TABLE struct instead of storing the host itself, and use compare_hostname() in testing it. This adds support for IP addresses with netmasks to table-specific grants, and results in simplified code by making use of compare_hostname() in more places. mysql-test/r/grant2.result: Add new results mysql-test/t/grant2.test: Add new regression test
* | | | | | | srv0start.c:unknown2005-03-031-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST innobase/srv/srv0start.c: Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST
* | | | | | | Mergeunknown2005-03-031-9/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/os/os0file.c: Auto merged innobase/srv/srv0start.c: SCCS merged
| * | | | | | srv0start.c:unknown2005-03-032-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c os0file.c: Revert the AIX patch here innobase/os/os0file.c: Revert the AIX patch here innobase/srv/srv0start.c: Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c
* | | | | | | Merge hundin.mysql.fi:/home/heikki/mysql-4.0unknown2005-03-031-0/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.1 innobase/os/os0file.c: Auto merged
| * | | | | | os0file.c:unknown2005-03-031-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST. innobase/os/os0file.c: AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.
* | | | | | | ndb - bug#8876 third and final solutionunknown2005-03-031-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: lqh to forward abort within ng
* | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-032-22/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my41
| * | | | | | | Bugs: #8063: make test mysqldump [ fail ]unknown2005-03-032-22/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See mysqldump.test diff for more details
* | | | | | | | ndb - bug#8876unknown2005-03-031-1/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: merge error?
* | | | | | | Bug#8840 Empty string comparison and character set 'cp1250'unknown2005-03-035-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Secondary weight out of bounds was picked up in mistake when the string is empty, instead of returning 0.
* | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-0322-28/+441
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1 ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged
| * \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-033-0/+79
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bugs
| | * | | | | | | Comments added unknown2005-03-031-0/+2
| | | | | | | | |
| | * | | | | | | Fix for BUG#8562: In Item_int_with_ref::new_item() create Item_int or Item_uintunknown2005-02-283-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | depending on ref->unsigned_flag. Item_int_with_ref can refer to both signed and unsigned integers. mysql-test/r/bigint.result: Test case for BUG#8562 mysql-test/t/bigint.test: Test case for BUG#8562
| * | | | | | | | ndb - bug#8876unknown2005-03-031-1/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: typo - use of global var, spotted by mikael
| * | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-023-19/+34
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.1
| | * | | | | | | a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no ↵unknown2005-03-023-19/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table/view is used) sql/sql_union.cc: a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used) Don't touch options as itit's not needed.
| * | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-028-5/+263
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-clean sql/mysqld.cc: Auto merged
| | * | | | | | | Fix for BUG#8325 "Deadlock in replication thread stops replication":unknown2005-03-028-5/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded, optionally retry the transaction a certain number of times (new variable --slave_transaction_retries). sql/mysql_priv.h: new var slave_transaction_retries sql/mysqld.cc: new variable slave_transaction_retries. Plus fixing a typo. sql/set_var.cc: new global variable slave_transaction_retries (will be one per subslave, when we have multimaster). sql/slave.cc: Slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded, optionally retry the transaction a certain number of times (--slave_transaction_retries). sql/slave.h: new RELAY_LOG_INFO::trans_retries.
| * | | | | | | | Bug#8306 - TRUNCATE leads to index corruptionunknown2005-03-025-1/+61
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a check, if the table, which we are going to create, is open. This can happen if a MERGE mapped table is TRUNCATEd. myisam/mi_open.c: Bug#8306 - TRUNCATE leads to index corruption Made test_if_reopen() globally available. myisam/myisamdef.h: Bug#8306 - TRUNCATE leads to index corruption Declared test_if_reopen() as globally available. mysql-test/r/myisam.result: Bug#8306 - TRUNCATE leads to index corruption The test result. mysql-test/t/myisam.test: Bug#8306 - TRUNCATE leads to index corruption The test case.
| * | | | | | | InnoDB: Commit inserts to the temporary tables created byunknown2005-03-012-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CREATE INDEX and DROP INDEX every 10,000 rows, similar to ALTER TABLE. sql/ha_innodb.cc: Commit inserts to the temporary tables created by CREATE INDEX and DROP INDEX every 10,000 rows, similar to ALTER TABLE. sql/ha_innodb.h: Remove duplicate declaration of srv_max_purge_lag.
* | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-014-2/+79
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-014-2/+79
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | * \ \ \ \ \ \ Merge mysql.com:/home/jonas/src/fixunknown2005-03-014-2/+79
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1 ndb/include/ndbapi/NdbConnection.hpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/test/run-test/daily-devel-tests.txt: Auto merged
| | | * | | | | | | bug#8853 - ndb - commit after nodefailure on not TC nodeunknown2005-03-014-2/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set exec_flag in execTC_COMMITREQ so that api will get rollbackrep ndb/include/ndbapi/NdbConnection.hpp: Make getConnectedNode public ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Fix TC_COMMITREQ in abort cases ndb/test/ndbapi/testNodeRestart.cpp: Testcase for bug#8853 ndb/test/run-test/daily-devel-tests.txt: Testcase for bug#8853
* | | | | | | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-012-8/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1
View Lorry Controller Status