summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-11-2820-60/+618
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/pem/mysql-5.1-new include/my_base.h: Auto merged libmysqld/examples/Makefile.am: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/ndb_alter_table.result: Auto merged mysql-test/r/ndb_basic.result: Auto merged mysql-test/t/ndb_alter_table.test: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged sql/examples/ha_example.cc: Auto merged storage/myisam/ft_parser.c: Auto merged storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged libmysqld/Makefile.am: Manual merge. sql/ha_ndbcluster.cc: Manual merge. sql/mysqld.cc: Manual merge.
| * Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-11-282-0/+78
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/pem/bug14643/mysql-5.0
| | * Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-11-282-0/+78
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/pem/bug14643/mysql-5.0 sql/sp_head.cc: Auto merged mysql-test/r/sp.result: Manual merge. mysql-test/t/sp.test: Manual merge.
| | | * Fixed BUG#14643: Stored Procedure: Continuing after failed var.unknown2005-11-082-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialization crashes server. Make sure variables are initialized to something (like null) when the default initialization fails and a continue handler is in effect. mysql-test/r/sp.result: New test case for BUG#14643. mysql-test/t/sp.test: New test case for BUG#14643. sql/sp_head.cc: Make sure variables are initialized to something (like null) when the default initialization fails and a continue handler is in effect. If this also fails (out of memory), we have to abort without letting the handler catch.
| * | | grant.result:unknown2005-11-281-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merge fix. mysql-test/r/grant.result: After merge fix.
| * | | Merge mysql.com:/usr/home/bar/mysql-4.1.b14406unknown2005-11-281-0/+12
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0 mysql-test/r/ps_grant.result: Auto merged mysql-test/t/grant.test: Auto merged
| | * | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-283-6/+39
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b14406
| | | * | Bug#14406 GRANTS ON objects with non-ascii names borked after FLUSH PRIVILEGESunknown2005-11-143-6/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ps_grant.result: Fixing result order. grant.result: Adding test case, fixing result order. grant.test: Adding test case. sql_acl.cc: Fixed that my_charset_latin1 was incorrectly used instead of system_charset_info. This problem was previously fixed by Ingo in 5.0. This patch is basically a backport of the same changes into 4.1. sql/sql_acl.cc: Bug#14406 GRANTS ON objects with non-ascii names borked after FLUSH PRIVILEGES Fixed that my_charset_latin1 was incorrectly used instead of system_charset_info. This problem was previously fixed by Ingo in 5.0. This patch is basically a backport of the same changes into 4.1. mysql-test/t/grant.test: Adding test case. mysql-test/r/grant.result: Adding test case, fixing result order. mysql-test/r/ps_grant.result: Fixing result order.
| | * | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-11-262-0/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-272-0/+91
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| | * \ \ \ \ Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-262-0/+91
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/mysql-5.0
| | | * | | | | Fixed bug #15106.unknown2005-11-252-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A typo bug caused loss of a predicate of the form field=const in some cases. mysql-test/r/select.result: Added a test case for bug #15106. mysql-test/t/select.test: Added a test case for bug #15106.
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-262-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| | * | | | | | Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1unknown2005-11-262-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0 myisam/ft_parser.c: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/t/fulltext.test: Auto merged
| | | * | | | followup for for the bug#5686unknown2005-11-262-0/+4
| | | | | | |
| * | | | | | Enabled back bunch of tests for stored routines which were disabledunknown2005-11-262-43/+148
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | earlier because of various features/checks missing (these features/checks are now implemented). mysql-test/r/sp.result: Enabled back bunch of tests which were previously disabled because of various features/checks missing (since these features/checks are now implemented). mysql-test/t/sp.test: Enabled back bunch of tests which were previously disabled because of various features/checks missing (since these features/checks are now implemented).
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-258-15/+80
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| | * | | | | Post-merge fixes.unknown2005-11-253-4/+31
| | | | | | |
| | * | | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2005-11-255-11/+49
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root mysql-test/r/ndb_alter_table.result: Auto merged mysql-test/r/ndb_basic.result: Auto merged mysql-test/t/select.test: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/table.cc: Auto merged vio/vio.c: Auto merged vio/viossl.c: Auto merged include/my_base.h: Manual merge. mysql-test/r/ps.result: Manual merge. mysql-test/r/select.result: Manual merge. mysql-test/t/ndb_alter_table.test: Manual merge. mysql-test/t/ndb_basic.test: Manual merge. mysql-test/t/ps.test: Manual merge. sql-common/client.c: k sql/ha_ndbcluster.cc: Manual merge. sql/item.cc: Manual merge. sql/sql_table.cc: Manual merge.
| | | * | | | A fix and a test case for Bug#14410 "Crash in Enum or Set type in unknown2005-11-252-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CREATE TABLE and PS/SP": make sure that 'typelib' object for ENUM values and 'Item_string' object for DEFAULT clause are created in the statement memory root. mysql-test/r/ps.result: Test results has been fixed (Bug#14410) mysql-test/t/ps.test: A test case for Bug#14410 "Crash in Enum or Set type in CREATE TABLE and PS/SP" sql/mysql_priv.h: typelib() function declaration has been changed. sql/sql_table.cc: Supply the statement memory root to use in typelib() and safe_charset_converter() functions to ensure that objects created during the first execution of CREATE TABLE statement are allocated in persistent memory of the statement. sql/table.cc: Change typelib() function to require MEM_ROOT.
| | | * | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-252-0/+19
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| | | | * \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-242-0/+19
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/14482-bug-4.1-mysql
| | | | | * | | | Fix bug #14482 Wrongly applied optimization in resolve_const_item() causedunknown2005-11-242-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crash resolve_const_item() substitutes item which will evaluate to constant with equvalent constant item, basing on the item's result type. In this case subselect was resolved as constant, and resolve_const_item() was substituting it's result's Item_caches to Item_null. Later Item_cache's function was called for Item_null object, which caused server crash. resolve_const_item() now substitutes constants for items with result_type == ROW_RESULT only for Item_rows. sql/item.cc: Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused crash resolve_const_item() now applies optimization for items with result_type == ROW_RESULT only to Item_rows. mysql-test/t/select.test: Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash mysql-test/r/select.result: Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash
| | | * | | | | | Updated expected errorunknown2005-11-252-2/+2
| | | |/ / / / /
| | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-212-0/+12
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1 sql/ha_ndbcluster.cc: Auto merged
| | | | * | | | | Bug #14514 Creating table with packed key fails silentlyunknown2005-11-212-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Backport from 5.0 include/my_base.h: Rename HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE, ie. it's a bit in the table_options variable mysql-test/r/ndb_basic.result: Add test result mysql-test/t/ndb_basic.test: Add test case for bug14514 sql/ha_ndbcluster.cc: Use new bitmask for table_options to detect if create from engine sql/handler.cc: Use new bit for create from engine
| | | * | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-212-2/+5
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| | | * | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-1916-17/+469
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck configure.in: Auto merged
| * | | \ \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-252-1/+15
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0.b14146 sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged
| * | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-242-0/+20
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/13293-bug-5.0-mysql
| | * | | | | | | | | Fix bug#13293 Wrongly used index results in endless loop.unknown2005-11-242-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loose index scan using only second part of multipart index was choosen, which results in creating wrong keys and endless loop. get_best_group_min_max() now allows loose index scan for distinct only if used keyparts forms a prefix of the index. mysql-test/t/group_min_max.test: Test case for bug #13293 Wrongly used index results in endless loop. mysql-test/r/group_min_max.result: Test case for bug #13293 Wrongly used index results in endless loop. sql/opt_range.cc: Fix bug #13293 Wrongly used index results in endless loop. get_best_group_min_max() now allows loose index scan for distinct only if used keyparts forms a prefix of the index.
| * | | | | | | | | | Remove t3 in join_nested.testunknown2005-11-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/join_nested.result: Remove t3 too. mysql-test/t/join_nested.test: Remove t3 too.
| * | | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-11-244-0/+162
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/pem/bug13729/mysql-5.0
| | * | | | | | | | | Some post-merge cleaning, and made assert THD::store_globals() work at all ↵unknown2005-11-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | times. mysql-test/t/sp.test: Tidying up after merge. sql/mysqld.cc: Make sure we have thd->thread_stack set before calling store_globals(). (And fixed compiler warning.) sql/sql_class.cc: Init THD::tread_stack in constructor.
| | * | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-11-244-0/+160
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/pem/bug13729/mysql-5.0 mysql-test/r/sp.result: Manual merge fix. mysql-test/t/sp.test: Manual merge fix.
| | | * | | | | | | | | Fixed BUG#13729 Stored procedures: packet error after exception handledunknown2005-11-234-0/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't set thd->is_fatal_error in sql_update for duplicate key errors. mysql-test/r/sp.result: New test case for BUG#13729. mysql-test/r/sp_trans.result: New test case for BUG#14840. mysql-test/t/sp.test: New test case for BUG#13729. mysql-test/t/sp_trans.test: New test case for BUG#14840. sql/sql_update.cc: Don't set thd->is_fatal_error if it's a duplicate key error.
| * | | | | | | | | | | table t7 was not dropped at the endunknown2005-11-242-2/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/join_nested.result: drop t7 mysql-test/t/join_nested.test: drop t7
* | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-5.0.b14146.sepunknown2005-11-282-1/+15
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged
| * | | | | | | | | | Bug#14146 CHAR(...USING ...) and CONVERT(CHAR(...) USING...) produce ↵unknown2005-11-072-1/+15
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | different results ctype_utf8.result, ctype_utf8.test: Adding test case. item_strfunc.cc: item_strfunc.h: Moving the well formed checking code into a method, to reuse in several Item_func_xxx. Reusing the new method in Item_func_char and Item_func_charset_conv. sql/item_strfunc.h: Bug#14146 CHAR(...USING ...) and CONVERT(CHAR(...) USING...) produce different results Moving the well formed checking code into a method, to reuse in several Item_func_xxx. sql/item_strfunc.cc: Moving the well formed checking code into a method, to reuse in several Item_func_xxx. mysql-test/t/ctype_utf8.test: Adding test case. mysql-test/r/ctype_utf8.result: Adding test case.
* | | | | | | | | | Added my nameunknown2005-11-271-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed to alphabetical order mysql-test/r/show_check.result: Changed to alphabetical order
* | | | | | | | | | Fixed failing "show check" test.unknown2005-11-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/show_check.result: fixed failing test for Holyfoot ;-) sql/authors.h: added myself
* | | | | | | | | | Fixing result file from previous merge. unknown2005-11-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/mysqldump.result: Fixing result from merge
* | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-11-242-3/+52
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zim.(none):/home/brian/mysql/mysql-5.1-new client/mysqldump.c: Auto merged mysql-test/r/mysqldump.result: REsolve mysql-test/t/mysqldump.test: Resolve conflict
| * | | | | | | | | | Its funny, I am reading through the forums and someone asks "Can I please ↵unknown2005-11-242-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have a REPLACE INTO, instead an INSERT INTO?" and I remember how often I have used a sed script to modify MySQL dumps to have exactly that. So, use --replace and instead of getting INSERT INTO you will INSTEAD get REPLACE INTO. Buyer beward, REPLACE is a MySQL SQL, so you will not end up with a dump that can be used for other databases. Though I hear you could just use a sed line to modify it back :) client/client_priv.h: New option for --replace client/mysqldump.c: Added option for REPLACE INTO instead of INSERT INTO mysql-test/r/mysqldump.result: Updated REsultes for replace into mysql-test/t/mysqldump.test: Added new test for --replace
* | | | | | | | | | | added missing errorcode handling in NdbIndexStat causing test failureunknown2005-11-241-1/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2005-11-241-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1 mysql-test/t/disabled.def: SCCS merged
| * | | | | | | | | | | Merge from 5.0 has fixed the disabled compress.testunknown2005-11-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/disabled.def: undisable compress test case
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-11-247-36/+152
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/my/mysql-5.1
| * | | | | | | | | | | | updated test as result of config change done in cluster startupunknown2005-11-241-5/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-11-246-31/+147
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
View Lorry Controller Status