summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* Bug #792 combination of date-interval and between with mixed constant and ↵unknown2003-08-062-0/+3
| | | | non-constant
* Merge bk-internal:/home/bk/mysql-4.0/unknown2003-08-052-0/+10
|\ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * make it clear for optimizer that XOR's are not optimizable at the moment ↵unknown2003-08-052-0/+10
| | | | | | | | (BUG#992)
* | 2 bugfixes:unknown2003-08-044-0/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Bug #985: "Between RESET SLAVE and START SLAVE, SHOW SLAVE STATUS is wrong." Now RESET SLAVE puts correct info in mi->host etc. A new test rpl_reset_slave for that. - Bug #986: "CHANGE MASTER & START SLAVE do not reset error columns in SHOW SLAVE STATUS". Now these reset the errors. mysql-test/r/rpl_loaddata.result: result update. mysql-test/t/rpl_loaddata.test: Test that RESET SLAVE, START SLAVE and CHANGE MASTER all reset Last_slave_error and Last_slave_errno (columns of SHOW SLAVE STATUS). We do it in this test because that's one of tests which have an intentional query error on the slave. sql/slave.cc: As we need TWICE the code to copy command-line options (--master-host etc) to mi (we already had it in init_master_info, but we also need it in RESET SLAVE to fix bug#985), I make a function of this code. And a function to reset Last_slave_error and Last_slave_errno (we need it in CHANGE MASTER, RESET SLAVE, and at the start of the SQL thread). sql/slave.h: declarations for new functions. sql/sql_repl.cc: copy --master-host etc to mi in RESET SLAVE, so that SHOW SLAVE STATUS shows correct information.
* | Fix so that SET PASSWORD is not replicated by the slave if running withunknown2003-08-025-0/+167
|/ | | | | | | | | | | | | | | | | | | replicate-*-table rules which exclude 'mysql' tables (e.g. replicate-wild-ignore-table=mysql.%). This was already the behaviour for GRANT/REVOKE, I'm extending it to SET PASSWORD because it seems very logical (the contrary seems illogical). 2 new tests: - one to test if GRANT and SET PASSWORD are replicated - one to test if they are not replicated if replicate-wild-ignore-table=mysql.% The 2nd is also a testcase for BUG#980. sql/sql_acl.cc: Fix so that SET PASSWORD is not replicated by the slave if running with replicate-*-table rules which exclude 'mysql' tables (e.g. replicate-wild-ignore-table=mysql.%). This was already the behaviour for GRANT/REVOKE, I'm extending it to SET PASSWORD because it seems very logical (the contrary seems illogical).
* Merge bk-internal:/home/bk/mysql-4.0/unknown2003-08-014-1/+66
|\ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * bug #942. docid == ftb->lastpos in join on looping over nested tableunknown2003-07-312-1/+26
| |
| * outer join, impossible on condition, where, and usable key for rangeunknown2003-07-252-0/+40
| | | | | | | | | | | | | | bug#926
* | support of more then 255 tables dependence in query cache (fixed BUG#930)unknown2003-07-302-2/+1063
| | | | | | | | | | | | | | | | | | mysql-test/r/query_cache.result: test of many merged tales mysql-test/t/query_cache.test: test of many merged tales sql/sql_cache.h: query with merged tables can depend of more then 255 tables
* | Make rpl_insert_id.test use InnoDB, and added foreign keys to the table,unknown2003-07-262-4/+6
|/ | | | | | | | | | | | | | so that it really tests replication of SET FOREIGN_KEY_CHECKS (previously it used MyISAM). mysql-test/r/rpl_insert_id.result: result update mysql-test/t/rpl_insert_id.test: Make test use InnoDB, and added foreign keys to the table, so that it really tests replication of FOREIGN_KEY_CHECKS. --disable_warnings because 4.1 prints a warning when the table type is not available.
* Merge bk-internal:/home/bk/mysql-4.0/unknown2003-07-182-0/+7
|\ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * my_strnncoll_latin1_de rewritten from scratch. Bug with overlapping combos ↵unknown2003-07-172-0/+7
| | | | | | | | | | | | | | | | | | went away. mysql-test/r/ctype_latin1_de.result: testing overlapping combos mysql-test/t/ctype_latin1_de.test: testing overlapping combos
* | Fixed memory overrun when doing REPAIR on table with multi-part ↵unknown2003-07-182-0/+15
|/ | | | | | | | | | | | | | | | | auto_increment key where one part was a packed CHAR myisam/mi_check.c: Fixed memory overrun in _mi_put_key_in_record myisam/mi_key.c: Fixed unnecessary memory allocation mysql-test/r/insert_select.result: Added test case for memory corruption mysql-test/t/insert_select.test: Added test case for memory corruption mysys/safemalloc.c: Removed compiler warnings sql/sql_acl.cc: Fixed core dump when running with --debug
* Fixed wrong test in LOG::closeunknown2003-07-142-6/+12
| | | | | | | | | | | | Fixed test for binary build mysql-test/r/rpl_max_relay_size.result: Fixed test for binary build mysql-test/t/rpl_max_relay_size.test: Fixed test for binary build sql/log.cc: Fixed wrong test in close
* Better fix for bug #791: At binlog rotation, INSERTs may not find their way ↵unknown2003-07-141-0/+1
| | | | | | | | | | | | | | | | into the binlog mysql-test/t/rpl_flush_log_loop.test: Add timer to avoid problem when 'flush logs' is executed before we have read all data from master sql/log.cc: Better fix for bug #791: Mark log as LOG_TO_BE_OPENED instead of LOG_CLOSED when it's closed and opened. sql/mysqld.cc: Better startup message sql/slave.cc: Fix argument to close() sql/sql_class.h: Better handling of log.close()
* Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-141-1/+1
|\ | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/4.0
| * backport fix for the bug #803: INTERVAL(NULL, ....)unknown2003-07-141-1/+1
| |
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-141-1/+1
|\ \ | |/ |/| | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0
| * Safety and speedup fixes:unknown2003-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed is_open() to work as before. Added back inited argument to LOG mysql-test/r/rpl_flush_log_loop.result: Fixed results (probably bug in previous rpatch) sql/handler.cc: Changed is_open() to work as before sql/item_func.cc: Changed is_open() to work as before sql/log.cc: Part revert of previous patch. The reason for adding back 'inited' is that is that we can't be 100 % sure that init_pthread_objects() is called before mysqld dies (for example on windows) I removed mutex lock handling in is_open() as the new code didn't have ANY affect except beeing slower. Added back checking of is_open() to some functions as we don't want to do a mutex lock when we are not using logging. Indentation/comment fixes sql/log_event.cc: Changed is_open() to work as before sql/repl_failsafe.cc: Changed is_open() to work as before sql/sql_base.cc: Changed is_open() to work as before sql/sql_class.h: Changed is_open() to work as before. Added back 'inited' variable sql/sql_db.cc: Changed is_open() to work as before sql/sql_delete.cc: Changed is_open() to work as before sql/sql_insert.cc: Changed is_open() to work as before sql/sql_load.cc: Changed is_open() to work as before sql/sql_parse.cc: Changed is_open() to work as before sql/sql_rename.cc: Changed is_open() to work as before sql/sql_repl.cc: Changed is_open() to work as before sql/sql_table.cc: Changed is_open() to work as before sql/sql_update.cc: Changed is_open() to work as before
* | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-142-1/+4
|\ \ | |/ | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/4.0
| * - fixed an error in the rpl_error_ignored_table test suite: the masterunknown2003-07-112-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | port number can be different from 3306 when doing the release builds with Do-compile, therefore it has to be replaced with the correct value during the test run using the "--replace_result" function. mysql-test/r/rpl_error_ignored_table.result: - replaced hard-coded master port number with MASTER_PORT variable, since the port number is different when running the test suite during the release builds with "Do-compile". mysql-test/t/rpl_error_ignored_table.test: - replaced hard-coded master port number with MASTER_PORT variable, since the port number is different when running the test suite during the release builds with "Do-compile".
* | Fix for the bug #801: create table t1 select x'41'; doesn't workunknown2003-07-112-0/+9
| |
* | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-111-1/+1
|\ \ | |/ | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/4.0
| * Fix for BUG#812 unknown2003-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "mysqlhotcopy fails to copy tables but does not indicate a failure" ("does not indicate a failure"); this is about "mysqlhotcopy fails to copy tables". mysql-test/t/rpl_error_ignored_table-slave.opt: added a missing newline scripts/mysqlhotcopy.sh: Fix for BUG#812. The problem was that with many tables to copy (10000 in the bug's example), the generated 'cp' command line was 1MB long, whereas (at least on my Linux) it should not exceed 128 kB. Testing the 'cp' in a shell terminal gives "arguments list too long". So we issue several small (100 kB) 'cp' command lines instead of a big one. Of course, this will still fail on systems where the limit is below 100 kB. We now have safe_system() which cuts the command line in pieces, and calls safe_simple_system() (execution) for each piece.
* | Fix for the bug #803.unknown2003-07-102-0/+4
|/ | | | | | | Now INTERVAL(NULL, N1, N2, ...) returns NULL.
* Cleanupsunknown2003-07-091-2/+5
| | | | | | | | | | | | | mysql-test/t/distinct.test: Cleanup sql/log.cc: Cleanup sql/slave.cc: Cleanup sql/sql_delete.cc: Cleanup sql/sql_parse.cc: Simple optimization
* Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-092-0/+131
|\ | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0 sql/mysqld.cc: Auto merged
| * Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYSunknown2003-07-082-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup myisam/mi_extra.c: Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS mysql-test/r/alter_table.result: Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS mysql-test/t/alter_table.test: Test DISABLE/ENABLE KEY sql/ha_myisam.cc: Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS sql/mysqld.cc: Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup sql/sql_table.cc: Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS sql/table.cc: Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS sql/table.h: Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS
* | Fix forunknown2003-07-083-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG#797 "If query ignored on slave (replicate-ignore-table) the slave still checks if the returned error (0) is the same as the one on the master, whereas it shouldn't test this. Plus a new test for BUG#797. include/mysqld_error.h: New error code (can be sent only to the slave thread, not to normal clients). sql/log.cc: removed comment from a previous debugging. sql/log_event.cc: ER_SLAVE_IGNORED_TABLE is an ignorable error. sql/share/czech/errmsg.txt: for BUG#797 sql/share/danish/errmsg.txt: for BUG#797 sql/share/dutch/errmsg.txt: for BUG#797 sql/share/english/errmsg.txt: for BUG#797 sql/share/estonian/errmsg.txt: for BUG#797 sql/share/french/errmsg.txt: for BUG#797 sql/share/german/errmsg.txt: for BUG#797 sql/share/greek/errmsg.txt: for BUG#797 sql/share/hungarian/errmsg.txt: for BUG#797 sql/share/italian/errmsg.txt: for BUG#797 sql/share/japanese/errmsg.txt: for BUG#797 sql/share/korean/errmsg.txt: for BUG#797 sql/share/norwegian-ny/errmsg.txt: for BUG#797 sql/share/norwegian/errmsg.txt: for BUG#797 sql/share/polish/errmsg.txt: for BUG#797 sql/share/portuguese/errmsg.txt: for BUG#797 sql/share/romanian/errmsg.txt: for BUG#797 sql/share/russian/errmsg.txt: for BUG#797 sql/share/slovak/errmsg.txt: for BUG#797 sql/share/spanish/errmsg.txt: for BUG#797 sql/share/swedish/errmsg.txt: for BUG#797 sql/share/ukrainian/errmsg.txt: for BUG#797 sql/sql_parse.cc: when in sql_parse in the slave thread we ignore the query because of replicate-do and replicate-ignore options, we return a specific error to the slave thread, so that it knows that the query has been ignored (which is different from a successful query). A small cleanup (test was done twice).
* | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-07-072-12/+53
|\ \ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | finally proper recursive descent for parsing expressions with MATCH ... ↵unknown2003-07-072-12/+53
| |/ | | | | | | AGAINST in add_ft_keys()
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-066-7/+147
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0 sql/mysql_priv.h: Auto merged sql/slave.h: Auto merged sql/sql_parse.cc: Auto merged
| * | WL#912 (more user control on relay logs):unknown2003-07-066-7/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FLUSH LOGS now rotates relay logs, and a new variable max_relay_log_size. Plus a very small bit of code cleaning. libmysqld/lib_sql.cc: open_log has no default arguments anymore. mysql-test/r/rpl_flush_log_loop.result: result update now that FLUSH LOGS rotates relay logs. mysql-test/r/rpl_log.result: result update now that FLUSH LOGS rotates relay logs. mysql-test/r/rpl_rotate_logs.result: result update now that max_binlog_size is 4096. mysql-test/t/rpl_rotate_logs-master.opt: now max_binlog_size must be a multiple of 4096 (see change in mysqld.cc) sql/log.cc: Got rid of default arguments of various MYSQL_LOG methods (the default arguments made code reading uneasy). Set max_size in ::init(). New function set_max_size() to set max_size of a MYSQL_LOG on-the-fly. More DBUG info. sql/mysql_priv.h: no defaults in open_log(). New variables max_relay_log_size. sql/mysqld.cc: New variable and option max_relay_log_size. max_binlog_size and max_relay_log_size are multiples of IO_SIZE. No more default arguments for log functions. sql/set_var.cc: New variable max_relay_log_size. If it is 0, then max_binlog_size will apply to relay logs. When one of these variables is changed, fix_max_%log_size is called to update max_size of the binary and/or relay logs. sql/slave.cc: New function rotate_relay_log(). sql/slave.h: New function rotate_relay_log(). sql/sql_class.h: New member max_size of MYSQL_LOG (for automatic rotation). New method set_max_size() for setting on-the-fly. sql/sql_parse.cc: Flush the relay log in FLUSH LOGS.
* | | missing test case for DISTINCT .. LEFT ..unknown2003-07-052-0/+16
| |/ |/|
* | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-07-041-0/+2
|\ \ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | merge + order by (bug #515) temporary fixunknown2003-07-041-0/+2
| | | | | | | | | | | | | | | | | | | | | properly fixed in 4.1
* | | fix and test case for the bug #787: HANDLER without INDEX doesn't work with ↵unknown2003-07-042-0/+34
|/ / | | | | | | | | | | | | | | | | | | | | deleted rows mysql-test/r/handler.result: test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows mysql-test/t/handler.test: test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows sql/sql_handler.cc: fix for the bug #787: HANDLER without INDEX doesn't work with deleted rows
* | handler should be used with constant expressions only (or rand)unknown2003-07-042-0/+4
| |
* | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-032-0/+24
|\ \ | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.0.739
| * | Fix for #739unknown2003-07-032-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check for negative count in RPAD added mysql-test/r/func_str.result: Appropriate result mysql-test/t/func_str.test: testcase added sql/item_strfunc.cc: we return NULL if count < 0
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-034-0/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| * | | Proposed fix for #751unknown2003-07-034-0/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fields in key_expr (mysql_ha_read) wasn't linked to tables. Hmm. How did it work at all? mysql-test/r/alias.result: It's better to delete table after the test mysql-test/r/handler.result: appropriate result mysql-test/t/alias.test: it's better to drop table after test mysql-test/t/handler.test: test case for #751 sql/sql_handler.cc: fix_fields called
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-034-0/+53
|\ \ \ | |/ / | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| * | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-032-0/+30
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.0
| | * | Test case for #570 addedunknown2003-07-032-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/alias.result: Appropriate test result mysql-test/t/alias.test: Testcase for #570
| * | | Fix and test-case for the bug #775: SELECT misses rows in indexed HEAP table ↵unknown2003-07-032-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | columns. heap/hp_open.c: Fix for the bug #775: SELECT misses rows in indexed HEAP table columns. mysql-test/r/heap.result: Test-case for the bug #775: SELECT misses rows in indexed HEAP table columns. mysql-test/t/heap.test: Test-case for the bug #775: SELECT misses rows in indexed HEAP table columns.
* | | | Fix for UNIXWARE 7unknown2003-07-031-4/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unaligned warnings on Ia64 from client library when using --host Fix for replication when using many file descriptors include/my_global.h: Fix for UNIXWARE 7 libmysql/libmysql.c: Portability fix (removes unaligned warnings on Ia64) mysql-test/r/symlink.result: Updated results sql/mini_client.cc: Ported connect timeout code from libmysql.c
* | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-032-0/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.0.717
| * | | Proposed bugfix for #717unknown2003-07-032-0/+27
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current table is placed into read_tables set of the current join_tab->select so get_mm_parts function thinks that current table's record is read and tries to calculate WHERE condition with the fields of the record. Result of these calculations is unpredictable. Looks funny - outcome of the SELECT depends on the queries executed before. Anyway i think we should have testcase on this part of the code. mysql-test/r/sel000001.result: appropriate result added mysql-test/t/sel000001.test: testcase added sql/sql_select.cc: I think we should count current table out of read_tables set
* | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-032-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.0.628 sql/item_strfunc.cc: Auto merged
View Lorry Controller Status