summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-223-1/+61
|\ | | | | | | | | | | | | | | into mysql.com:/media/sda1/mysql/mysql-4.1-6050 sql/sql_class.h: Auto merged
| * A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field unknown2004-10-223-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | names with ident. tables fr. diff. schemata": revise all uses of Item_field and make them prepared-statements friendly when necessary. mysql-test/r/ps.result: Test results fixed: the test case for Bug#6050 mysql-test/r/ps_1general.result: Test results fixed: in prepared statements we expand '*' to a list of fully qualified fields (db.table.column). mysql-test/t/ps.test: A test for Bug#6050 "EXECUTE stmt reports ambiguous fieldnames with ident. tables fr. diff. schemata" sql/item.cc: Revise all Item_field constructors: we need to make sure that no Item_field object points to unaccessible memory in prepared statements. sql/item.h: Revise all Item_field constructors: we need to make sure that no Item_field object points to unaccessible memory in prepared statements. sql/sql_base.cc: Item_field use changed to be prepared statements friendly. sql/sql_class.h: New check of Item_arena state. sql/sql_union.cc: Fixing the problem with name resolving in UNION and prepared statements: In case of SELECT a, b, c FROM t1 UNION SELECT a, b, c FROM t2 the list of selected items is represented as a List<Item_field>, where each Item_field points to a field of temporary table. But the temporary table is created anew on each execution of the prepared statement. So on each subsequent execution we should reset Item_field items to point to fields from freshly-created temporary table. sql/table.h: Comment TABLE member.
* | mysqltest.c, mysqltest.result, mysqltest.test:unknown2004-10-222-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added SQLSTATE matching support to test engine mysqltest.result, mysqltest.test: new file mysql-test/t/mysqltest.test: Added SQLSTATE matching support to test engine mysql-test/r/mysqltest.result: Added SQLSTATE matching support to test engine client/mysqltest.c: Added SQLSTATE matching support to test engine
* | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-213-25/+31
|\ \ | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1
| * \ Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1unknown2004-10-213-25/+31
| |\ \
| | * | Adapt 'ps_10nestset' to standard test style; correct a typing error in ↵unknown2004-10-213-25/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ps_11bugs'. mysql-test/r/ps_10nestset.result: Correct the expected protocol according to the test changes. mysql-test/t/ps_10nestset.test: Improve comments; adapt to standard test style: disable warnings around 'drop table', use 't#' table name scheme. mysql-test/t/ps_11bugs.test: Corrected a typing error in the bug number comment.
* | | | A fix (bug #6138: MOD operator should not round non-integral argument).unknown2004-10-212-0/+22
|/ / /
* | | ctype_uca.result:unknown2004-10-211-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | Forgot to commit in the previous changeset mysql-test/r/ctype_uca.result: Forgot to commit in the previous changeset
* | | Bug #5679 utf8_unicode_ci LIKE--trailing % doesn't equal zero charactersunknown2004-10-211-1/+28
| | |
* | | Allow cp932 characters to be stored in a SJIS columnunknown2004-10-212-0/+15
| | |
* | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-202-0/+32
|\ \ \ | |_|/ |/| | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
| * | fix so that ndb handler can cope with char(0), mapped to char(1) for nowunknown2004-10-202-0/+32
| | |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-205-1/+121
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 libmysql/libmysql.c: Auto merged
| * | After merge fixesunknown2004-10-202-4/+4
| | |
| * | Merge with 4.0unknown2004-10-205-1/+121
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Docs/Support/texi2html: Auto merged innobase/trx/trx0rec.c: Auto merged libmysql/libmysql.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/t/innodb-lock.test: Auto merged mysys/thr_lock.c: Auto merged sql/ha_innodb.cc: Auto merged sql/lock.cc: Auto merged sql/sql_acl.cc: Keep old code
| | * | Fix test case for innodb-lockunknown2004-10-203-29/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/innodb-lock.result: Fix test case (old one didn't test things correctly) mysql-test/t/innodb-lock.test: Fix test case (old one didn't test things correctly) mysys/thr_lock.c: More debugging information sql/mysqld.cc: Enable innodb_table_locks as default, as otherwise there is a possibility for deadlocks sql/sql_base.cc: More debug information
| | * | Code cleanups (done during review of new code)unknown2004-10-202-1/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename innodb_table_locks_old_behavior -> innodb_table_locks Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20 (This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction) libmysql/libmysql.c: Use ulong instead of unsigned long Reuse _dig_vec() myisam/myisampack.c: Simplify code mysql-test/r/innodb-lock.result: new test case mysql-test/t/innodb-lock.test: new test case sql/ha_innodb.cc: Rename innodb_table_locks_old_behavior -> innodb_table_locks sql/mysqld.cc: Rename innodb_table_locks_old_behavior -> innodb_table_locks Set this off by default to get same behaviour as in MySQL 4.0.20 sql/set_var.cc: Rename innodb_table_locks_old_behavior -> innodb_table_locks sql/sql_class.h: Rename innodb_table_locks_old_behavior -> innodb_table_locks
| | * | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-10-112-0/+30
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | | * | Fix for BUG#5949 "error code 1223 in binlog when using innobackup":unknown2004-10-112-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when one connection had done FLUSH TABLES WITH READ LOCK, some updates, and then COMMIT, it was accepted but my_error() was called and so, while client got no error, error was logged in binlog. We now don't call my_error() in this case; we assume the connection know what it does. This problem was specific to 4.0.21. The change is needed to make replication work with existing versions of innobackup. sql/lock.cc: If a connection has done FLUSH TABLES WITH READ LOCK and now is doing COMMIT, don't give error (applies only if it's the same connection; others' COMMITs are still blocked).
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
| * | | | | fix for wrong use of shell testunknown2004-10-201-1/+1
| |/ / / /
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-202-3/+68
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-secfix sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * | | | Fix for bug #6173 "One can circumvent missing UPDATE privilege ifunknown2004-10-202-3/+68
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | he has SELECT and INSERT privileges for table with primary key" Now we set lex->duplicates= DUP_UPDATE right in parser if INSERT has ON DUPLICATE KEY UPDATE clause, this simplifies insert_precheck() function (this also fixes a bug) and some other code. mysql-test/r/grant2.result: Added test for bug #6173 "One can circumvent missing UPDATE privilege if he has SELECT and INSERT privileges for table with primary key" mysql-test/t/grant2.test: Added test for bug #6173 "One can circumvent missing UPDATE privilege if he has SELECT and INSERT privileges for table with primary key" sql/mysql_priv.h: insert_precheck() don't need "update" parameter any longer since now we set lex->duplicates to DUP_UPDATE if INSERT has ON DUPLICATE KEY UPDATE clause. sql/sql_parse.cc: insert_precheck() don't need "update" parameter any longer since now we set lex->duplicates to DUP_UPDATE if INSERT has ON DUPLICATE KEY UPDATE clause, so it can determine whenever it is needed to require UPDATE_ACL by itself. Also calling of mysql_insert() is simplified. sql/sql_prepare.cc: insert_precheck() don't need "update" parameter any longer since now we set lex->duplicates to DUP_UPDATE if INSERT has ON DUPLICATE KEY UPDATE clause, so it can determine whenever it is needed to require UPDATE_ACL by itself. Also calling of mysql_insert() is simplified. sql/sql_yacc.yy: It is better to set Lex->duplicates= DUP_UPDATE right in parser if we have INSERT with ON DUPLICATE KEY UPDATE clause, rather doing this later.
* | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-192-0/+133
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
| * | | | Bug #6139 UNION doesn't understand collate in the column of second selectunknown2004-10-182-0/+133
| | | | |
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-182-0/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
| * | | | Bug #6040 can't retrieve records with umlaut characters in case insensitive ↵unknown2004-10-182-0/+17
| | | | | | | | | | | | | | | | | | | | manner
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-183-17/+214
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
| * | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-162-17/+213
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/talle/mysql-4.1
| | * | | New tests for bug#1644 and bug#1676,unknown2004-10-152-48/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test for bug#1180 changed to table naming scheme 't#'. mysql-test/r/ps_11bugs.result: Expected results of new tests for bug#1644 and bug#1676, test for bug#1180 changed to table naming scheme 't#'. mysql-test/t/ps_11bugs.test: New tests to check bug#1644 and bug#1676, test for bug#1180 changed to table naming scheme 't#'.
| | * | | Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1unknown2004-10-152-0/+208
| | |\ \ \
| | | * | | There were no tests for bug#1644 and bug#1676, added them now.unknown2004-10-142-0/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ps_11bugs.result: Expected results of the added tests for bug#1644 and bug#1676. mysql-test/t/ps_11bugs.test: Added tests for bug#1644 and bug#1676, also minor comments.
| * | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-151-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/talle/mysql-4.1 mysql-test/t/ctype_utf8.test: Auto merged
| | * | | | This patch removes unnecessary lock from the supremum record, takesunknown2004-10-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | X-locks on duplicates also on LOAD DATA...REPLACE clause and fixes a bug #6086 adding --disable_warnings and --enable_warnings around the create table clauses in ctype_utf8 tests for InnoDB. innobase/dict/dict0dict.c: Remove static. innobase/include/dict0dict.h: Add prototype for a function dict_scan_to innobase/row/row0ins.c: Add support for a LOAD DATA INFILE 'xxx' REPLACE INTO TABLE x. We should take X-locks on both REPLACE and LOAD DATA...REPLACE queries to duplicate records. innobase/row/row0sel.c: If innodb_locks_unsafe_for_binlog options is used we do not lock gaps. Supremum record is really a dummy record i.e. gap, therefore we do set locks there. mysql-test/t/ctype_utf8.test: Fix bug #6086: Add --disable_warnings and --enable_warnings around the create table where engine=innodb.
* | | | | | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2004-10-154-1/+149
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-ndb
| * \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-154-1/+149
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | * | | | | ctype_utf8.test, ctype_utf8.result:unknown2004-10-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrong handler. mysql-test/r/ctype_utf8.result: Wrong handler. mysql-test/t/ctype_utf8.test: Wrong handler.
| | * | | | | Bug #6019 SELECT tries to use too short prefix index on utf8 dataunknown2004-10-142-0/+26
| | | | | | |
| | * | | | | ctype_utf8.test:unknown2004-10-141-0/+8
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#6086 "ctype_utf8" test fails when MySQL does not include InnoDB support mysql-test/t/ctype_utf8.test: Bug#6086 "ctype_utf8" test fails when MySQL does not include InnoDB support
| | * | | | Bug #6043 erratic searching for diacriticals in indexed MyISAM UTF-8 tableunknown2004-10-142-0/+49
| | |/ / /
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-142-1/+66
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/media/sda1/mysql/mysql-4.1-5985 sql/sql_class.h: Auto merged
| | | * | | A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)" unknown2004-10-142-1/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crashes server." The fix makes Item_func_rand prepared-statements aware plus it fixes the case when RAND is used in prepared statements and replication is on (as well as several similar issues). Until now we did not reset THD before every execution of a prepared statement, so if some execution had set thd->time_zone_used or thd->rand_used they would not be reset until next mysql_parse. Some of post-review fixes done. mysql-test/r/ps.result: A test case for Bug#5985: test results fixed. mysql-test/t/ps.test: A test case for Bug#5985 "prepare stmt from "select rand(?)" crashes server." sql/item_func.cc: Actual fix for Bug#5985: Item_func_rand rewritten to be prepared statements aware. sql/item_func.h: Actual fix for Bug#5985: Item_func_rand rewritten to be prepared statements aware. sql/mysql_priv.h: We need a separate call to reset THD state before every execute of a prepared statement. Otherwise things like THD->user_var_events are never cleaned up and bloat binary log (as the list of events grows from execution to execution). sql/sql_class.cc: Statement::end_statement -> THD::end_statement() (a leftover from some design change which is not to pushed now, but the leftover is to be pushed). sql/sql_class.h: Statement::end_statement -> THD::end_statement() (a leftover from some design change which is not to pushed now, but the leftover is to be pushed). sql/sql_lex.cc: Move the part responsible for initializing LEX from mysql_init_query to lex_start. sql/sql_lex.h: All lex-related initialization is now in lex_start. Move thd->select_number to lex->select_number to be able to use it easily in lex_start. sql/sql_parse.cc: Split mysql_init_query into two functions: mysql_reset_thd_for_next_query, which is used in PS and conventional execution, and lex_start, used only when we want to parse something. Fix init_connect to use initialized THD. sql/sql_prepare.cc: Deploy mysql_reset_thd_for_next_query to reset THD state before execution of a prepared statement. Normally this should have been added to just one place, but we have to reset thd before assigning placeholders from variables, thus we can't do that in execute_stmt (yuck).
* | | | | | NDB dbtux minor changeunknown2004-10-141-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dbtux/Dbtux.hpp: remove TreePos::m_ent ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp: remove TreePos::m_ent ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp: remove TreePos::m_ent mysql-test/ndb/ndb_range_bounds.pl: more options
* | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2004-10-141-0/+133
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my41-tux ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged
| * \ \ \ \ \ Mergeunknown2004-10-101-0/+133
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_ndbcluster.cc: SCCS merged
| | * | | | | | NDB wl-2151 Fix bounds setting table handler vs TUXunknown2004-10-081-0/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/ndb/ndb_range_bounds.pl: wl-2151 Fix bounds setting table handler vs TUX ndb/include/kernel/signaldata/TuxBound.hpp: wl-2151 Fix bounds setting table handler vs TUX ndb/include/ndbapi/NdbIndexScanOperation.hpp: wl-2151 Fix bounds setting table handler vs TUX ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: wl-2151 Fix bounds setting table handler vs TUX ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp: wl-2151 Fix bounds setting table handler vs TUX ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp: wl-2151 Fix bounds setting table handler vs TUX ndb/test/ndbapi/testOIBasic.cpp: wl-2151 Fix bounds setting table handler vs TUX sql/ha_ndbcluster.cc: wl-2151 Fix bounds setting table handler vs TUX sql/ha_ndbcluster.h: wl-2151 Fix bounds setting table handler vs TUX
* | | | | | | | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2004-10-139-3/+290
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-ndb sql/ha_ndbcluster.cc: Auto merged
| * | | | | | | Bug#6020, any lock >= write_allow_write is a write lockunknown2004-10-132-0/+64
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_lock.result: Add testcases for table locks mysql-test/t/ndb_lock.test: Add testcases for table locks
| * | | | | | fix for some build/test errors for 4.1.6mysql-4.1.6unknown2004-10-131-3/+3
| | |_|/ / / | |/| | | |
| * | | | | ps.test, ps.result: a test case for Bug#6042 "constants unknown2004-10-122-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | propogation works only once (prepared statements)". mysql-test/r/ps.result: Test case for Bug#6042: test results fixed mysql-test/t/ps.test: A test case for Bug#6042 "constants propogation works only once (prepared statements).
View Lorry Controller Status