summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | Testcase for #628unknown2003-07-032-0/+8
| | |/ | |/| | | | | | | | | | | | | | | | mysql-test/r/func_misc.result: Appropriate result mysql-test/t/func_misc.test: Test case added
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-038-87/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0 mysql-test/r/innodb.result: Auto merged mysql-test/t/innodb.test: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * | I committed the same changeset in my tree yesterday, but broke the tree since,unknown2003-07-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so I commit again in a fresh tree. Fix for bug#763 (Relay_log_space too big by 4 bytes), plus comments and DBUG_PRINT, and we don't start replication if --bootstrap. mysql-test/r/rpl_log.result: Result update mysql-test/r/rpl_log_pos.result: Result update sql/mysqld.cc: Don't start replication if in bootstrap mode (bootstrap isn't supposed to have several threads). sql/slave.cc: Fix for bug 763 (Relay_log_space too big by 4 bytes). A DBUG_PRINT. sql/sql_acl.cc: Replaced a return by DBUG_RETURN (happened to find this reading a debug log). sql/sql_repl.cc: A comment.
| * | innodb.result, innodb.test:unknown2003-07-032-67/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all nondeterministic tests from innodb.test; but I have to study why on 64 bits we get different estimates mysql-test/t/innodb.test: Remove all nondeterministic tests from innodb.test; but I have to study why on 64 bits we get different estimates mysql-test/r/innodb.result: Remove all nondeterministic tests from innodb.test; but I have to study why on 64 bits we get different estimates
| * | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-07-022-2/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | * | bug #504: in "datetime op int" comparison int wasn't converted to datetimeunknown2003-07-022-2/+12
| | | |
| * | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-022-12/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| | * | | Fix for a problem with :unknown2003-07-022-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;
| * | | | innodb.test, innodb.result:unknown2003-07-022-4/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit) mysql-test/r/innodb.result: Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit) mysql-test/t/innodb.test: Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit)
* | | | Cleaner implementation if INSERT ... SELECT with same tablesunknown2003-07-0318-22/+138
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests cleanup (put drop database first in tests) client/mysql.cc: Cleanup of code in last pull include/config-win.h: Remove HAVE_CHSIZE on windows as it's not 64 bit clean include/my_global.h: Portability fix mysql-test/r/drop.result: Clean up results mysql-test/r/flush.result: Clean up results mysql-test/r/grant_cache.result: Clean up results mysql-test/r/innodb.result: Clean up results mysql-test/r/insert_select.result: Clean up results mysql-test/r/merge.result: Clean up results mysql-test/r/query_cache.result: Clean up results mysql-test/t/drop.test: Clean up tests mysql-test/t/flush.test: Clean up tests mysql-test/t/grant_cache.test: Clean up tests mysql-test/t/innodb.test: Clean up tests mysql-test/t/insert_select.test: Added more tests mysql-test/t/merge.test: Test of bug 515 mysql-test/t/query_cache.test: Clean up tests mysql-test/t/symlink.test: Clean up tests sql/mysql_priv.h: Cleaner implementation if INSERT ... SELECT with same tables sql/sql_lex.h: Cleaner implementation if INSERT ... SELECT with same tables sql/sql_list.h: Indentation cleanup sql/sql_parse.cc: Cleaner implementation if INSERT ... SELECT with same tables sql/sql_yacc.yy: Cleaner implementation if INSERT ... SELECT with same tables
* | | Some fixes for CREATE / INSERT FROM UNIO >..unknown2003-07-023-5/+31
| | |
* | | merge changesunknown2003-07-0222-61/+190
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | mysql-test/r/insert_select.result: Auto merged mysql-test/t/insert_select.test: Auto merged sql/sql_select.cc: Auto merged
| * | Updated results after mergeunknown2003-07-011-0/+4
| | |
| * | Merge with 3.23 tree to get latest bug fixesunknown2003-07-012-0/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/item_func.cc: Auto merged mysql-test/t/user_var.test: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/nt_servc.cc: Auto merged configure.in: Use local version innobase/os/os0file.c: Use local version innobase/page/page0page.c: Use local version innobase/row/row0sel.c: Use local version innobase/row/row0vers.c: Use local version mysql-test/r/order_by.result: Use local version mysql-test/r/user_var.result: merge with 3.23 mysql-test/t/order_by.test: Use local version (test is already in range.test) sql/log.cc: Use local version sql/share/spanish/errmsg.txt: merge sql/slave.cc: Use local version sql/sql_class.h: Use local version sql/sql_select.cc: Use patch in 4.0 for range with NULL problem
| | * \ Merge bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-07-012-0/+27
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-3.23
| | | * | Fixed 'Unknown error' when doing ORDER BY on reference table whichunknown2003-06-292-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was used with NULL value on NOT NULL column. (Bug #479) mysql-test/r/order_by.result: Update of results mysql-test/t/order_by.test: Test of new code sql/sql_select.cc: Fixed problem with lookup on NULL
| | * | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-3.23unknown2003-06-262-0/+14
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_479_/mysql-3.23 BitKeeper/etc/logging_ok: auto-union
| | | * | fixed bug with type of user variables (bug #551)unknown2003-06-252-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/user_var.result: added tests for user variables comparing (bug #551) mysql-test/t/user_var.test: added tests for user variables comparing (bug #551) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | Optimized old patchesunknown2003-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't set field to DEFAULT value when set to NULL mysql-test/r/insert.result: Updated results after patch sql/field_conv.cc: Revert patch: Don't set field to DEFAULT value when set to NULL sql/item_strfunc.cc: Optimized patch for null handling with elt sql/opt_range.cc: Safety fix for range with null patch
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-07-0119-60/+171
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0 sql/item_strfunc.cc: Auto merged sql/sql_select.cc: Auto merged
| | * | | | Code/testcase cleanupsunknown2003-07-014-24/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/insert_select.result: Fixed results mysql-test/r/join_outer.result: New test case for inner join table dependency mysql-test/t/insert_select.test: Remove not used drop tables. Fixed table names mysql-test/t/join_outer.test: New test case for inner join table dependency sql/slave.cc: Simple optimizations
| | * | | | SET CHARACTER SET DEFAULT didn't work (Bug #462)unknown2003-06-292-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUILD/compile-pentium-debug-max: Removed -DBIG_TABLES because of problems with gdb 5.3 sql/set_var.cc: SET CHARACTER SET DEFAULT didn't work sql/set_var.h: SET CHARACTER SET DEFAULT didn't work
| | * | | | Fixed testcase after last changesunknown2003-06-272-8/+12
| | | | | |
| | * | | | Added thread variable max_seeks_for_keyunknown2003-06-2711-32/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change optimizer to prefer key lookups before table scan Change table scans to be done after tables with constrains on scanned table mysql-test/r/distinct.result: Update results mysql-test/r/group_by.result: Update results mysql-test/r/heap.result: Update results mysql-test/r/join.result: Update results mysql-test/r/key_diff.result: Update results mysql-test/r/myisam.result: Update results mysql-test/r/order_by.result: Update results mysql-test/r/select_safe.result: Update results mysql-test/t/distinct.test: Change test to be repeatable mysql-test/t/join.test: Change test to be repeatable mysql-test/t/select_safe.test: Add tests for MAX_SEEKS_FOR_KEY sql/handler.h: Optimize structure for 64 bit machines (and to avoid problems with gdb) sql/item_cmpfunc.cc: Initialize not_null_tables_cache properly sql/mysqld.cc: Added max_seeks_for_key sql/set_var.cc: Added max_seeks_for_key sql/sql_class.h: Added max_seeks_for_key sql/sql_select.cc: Added max_seeks_for_key Change optimizer to prefer key lookups before table scan. Change table scans to be done after tables with constrains on scanned table
| | * | | | LEFT JOIN optimization: Change LEFT JOIN to normal join if possibleunknown2003-06-262-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/select.result: Added test for LEFT JOIN optimization mysql-test/t/select.test: Added test for LEFT JOIN optimization sql/item.h: LEFT JOIN optimization sql/item_cmpfunc.cc: LEFT JOIN optimization sql/item_cmpfunc.h: LEFT JOIN optimization sql/item_func.cc: LEFT JOIN optimization sql/item_func.h: LEFT JOIN optimization sql/item_strfunc.cc: LEFT JOIN optimization sql/sql_base.cc: Heart of LEFT JOIN optimization
* | | | | | Lot's of clean-ups and fixes for 4.0.14.unknown2003-07-026-0/+541
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: CONFIG_SMP mysql-test/r/grant.result: Test cases for bug fixes mysql-test/r/insert_select.result: Test cases for bug fixes mysql-test/r/union.result: Test cases for bug fixes mysql-test/t/grant.test: Test cases for bug fixes mysql-test/t/insert_select.test: Test cases for bug fixes mysql-test/t/union.test: Test cases for bug fixes sql/sql_acl.cc: Fix for granting global privileges on db level sql/sql_parse.cc: Fix for INSERT... SELECT sql/sql_select.cc: removing a fix sql/sql_union.cc: P
* | | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-06-262-63/+102
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | | | | bug with ranges and not_null_col=can_be_null_expr fixedunknown2003-06-262-63/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/range.result: new test added long lines reformatted mysql-test/t/range.test: new test added long lines reformatted
* | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-06-262-0/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.0.615
| * | | | | | Another bugfix for #615unknown2003-06-242-0/+22
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks a bit nicer than previous one mysql-test/r/insert.result: Test results added mysql-test/t/insert.test: testcase for the bug added sql/field.h: Field::set_default fixed sql/field_conv.cc: Now we can just replace field->reset() with field->set_default() here
* | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-06-252-0/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.0.674 sql/sql_select.cc: Auto merged
| * | | | | | Testcase for #674 addedunknown2003-06-252-0/+25
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/sel000100.result: Result of the testcase added mysql-test/t/sel000100.test: checking for bug #674 added
* | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-06-242-0/+25
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.0.666
| * | | | | Test case for bug #666unknown2003-06-242-0/+25
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_str.result: test for bug #666 result mysql-test/t/func_str.test: test for bug #666
* | | | | Simple code cleanupunknown2003-06-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/innodb.result: Fixed test case after innodb optimize->analyze fix mysys/mf_pack.c: Added comments sql/log_event.cc: Fixed usage of fn_format() sql/slave.cc: Indentation fixes and comments cleanup sql/sql_repl.cc: Comment cleanup
* | | | | SHOW GRANTS hided real grants when grants on both column and table (Bug 654)unknown2003-06-232-7/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/grant.result: Test of grant BUG mysql-test/t/grant.test: Test of grant BUG sql/sql_acl.cc: SHOW GRANTS hided real grants when grants on both column and table (Bug 654) Code cleanup (Bigger than intended because of editor problem) sql/sql_acl.h: Fixed grant bug
* | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-06-232-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.defweek sql/mysqld.cc: Auto merged
| * | | | | Always send a fake Rotate event (this is roughly 70 bytes) when starting ↵unknown2003-06-212-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binlog_dump. This way 3.23.58 slaves will always detect a 4.0.14 master (and stop) immediately. BUG#198. mysql-test/r/rpl_log.result: result update (the relay log now contains a fake Rotate_log_event). mysql-test/r/rpl_log_pos.result: result update (the relay log now contains a fake Rotate_log_event).