summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-newunknown2006-02-021-0/+2
|\ | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql51 mysql-test/t/disabled.def: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged
| * added more logging in ndb handlerunknown2006-02-021-0/+2
| | | | | | | | | | | | | | | | | | | | enable extra logging in ndb handler during test runs mysql-test/mysql-test-run.pl: enable extra logging in ndb handler during test runs sql/ha_ndbcluster_binlog.cc: added more logging in ndb handler
| * disabled test because of bug, bug assigned and being worked onunknown2006-02-021-0/+1
| |
* | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-0211-18/+211
|\ \ | |/ | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql51
| * Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_mergeunknown2006-02-0211-18/+211
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-5.1-merge client/mysqltest.c: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/sp-error.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/type_decimal.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/r/view_grant.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/mysqltest.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/sp.test: Auto merged sql/ha_berkeley.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_handler.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/share/errmsg.txt: Auto merged mysql-test/mysql-test-run.pl: SCCS merged sql/sql_yacc.yy: Manual merge: resolve the conflict with moved sp_if rule
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-176-40/+15
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| | | * Bug#15206: "Misleading message "No data to FETCH":unknown2006-01-176-40/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reword the misleading message. mysql-test/r/sp-error.result: Test results fixed (Bug#15206) mysql-test/r/sp.result: Test results fixed (Bug#15206) mysql-test/r/type_decimal.result: Disable an unportable test case (Bug#7670) mysql-test/r/variables.result: Test results fixed (Bug#15206) mysql-test/r/view_grant.result: Test results fixed (Bug#15206) mysql-test/t/type_decimal.test: Remove an unportable (QNX) test case (Bug#7670). The test output depends on system-specific sprintf() implementation. The original complain was about erroneous conversion to long long, which was applied prior to conversion to double: but the expected behaviour can't be achieved until we have an own string -> double conversion function.
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-172-1/+8
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| | | * Fix for connection not being added to connection pool if ↵unknown2006-01-172-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "disable_abort_on_error" was used. client/mysqltest.c: If connection suceeded don't close it, just call handle_no_error which will check if an error was expected mysql-test/r/mysqltest.result: Update test result mysql-test/t/mysqltest.test: Add test for connection not being added to connection pool if "disable_abort_on_error" was used
| | * | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-172-40/+116
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/work/bug15231/mysql-5.0 mysql-test/r/sp.result: Manual merge. mysql-test/t/sp.test: Manual merge.
| | * \ \ Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-173-2/+174
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/work/bug14498/mysql-5.0
| | | * | | Post-merge fixes (BUG#14498)unknown2006-01-162-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/sp-code.result: Post-merge fix; updated result. mysql-test/t/sp.test: Post-merge fix; added comment (still can't call bug14498_4 test)
| | | * | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-162-1/+171
| | | |\ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/work/bug14498/mysql-5.0 sql/sp_head.h: Auto merged sql/sp_pcontext.h: Auto merged mysql-test/r/sp.result: Manual merge. mysql-test/t/sp.test: Manual merge. sql/sp_head.cc: Manual merge. sql/sql_yacc.yy: Manual merge.
| | | | * | Fixed BUG#14498: Stored procedures: hang if undefined variable and exceptionunknown2005-11-042-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was to continue at the right place in the code after the test expression in a flow control statement fails with an exception (internally, the test in sp_instr_jump_if_not), and the exception is caught by a continue handler. Execution must then be resumed after the the entire flow control statement (END IF, END WHILE, etc). mysql-test/r/sp.result: New test case for BUG#14498. mysql-test/t/sp.test: New test case for BUG#14498. (Note that one call is disabled at the moment. Depends on BUG#14643.) sql/sp_head.cc: Added a continuation destination for sp_instr_jump_if_not, for the case when an error in the test expression causes a continue handler to catch. This includes new members in sp_instr_jump_if_not, adjustment of the optmizer (mark and move methods), and separate backpatching code (since we can't use the normal one for this). Also removed the class sp_instr_jump, since it's never used. ...and added some comments to the optimizer. sql/sp_head.h: Added a continuation destination for sp_instr_jump_if_not, for the case when an error in the test expression causes a continue handler to catch. This includes new members in sp_instr_jump_if_not, adjustment of the optmizer (mark and move methods), and separate backpatching code (since we can't use the normal one for this). Also removed the class sp_instr_jump, since it's never used. sql/sql_yacc.yy: Added backpatching of the continue destination for all conditional statements (using sp_instr_jump_if_not).
| | * | | | A post-merge fix.unknown2006-01-171-14/+0
| | | | | |
| | * | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2006-01-171-0/+14
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/r/ps.result: SCCS merged mysql-test/t/ps.test: SCCS merged
| | | * | | | A fix for Bug#13337 "ps test fails if configure wo/ usc2"unknown2006-01-174-32/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ctype_ucs.result: Test results changed (Bug#13337) mysql-test/r/ps.result: Test results changed (Bug#13337) mysql-test/t/ctype_ucs.test: Fix Bug#13337 (move the test that uses UCS character set to ctype_ucs) mysql-test/t/ps.test: Fix Bug#13337 (move the test that uses UCS character set to ctype_ucs)
| | * | | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2006-01-172-0/+12
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root mysql-test/r/create.result: Auto merged mysql-test/t/create.test: Auto merged sql/sql_table.cc: Auto merged
| | | * | | | Mergeunknown2006-01-162-0/+12
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/create.result: Auto merged mysql-test/t/create.test: Auto merged sql/sql_table.cc: SCCS merged
| | | * \ \ \ \ Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-01-152-0/+76
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss14
| | | | * | | | | Changes from innodb-4.1-ss14 snapshotunknown2006-01-152-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed BUG#14056: Column prefix index on UTF-8 primary key causes "Can't find record.." Also fixed bug 15991. innobase/include/os0file.h: Changes from innodb-4.1-ss14 snapshot os_file_hadle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when the .ibd file is a symbolic link to a different file system. (Bug 15991) innobase/os/os0file.c: Changes from innodb-4.1-ss14 snapshot os_file_hadle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when the .ibd file is a symbolic link to a different file system. (Bug 15991) mysql-test/r/innodb.result: Changes from innodb-4.1-ss14 snapshot Fixed BUG#14056: Column prefix index on UTF-8 primary key causes "Can't find record.." mysql-test/t/innodb.test: Changes from innodb-4.1-ss14 snapshot Fixed BUG#14056: Column prefix index on UTF-8 primary key causes "Can't find record.." sql/ha_innodb.cc: Changes from innodb-4.1-ss14 snapshot Fixed BUG#14056: Column prefix index on UTF-8 primary key causes "Can't find record.."
| | * | | | | | | A test case for Bug#6073 "ALTER TABLE minor glitch" (can't repeat)unknown2006-01-172-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/alter_table.result: Test results fixed (Bug#6073) mysql-test/t/alter_table.test: A test case for Bug#6073
| | * | | | | | | A test case for Bug#7670 "Loss of precision for some integer unknown2006-01-162-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values stored into DOUBLE column" (Can't repeat) mysql-test/r/type_decimal.result: Test results fixed (Bug#7670) mysql-test/t/type_decimal.test: A test case for Bug#7670
| | * | | | | | | Merge mysql.com:/usr/local/mysql/mysql-5.x-win-test-fixesunknown2006-01-161-3/+6
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/mysql-5.0-win-test-fixes mysql-test/mysql-test-run.pl: Manual merge.
* | | | | | | | | | disbled sporadically failing testcaseunknown2006-02-021-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-releaseunknown2006-02-022-0/+489
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql51 sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged
| * | | | | | | | | Bug #16753 DD: mysqldump does not support Cluster Disk Data backupsunknown2006-02-022-15/+34
| | | | | | | | | |
| * | | | | | | | | Bug #16753 DD: mysqldump does not support Cluster Disk Data backupsunknown2006-02-022-0/+470
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_dd_dump.result: New BitKeeper file ``mysql-test/r/ndb_dd_dump.result'' mysql-test/t/ndb_dd_dump.test: New BitKeeper file ``mysql-test/t/ndb_dd_dump.test''
* | | | | | | | | | Post-merge fixes.unknown2006-02-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/disabled.def: disabling new test that was added during null-merge from 5.0 the new test innodb_unsafe_binlog will be re-enabled when the 5.1 snapshot for InnoDB is applied. Disabling test rather than removing files to make future merges easier (removing the files would cause merge conflicts when the files are re-added in the 5.1 snapshot).
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-013-0/+116
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge sql/ha_innodb.cc: Auto merged
| * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_mergeunknown2006-02-013-0/+116
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge Null-merge InnoDB snapshots from 5.0 to 5.1 storage/innobase/include/lock0lock.h: Auto merged mysql-test/r/innodb.result: null-merge from 5.0 mysql-test/t/innodb.test: null-merge from 5.0 sql/ha_innodb.cc: null-merge from 5.0 storage/innobase/include/data0type.h: null-merge from 5.0 storage/innobase/include/data0type.ic: null-merge from 5.0 storage/innobase/include/os0file.h: null-merge from 5.0 storage/innobase/include/row0mysql.h: null-merge from 5.0 storage/innobase/lock/lock0lock.c: null-merge from 5.0 storage/innobase/os/os0file.c: null-merge from 5.0 storage/innobase/row/row0ins.c: null-merge from 5.0 storage/innobase/row/row0mysql.c: null-merge from 5.0 storage/innobase/row/row0sel.c: null-merge from 5.0 storage/innobase/trx/trx0trx.c: null-merge from 5.0
| | * | | | | | | | | Changes from the innodb-5.0-ss115 snapshot.unknown2006-01-165-32/+631
| | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bugs: BUG#15991: "innodb-file-per-table + symlink database + rename = crash" BUG#15650: "DELETE with LEFT JOIN crashes server" BUG#15308: "Problem of Order with Enum Column in Primary Key" BUG#14189: "VARBINARY and BINARY variables: trailing space ignored" innobase/include/data0type.h: Changes from the innodb-5.0-ss115 snapshot. innobase/include/data0type.ic: Changes from the innodb-5.0-ss115 snapshot. Fixed bug #14189. dtype_get_pad_char(): Do not pad VARBINARY or BINARY cloumns. innobase/include/lock0lock.h: Changes from the innodb-5.0-ss115 snapshot. innobase/include/os0file.h: Changes from the innodb-5.0-ss115 snapshot. os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when the .ibd file is a symbolic link to a different file system (bug#15991). innobase/include/row0mysql.h: Changes from the innodb-5.0-ss115 snapshot. innobase/lock/lock0lock.c: Changes from the innodb-5.0-ss115 snapshot. lock_rec_unlock(): Initialize local variable release_lock, in order to avoid dereferencing an uninitialized pointer when no lock exists on rec. innobase/os/os0file.c: Changes from the innodb-5.0-ss115 snapshot. os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when the .ibd file is a symbolic link to a different file system (bug#15991). Protect the increment and decrement operations on the statistic variables os_n_pending_writes/reads with os_file_count_mutes. innobase/row/row0ins.c: Changes from the innodb-5.0-ss115 snapshot. Fixed bug #14189. row_ins_cascade_calc_update_vec(): Refuse ON UPDATE_CASCADE when trying to change the length of of a VARBINARY column that refers to or is referenced by a BINARY column. BINARY columns are no longer padded on comparison, and thus they cannot be padded on storage either. innobase/row/row0mysql.c: Changes from the innodb-5.0-ss115 snapshot. Fixed bug on unlock_row. In a unlock_row we may unlock only the latest lock granted to this transaction to the row. innobase/row/row0sel.c: Changes from the innodb-5.0-ss115 snapshot. Fixed bug #15308. Fixed bug #14189: innobase_init(): Assert that DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number. After review fixes for unlock bug where unlock released all locks transaction requested for a row. Only a latest requested lock to a row should be released. Update function comments to reflect current state. Persistent cursor should be stored whenever select lock type != LOCK_NONE. innobase/trx/trx0trx.c: Changes from the innodb-5.0-ss115 snapshot. trx_commit_off_kernel(): Do not write empty trx->mysql_log_file_name. mysql-test/r/innodb.result: Changes from the innodb-5.0-ss115 snapshot. mysql-test/t/innodb.test: Changes from the innodb-5.0-ss115 snapshot. sql/ha_innodb.cc: Changes from the innodb-5.0-ss115 snapshot. Fixed bug #15308. Fixed bug #14189: innobase_init(): Assert that DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number. After review fixes for unlock bug where unlock released all locks transaction requested for a row. Only a latest requested lock to a row should be released. Update function comments to reflect current state. Persistent cursor should be stored whenever select lock type != LOCK_NONE. mysql-test/r/innodb_unsafe_binlog.result: Changes from the innodb-5.0-ss115 snapshot. mysql-test/t/innodb_unsafe_binlog-master.opt: Changes from the innodb-5.0-ss115 snapshot. mysql-test/t/innodb_unsafe_binlog.test: Changes from the innodb-5.0-ss115 snapshot. Added testcases for bug #15650.
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-021-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.1-merges
| * | | | | | | | | Disabled ndb_blobunknown2006-02-011-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-012-40/+117
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.1-merges
| * | | | | | | | Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge2unknown2006-02-012-40/+117
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-5.1-merge mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged
| | * | | | | | | Added bug synopsis in comment for sp.test case BUG#15231.unknown2005-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/sp.test: Added bug synopsis in comment for test case BUG#15231.
| | * | | | | | | Fixed BUG#15231: Stored procedure bug with not found condition handlerunknown2005-12-132-40/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the distinction between "exception conditions" and "completion conditions" (warning and "no data") as defined by the standard. The latter should not terminate a routine if no handler is found in the lexical scope. mysql-test/r/sp.result: New test case for BUG#15231. Moved part of the test for BUG#7049 to the new testcase (since it was actually an example of 15231). mysql-test/t/sp.test: New test case for BUG#15231. Moved part of the test for BUG#7049 to the new testcase (since it was actually an example of 15231). sql/sp_rcontext.cc: Only search for matching condition handlers in caller's contexts if it's an exception conditition.
* | | | | | | | | Addition to the fix for BUG#9412 "Triggers: should have trigger privilege".unknown2006-02-011-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we add new privilege we should update mysql-test/lib/init_db.sql accordingly. mysql-test/lib/init_db.sql: Added TRIGGER privilege. sql/sql_acl.h: Updated comment describing process of addition of new privileges - added yet another script place which should be modified when new privilege is added.
* | | | | | | | | Merge mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359unknown2006-02-0214-71/+245
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge mysql-test/r/information_schema.result: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.h: Auto merged sql/sql_show.cc: Auto merged
| * | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-015-10/+12
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql51 sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/sql_show.cc: Auto merged
| | * | | | | | | | another attempt to make testcase predictable :)unknown2006-02-012-8/+0
| | | | | | | | | |
| | * | | | | | | | Bug #16466 DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 ↵unknown2006-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STORAGE DISK corrected test case
| | * | | | | | | | MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE ↵unknown2006-02-012-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table_space1 STORAGE DISK
| * | | | | | | | | Fix for BUG#9412: Triggers: should have trigger privilege.unknown2006-02-019-36/+223
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement table-level TRIGGER privilege to control access to triggers. Before this path global SUPER privilege was used for this purpose, that was the big security problem. In details, before this patch SUPER privilege was required: - for the user at CREATE TRIGGER time to create a new trigger; - for the user at DROP TRIGGER time to drop the existing trigger; - for the definer at trigger activation time to execute the trigger (if the definer loses SUPER privilege, all its triggers become unavailable); This patch changes the behaviour in the following way: - TRIGGER privilege on the subject table for trigger is required: - for the user at CREATE TRIGGER time to create a new trigger; - for the user at DROP TRIGGER time to drop the existing trigger; - for the definer at trigger activation time to execute the trigger (if the definer loses TRIGGER privilege on the subject table, all its triggers on this table become unavailable). - SUPER privilege is still required: - for the user at CREATE TRIGGER time to explicitly set the trigger definer to the user other than CURRENT_USER(). When the server works with database of the previous version (w/o TRIGGER privilege), or if the database is being upgraded from the previous versions, TRIGGER privilege is granted to whose users, who have CREATE privilege. mysql-test/r/grant.result: Updated the result file after adding TRIGGER privilege. mysql-test/r/information_schema.result: Updated the result file after adding TRIGGER privilege. mysql-test/r/lowercase_table_grant.result: Updated the result file after adding TRIGGER privilege. mysql-test/r/ps.result: Updated the result file after adding TRIGGER privilege. mysql-test/r/sp.result: Updated the result file after adding TRIGGER privilege. mysql-test/r/trigger-compat.result: Updated the result file after adding TRIGGER privilege. mysql-test/r/trigger-grant.result: Updated the result file after adding TRIGGER privilege. mysql-test/t/trigger-compat.test: Grant table-level TRIGGER privilege instead of global SUPER one. mysql-test/t/trigger-grant.test: 1. Grant table-level TRIGGER privilege instead of global SUPER one. 2. Updated the test case to check that SUPER is required to specify the user other than the current as a definer. scripts/mysql_create_system_tables.sh: Added TRIGGER privilege. scripts/mysql_fix_privilege_tables.sql: Added TRIGGER privilege. sql/sql_acl.cc: Added TRIGGER privilege. sql/sql_acl.h: Added TRIGGER privilege. sql/sql_show.cc: Added TRIGGER privilege. sql/sql_trigger.cc: Check TRIGGER privilege instead of SUPER. sql/sql_yacc.yy: Added TRIGGER privilege.
| * | | | | | | | adjust test to give predictable outputunknown2006-02-012-27/+12
| | | | | | | | |
* | | | | | | | | some fixes from review of WL1359.unknown2006-02-022-2/+11
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix up test cases. mysql-test/r/information_schema.result: update result for INFORMATION_SCHEMA.FILES mysql-test/r/information_schema_db.result: update result for INFORMATION_SCHEMA.FILES sql/ha_ndbcluster.cc: in fill_files_table, use my_snprintf instead of snprintf sql/sql_show.cc: correct DBUG_ENTER for fill_schema_files sql/table.h: add SCH_FILES to information schema enum
* | | | | | | | ensure repeatability of test caseunknown2006-02-012-3/+3
| | | | | | | |
* | | | | | | | wl2325, distribution of schema operations between mysql serversunknown2006-02-018-55/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_binlog_ddl_multi.result: New BitKeeper file ``mysql-test/r/ndb_binlog_ddl_multi.result'' mysql-test/t/ndb_binlog_ddl_multi.test: New BitKeeper file ``mysql-test/t/ndb_binlog_ddl_multi.test''
* | | | | | | | Added test case for creating index on disk stored tableunknown2006-01-312-0/+3
| | | | | | | |
View Lorry Controller Status