summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* Bug #6379: ENUM values are incorrectly convertedunknown2004-12-022-0/+60
| | | | | | | | | | | | - add_field_to_list() now uses <List>String instead of TYPELIB to be able to distinguish literals 'aaa' and hex literals 0xaabbcc. - move some code from add_field_to_list() where we don't know column charset yet, to mysql_prepare_table(), where we do.
* Move common trailing space checks into an include file.unknown2004-12-014-7/+35
| | | | | | | | | | | | | | | | | | | | | | Check UCS2 trailing spaces. mysql-test/r/ctype_ucs.result: Move common trailing space checks into an include file. Check UCS2 trailing spaces. Fix UCS2 to handle trailing spaces in PAD way. mysql-test/t/ctype_ucs.test: Move common trailing space checks into an include file. Check UCS2 trailing spaces. Fix UCS2 to handle trailing spaces in PAD way. mysql-test/t/endspace.test: Move common trailing space checks into an include file. Check UCS2 trailing spaces. Fix UCS2 to handle trailing spaces in PAD way. strings/ctype-ucs2.c: Move common trailing space checks into an include file. Check UCS2 trailing spaces. Fix UCS2 to handle trailing spaces in PAD way.
* Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-012-0/+20
|\ | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2004-12-012-0/+20
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | * testcase for bug#6871, ndb, replace with collationsunknown2004-12-012-0/+20
| | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_charset.result: testcase for bug#6871 mysql-test/t/ndb_charset.test: testcase for bug#6871
* | | openssl_1.result, have_openssl_1.require, openssl_1.test:unknown2004-12-013-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update SSL Cipher so that 'openssl_1' test passes (BUG#6152) mysql-test/t/openssl_1.test: Update SSL Cipher so that 'openssl_1' test passes (BUG#6152) mysql-test/r/have_openssl_1.require: Update SSL Cipher so that 'openssl_1' test passes (BUG#6152) mysql-test/r/openssl_1.result: Update SSL Cipher so that 'openssl_1' test passes (BUG#6152) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-11-302-0/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-clean mysql-test/r/flush_block_commit.result: Auto merged mysql-test/t/flush_block_commit.test: Auto merged sql/lock.cc: Auto merged
| * | | two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next ↵unknown2004-11-302-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FLUSH...LOCK hang forever" (originally reported as "second run of innobackup hangs forever and can even hang server"). Plus testcase for the bugfix and comments about global read locks. mysql-test/r/flush_block_commit.result: result update mysql-test/t/flush_block_commit.test: testing bugfix (originally: second run of innobackup hangs) sql/lock.cc: When we are in start_waiting_global_read_lock(), if we ourselves have the global read lock, there is nothing to start. This makes a pair with how wait_if_global_read_lock() behaves when we ourselves have the global read lock. Previously, start_waiting_global_read_lock() decremented protect... whereas wait_if_global_read_lock() hadn't incremented it => very wrong => hangs. Descriptive comments on how global read lock works.
* | | | fixed error in test resultunknown2004-11-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added extra calls to retrieve connectstring used reengineered connect somewhat to make retries etc explicit mysql-test/r/ndb_index_unique.result: fixed error in test result ndb/include/mgmapi/mgmapi.h: added extra calls to retrieve connectstring used ndb/include/mgmcommon/ConfigRetriever.hpp: added extra calls to retrieve connectstring used ndb/include/ndbapi/ndb_cluster_connection.hpp: added extra calls to retrieve connectstring used reengineered connect somewhat to make retries etc explicit ndb/src/common/mgmcommon/ConfigRetriever.cpp: added extra calls to retrieve connectstring used ndb/src/mgmapi/mgmapi.cpp: added extra calls to retrieve connectstring used ndb/src/mgmclient/CommandInterpreter.cpp: moved parse of quit to avoid connect before ndb/src/ndbapi/Ndbinit.cpp: reengineered connect somewhat to make retries etc explicit ndb/src/ndbapi/ndb_cluster_connection.cpp: added extra calls to retrieve connectstring used reengineered connect somewhat to make retries etc explicit ndb/tools/listTables.cpp: reengineered connect somewhat to make retries etc explicit sql/ha_ndbcluster.cc: added extra calls to retrieve connectstring used reengineered connect somewhat to make retries etc explicit
* | | | ps_7ndb.result, ps_7ndb.test:unknown2004-11-302-421/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb now runs ps tests just like the others mysql-test/t/ps_7ndb.test: ndb now runs ps tests just like the others mysql-test/r/ps_7ndb.result: ndb now runs ps tests just like the others
* | | | An additional test for 'CREATE DATABASE' with non-default character set.unknown2004-11-302-0/+26
| | | |
* | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-302-0/+26
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101 client/mysqldump.c: Auto merged
| * | | A fix (bug #6101: mysqldump writes invalid SQL).unknown2004-10-192-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | client/mysqldump.c: A fix (bug #6101: mysqldump writes invalid SQL). Syntax corrected.
* | | | Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2004-11-302-0/+56
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1 mysql-test/r/ndb_index_unique.result: Auto merged mysql-test/t/ndb_index_unique.test: Auto merged sql/ha_ndbcluster.cc: Auto merged
| * | | ndb - fixed long overdue problems with unique indexes and null valuesunknown2004-11-302-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_index_unique.result: Test of unique index and null mysql-test/t/ndb_index_unique.test: Test of unique index and null sql/ha_ndbcluster.cc: Fixed long overdue problems with unique indexes and null values
* | | | ndb_grant.later:unknown2004-11-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later mysql-test/t/ndb_grant.later: Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
* | | | post-merge fixunknown2004-11-282-31/+9
| | | |
* | | | mergedunknown2004-11-282-0/+52
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union innobase/srv/srv0srv.c: Auto merged mysql-test/t/select.test: Auto merged sql/item_cmpfunc.h: Auto merged sql/slave.cc: Auto merged
| * | | Fixes while reviewing codeunknown2004-11-262-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Cleanups and better bug fixes) mysql-test/r/select.result: Fixed test after wrong merge mysql-test/t/select.test: Fixed test after wrong merge scripts/mysql_fix_privilege_tables.sh: Don't read defaults files sql/item_cmpfunc.cc: Fix wrong value for not_null_tables_cache sql/item_cmpfunc.h: Remove wrong patch (flags are set in fix_length_and_dec()) sql/item_func.h: Fix wrong value for not_null_tables_cache sql/slave.cc: Fixed indentation
| * | | Merge mysql.com:/home/timka/mysql/src/4.0-virginunknown2004-11-252-0/+46
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/timka/mysql/src/4.0-master BitKeeper/etc/logging_ok: auto-union
| * \ \ \ Merge for BUG#3759 which was missing from the main tree for some reason.unknown2004-11-2552-138/+1322
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/item_cmpfunc.h: Auto merged mysql-test/r/select.result: Merge for BUG#3759 mysql-test/t/select.test: Merge for BUG#3759
| * | | | | added test for BUG#3759unknown2004-08-302-0/+35
| | | | | |
* | | | | | bad merge fixedunknown2004-11-281-2/+2
| | | | | |
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-11-282-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | | | | skip last compress test if we're short of RAMunknown2004-11-282-3/+6
| | | | | | |
* | | | | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-252-0/+46
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/bkroot/mysql-4.1
| * | | | | | Mergeunknown2004-11-252-0/+46
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_repl.cc: Auto merged sql/repl_failsafe.cc: Merging 4.0 and 4.1 changes.
| | * | | | | Merge mysql.com:/space/bkroot/mysql-4.0unknown2004-11-252-0/+46
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/bk/b6148-mysql-4.0 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | | * | | | Fix for Bug#6148. Only rewind read position in binary log when theunknown2004-11-252-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slave SQL thread is started. sql/slave.cc: Adding threads to init as parameter to init_master_info. Only rewind read position when starting SQL thread. sql/slave.h: Adding threads to init as parameter to init_master_info. Only rewind read position when starting SQL thread. sql/sql_repl.cc: Adding threads to init as parameter to init_master_info. Only rewind read position when starting SQL thread. sql/repl_failsafe.cc: Adding threads to init as parameter to init_master_info. Only rewind read position when starting SQL thread.
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-11-242-0/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | | | | bug#6784unknown2004-11-242-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mi_flush_bulk_insert (on dup key error in mi_write) was mangling info->dupp_key_pos
* | | | | | | Bug#6787 LIKE not working properly with _ and utf8 dataunknown2004-11-244-0/+17
|/ / / / / /
* | | | | | Delete: mysql-test/mysql_test_run.cunknown2004-11-231-1728/+0
| | | | | |
* | | | | | mergedunknown2004-11-223-1/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Docs/Support/texi2html: Auto merged client/mysqltest.c: Auto merged myisam/ft_boolean_search.c: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/rpl000015.result: Auto merged mysql-test/r/rpl_log_pos.result: Auto merged mysql-test/r/rpl_rotate_logs.result: Auto merged mysql-test/t/fulltext.test: Auto merged mysql-test/t/rpl000001.test: Auto merged mysql-test/t/rpl000015.test: Auto merged mysql-test/t/rpl_log_pos.test: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged
| * | | | | merged with ulunknown2004-11-221-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Docs/Support/texi2html: Auto merged mysql-test/t/rpl000001.test: Auto merged mysql-test/t/rpl000015.test: Auto merged mysql-test/t/rpl_log_pos.test: Auto merged
| | * | | | | Enabled mysqltest for MASTER_PORT replacement.unknown2004-08-247-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced fixed port numbers by MASTER_PORT replacement. This allows for a set of ports per tree and hence parallel testing on multiple trees. client/mysqltest.c: Enabled mysqltest for MASTER_PORT replacement. mysql-test/r/rpl000014.result: Replaced fixed port numbers by MASTER_PORT. mysql-test/r/rpl000015.result: Replaced fixed port numbers by MASTER_PORT. mysql-test/r/rpl_rotate_logs.result: Replaced fixed port numbers by MASTER_PORT. mysql-test/t/rpl000001.test: Replaced fixed port numbers by MASTER_PORT replacement. Just in case it might get un-commented. mysql-test/t/rpl000014.test: Replaced fixed port numbers by MASTER_PORT replacement. mysql-test/t/rpl000015.test: Replaced fixed port numbers by MASTER_PORT replacement. mysql-test/t/rpl_rotate_logs.test: Replaced fixed port numbers by MASTER_PORT replacement. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-11-222-0/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | * | | | | | ft_boolean_search.c:unknown2004-11-222-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug#6705 - (+trunc1* +trunc2*) fulltext.test, fulltext.result: bug#6705 mysql-test/r/fulltext.result: bug#6705 mysql-test/t/fulltext.test: bug#6705 myisam/ft_boolean_search.c: bug#6705 - (+trunc1* +trunc2*)
* | | | | | | | Bug#6252 - Duplicate columns in keys should failunknown2004-11-228-12/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added check for duplicate column in key Added tests and fixed tests which exploit bug mysql-test/r/delete.result: Fix test as it exploited Bug#6252 mysql-test/r/innodb.result: Test for Bug#6126 mysql-test/r/key.result: Test for Bug#6126/6252 mysql-test/r/type_blob.result: Fix test as it exploited Bug#6252 mysql-test/t/delete.test: Fix test as it exploited Bug#6252 mysql-test/t/innodb.test: Test for Bug#6126 mysql-test/t/key.test: Test for Bug#6126/6252 mysql-test/t/type_blob.test: Fix test as it exploited Bug#6252 sql/sql_table.cc: Bug#6252 - Duplicate columns in keys should fail Added check for duplicate column.
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-11-221-7/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | | | | | | added --no-defaults to ndb_drop_table in autodiscover testunknown2004-11-221-7/+7
| | | | | | | | |
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-11-223-2/+20
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | | | | | | Bug #6748 heap_rfirst() doesn't work (and never did!)unknown2004-11-223-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | range for BETWEEN typo fixed extra/perror.c: meaningless error message fixed heap/hp_rfirst.c: Bug #6748 heap_rfirst() doesn't work (and never did!) mysql-test/r/heap.result: Bug #6748 heap_rfirst() doesn't work (and never did!) mysql-test/r/range.result: range for BETWEEN typo fixed mysql-test/t/heap.test: Bug #6748 heap_rfirst() doesn't work (and never did!) sql/handler.cc: Bug #6748 heap_rfirst() doesn't work (and never did!) sql/sql_select.cc: range for BETWEEN typo fixed
* | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-222-0/+71
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
| * | | | | | | | | Added NULL value tests for UNIQUE indexunknown2004-11-222-0/+71
| | | | | | | | | |
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-222-1/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-bg6462
| * | | | | | | | | Backport of fix making myisam test results repeatableunknown2004-11-222-1/+3
| | | | | | | | | |
* | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-222-0/+15
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
| * | | | | | | | | Added checks for NOT NULL for all fields in UNIQUE INDEX (USING HASH)unknown2004-11-222-0/+15
| | | | | | | | | |
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-222-0/+34
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-bg6462 sql/set_var.cc: Auto merged
View Lorry Controller Status