summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* Merge xiphis.org:/home/antony/work2/mysql-5.1unknown2005-12-214-2/+65
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into xiphis.org:/home/antony/work3/mysql-5.1-plugable-2 configure.in: Auto merged mysql-test/r/bdb.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/t/bdb.test: Auto merged sql/Makefile.am: Auto merged sql/ha_archive.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_federated.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_partition.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item_sum.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/sql_table.cc: SCCS merged
| * Finalize storage engine pluginsunknown2005-12-214-2/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give BerkeleyDB savepoints Remove "enum db_type" from most of the code storage/example/ha_example.h: Rename: sql/examples/ha_example.h -> storage/example/ha_example.h storage/csv/ha_tina.h: Rename: sql/examples/ha_tina.h -> storage/csv/ha_tina.h config/ac-macros/storage.m4: if hton name is "no", then we don't install it as a builtin configure.in: pluggable changes include/plugin.h: version field mysql-test/r/bdb.result: savepoint results copied from innodb test mysql-test/r/information_schema.result: PLUGINS information schema mysql-test/r/information_schema_db.result: PLUGINS information schema mysql-test/t/bdb.test: savepoint test copied from innodb test sql/Makefile.am: tina and example are not here anymore sql/authors.h: minor tweek sql/ha_archive.cc: remove unwanted handlerton entries sql/ha_berkeley.cc: remove unwanted handlerton entries support for savepoints changes to show logs sql/ha_blackhole.cc: remove unwanted handlerton entries sql/ha_federated.cc: remove unwanted handlerton entries sql/ha_heap.cc: remove unwanted handlerton entries sql/ha_innodb.cc: remove unwanted handlerton entries changes for show status sql/ha_myisam.cc: remove unwanted handlerton entries sql/ha_myisammrg.cc: remove unwanted handlerton entries sql/ha_ndbcluster.cc: remove unwanted handlerton entries changes to stat_print sql/ha_partition.cc: remove unwanted handlerton entries bye bye enum db_type sql/ha_partition.h: bye bye enum db_type sql/handler.cc: remove unwanted handlerton entries bye bye enum db_type sql/handler.h: remove unwanted handlerton entries bye bye enum db_type changes to stat_print_fn sql/item_sum.cc: bye bye enum db_type sql/log.cc: remove unwanted handlerton entries sql/mysql_priv.h: bye bye enum db_type sql/mysqld.cc: bye bye enum db_type reorder plugin initialization sql/set_var.cc: bye bye enum db_type sql/set_var.h: bye bye enum db_type sql/sql_base.cc: bye bye enum db_type sql/sql_cache.cc: bye bye enum db_type sql/sql_class.h: bye bye enum db_type sql/sql_delete.cc: bye bye enum db_type sql/sql_insert.cc: bye bye enum db_type sql/sql_lex.h: show plugin sql/sql_parse.cc: bye bye enum db_type sql/sql_partition.cc: bye bye enum db_type sql/sql_plugin.cc: loadable storage engines sql/sql_plugin.h: loadable storage engines sql/sql_rename.cc: bye bye enum db_type sql/sql_select.cc: bye bye enum db_type sql/sql_show.cc: SHOW PLUGIN PLUGINS information schema changes to show engines sql/sql_table.cc: bye bye enum db_type sql/sql_view.cc: bye bye enum db_type sql/sql_view.h: bye bye enum db_type sql/sql_yacc.yy: bye bye enum db_type sql/table.cc: bye bye enum db_type sql/table.h: bye bye enum db_type sql/unireg.cc: bye bye enum db_type storage/csv/ha_tina.cc: make tina into a loadable plugin storage/example/ha_example.cc: make into a plugin storage/csv/Makefile.am: New BitKeeper file ``storage/csv/Makefile.am'' storage/example/Makefile.am: New BitKeeper file ``storage/example/Makefile.am''
* | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-212-0/+739
|\ \ | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new.xml
| * | Adding XPath support: ExtractValue and UpdateXML functions.unknown2005-12-212-0/+739
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmysqld/Makefile.am: sql/Makefile.am: Adding new source files. Adding new file into build process. include/my_xml.h: strings/xml.c: Adding new XML parse flags to skip text normalization and to use relative tag names. Adding enum for XML token types. sql/lex.h: Making parser aware of new SQL functions. sqll/item_create.h, sql/item_create.cc: Adding creators for ExtractValue and UpdateXML. sql/item.h: Adding new Item types: nodeset and nodeset comparator. sql/item_xmlfunc.h sql/item_xmlfunc.cc Adding new classes implementing XPath functions. mysql-test/t/xml.test, mysql-test/r/xml.result: New files: adding test case include/my_xml.h: Adding ExtractValue and UpdateXML functions. Adding XML parser flags and enum for XML token types. sql/Makefile.am: Adding new source files. sql/item.h: Adding new Item types: nodeset and nodeset comparator. sql/item_create.cc: Adding creators for ExtractValue and UpdateXML. sql/item_create.h: Adding creators for ExtractValue and UpdateXML. sql/lex.h: Make parse aware of new SQL functions. strings/xml.c: Adding new flags to skip text normalization and to use relative tag names. libmysqld/Makefile.am: Adding new file into build process.
* | | mysql-test-run.pl:mysql-5.1.4clone-5.1.4-buildunknown2005-12-212-8/+16
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't run "mysqlslap" on Windows mysqlslap.test: We don't run "mysqlslap" on Windows mysql.sln: Removed build of "client/mysqlslap.c" on Windows VC++Files/mysql.sln: Removed build of "client/mysqlslap.c" on Windows mysql-test/t/mysqlslap.test: We don't run "mysqlslap" on Windows mysql-test/mysql-test-run.pl: Don't run "mysqlslap" on Windows
* | Bug #15483 mysqlslap client fails in mysqlslap test.unknown2005-12-201-1/+0
| | | | | | | | | | mysql-test/t/disabled.def: Enable mysqlslap, it works now when it's running in silent mode.
* | mysql-test/t/federated_transactions.testunknown2005-12-191-1/+1
| | | | | | | | | | | | | | | | Fix a typo: Trailing ";" for "source" command. mysql-test/t/federated_transactions.test: Fix a typo: Trailing ";" for "source" command.
* | federated_transactions.test:unknown2005-12-191-0/+1
| | | | | | | | | | | | | | | | Test require Berkeley DB mysql-test/t/federated_transactions.test: Test require Berkeley DB
* | Mergeunknown2005-12-191-1/+2
|\ \
| * | mysql-test-run.pl:unknown2005-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Script "my_print_defaults" is to be searched for as executable mysql-test/mysql-test-run.pl: Script "my_print_defaults" is to be searched for as executable
* | | disabled.def:unknown2005-12-191-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | Disabled 'type_time' until 15805 is closed mysql-test/t/disabled.def: Disabled 'type_time' until 15805 is closed
* | | Mergeunknown2005-12-185-5/+59
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/ndb_basic.result: Auto merged mysql-test/r/ndb_multi.result: Auto merged mysql-test/r/skip_name_resolve.result: Auto merged mysql-test/r/type_time.result: Auto merged mysql-test/t/ndb_basic.test: Auto merged mysql-test/t/ndb_multi.test: Auto merged mysql-test/t/skip_name_resolve.test: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged storage/ndb/src/ndbapi/NdbImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged tests/mysql_client_test.c: Auto merged zlib/Makefile.am: Auto merged
| * | Mergeunknown2005-12-184-4/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_basic.result: Auto merged mysql-test/r/ndb_multi.result: Auto merged mysql-test/t/ndb_basic.test: Auto merged mysql-test/t/ndb_multi.test: Auto merged sql/sql_class.cc: Auto merged
| * | | Fixed default values for counters to 0 unknown2005-12-161-3/+3
| | | |
| * | | Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-161-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into regul.home.lan:/mnt/md/bk/mysql-5.0
| | * | | BUG#15805: Disabled test type_time; fails in --ps-protocol mode.unknown2005-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/disabled.def: Disabled test type_time; fails in --ps-protocol mode.
| * | | | Fixed stress parts in shell and perl versions of mysql-test-run script to ↵unknown2005-12-163-3/+19
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | limit stress testing with 20 test loops in case when any limit parameter was specified mysql-test/lib/mtr_stress.pl: Limit stress testing with 20 test loops in case when any limit parameter was specified mysql-test/mysql-test-run.pl: Limit stress testing with 20 test loops in case when any limit parameter was specified mysql-test/mysql-test-run.sh: Limit stress testing with 20 test loops in case when any limit parameter was specified
| * | | Merge mysql.com:/home/alexi/dev/mysql-4.1-12440unknown2005-12-152-0/+38
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/dev/mysql-5.0-12440 mysql-test/r/type_time.result: Auto merged ndb/src/ndbapi/NdbImpl.hpp: Auto merged ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged sql-common/my_time.c: Auto merged zlib/Makefile.am: Auto merged
| | * | | Fixed BUG #12440: "Incorrect processing of time values containingunknown2005-12-152-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | long fraction and/or large exponent part". mysql-test/r/type_time.result: Fixed testcases results (bug #12440) mysql-test/t/type_time.test: Added testcases for bug #12440 sql-common/my_time.c: Fixed bug #12440: "Incorrect processing of time values containing long fraction and/or large exponent part". Modified str_to_time(). Process properly fraction part containing more than 6 digits. Check for existence of exponent part which may result from %g formatting applied to time value specified as large real number.
| | * | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-12-142-0/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| | * \ \ \ Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-12-122-0/+81
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11
| | | * | | | Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting forunknown2005-12-122-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table' lockup". Changes from the innodb-4.1-ss11 snapshot. Do not call os_file-create_tmpfile() at runtime. Instead, create a tempfile at startup and guard access to it with a mutex. Also, fix bugs: 10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE"; 13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that datatypes between foreign key references are compatible. Also, added test cases (also for bug 9802). innobase/dict/dict0dict.c: Changes from the innodb-4.1-ss11 snapshot innobase/dict/dict0load.c: Changes from the innodb-4.1-ss11 snapshot innobase/include/dict0dict.h: Changes from the innodb-4.1-ss11 snapshot innobase/include/dict0load.h: Changes from the innodb-4.1-ss11 snapshot innobase/include/os0file.h: Changes from the innodb-4.1-ss11 snapshot innobase/include/rem0cmp.h: Changes from the innodb-4.1-ss11 snapshot innobase/include/srv0srv.h: Changes from the innodb-4.1-ss11 snapshot innobase/rem/rem0cmp.c: Changes from the innodb-4.1-ss11 snapshot innobase/row/row0ins.c: Changes from the innodb-4.1-ss11 snapshot innobase/row/row0mysql.c: Changes from the innodb-4.1-ss11 snapshot innobase/srv/srv0srv.c: Changes from the innodb-4.1-ss11 snapshot innobase/srv/srv0start.c: Changes from the innodb-4.1-ss11 snapshot libmysqld/ha_blackhole.cc: Changes from the innodb-4.1-ss11 snapshot mysql-test/r/innodb.result: Changes from the innodb-4.1-ss11 snapshot mysql-test/t/innodb.test: Changes from the innodb-4.1-ss11 snapshot sql/ha_innodb.cc: Changes from the innodb-4.1-ss11 snapshot
| | * | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-12-122-6/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1
| | | * \ \ \ \ Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/bug12429unknown2005-12-122-6/+6
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| * | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-147-13/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0
| | * \ \ \ \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releaseunknown2005-12-146-13/+9
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0 mysql-test/r/skip_name_resolve.result: Auto merged mysql-test/t/skip_name_resolve.test: Auto merged sql/sp_head.cc: Auto merged
| | * \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-141-0/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0 sql/mysqld.cc: Auto merged
| | | * \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-121-0/+2
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0
| | | | * \ \ \ \ \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releaseunknown2005-12-081-0/+2
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0
| * | | | \ \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-142-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1unknown2005-12-142-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
| | | * | | | | | | | | | | Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictableunknown2005-12-142-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_multi.result: Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more preditable mysql-test/t/ndb_multi.test: Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more preditable
| * | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-12-142-0/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push mysql-test/r/ndb_basic.result: Auto merged mysql-test/t/ndb_basic.test: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged ndb/src/kernel/vm/SimulatedBlock.cpp: merge
* | | | | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-1510-22/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.1.clean
| * | | | | | | | | | | | | | tests fixed as we implement informative error messageunknown2005-12-154-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/partition_list.result: test result fixed mysql-test/r/partition_range.result: test result fixed mysql-test/t/partition_list.test: test fixed mysql-test/t/partition_range.test: test fixed
| * | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1-newunknown2005-12-156-2/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.1.clean
| | * | | | | | | | | | | | | | bug #15524 (partitioning range/list violation error message is insufficient)unknown2005-12-152-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_base.h: HA_ERR_NO_PARTITION_FOUND added mysql-test/r/partition_error.result: test result fixed mysql-test/t/partition_error.test: test case added sql/ha_partition.cc: now we launch the informative error message here sql/share/errmsg.txt: Error message added
| | * | | | | | | | | | | | | | bug #15521 (Cannot reorganise a partition with a new name equal to the old name)unknown2005-12-154-2/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/partition.result: result fixed mysql-test/r/partition_mgm_err.result: result fixed mysql-test/t/partition.test: test case added mysql-test/t/partition_mgm_err.test: test modified to produce the declared error sql/handler.h: check_reorganise_list interface sql/sql_partition.cc: check_reorganise_list implementation sql/sql_table.cc: now we call check_reorganise_list to do proper test. Also we should set right no_parts value as it can change here
* | | | | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-releaseunknown2005-12-157-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new mysql-test/r/ndb_basic.result: Auto merged mysql-test/t/ndb_basic.test: Auto merged sql/sql_class.cc: Auto merged mysql-test/r/ndb_multi.result: merge mysql-test/t/ndb_multi.test: merge sql/ha_ndbcluster.cc: merge
| * | | | | | | | | | | | | | Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure ↵mysql-5.0.17unknown2005-12-144-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on MacOSX and bug #15668: Test 'sp-error' crashes server on Mac OS X. mysql-test/r/rpl000001.result: Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX and bug #15668: Test 'sp-error' crashes server on Mac OS X. - accept 2013 error as well. mysql-test/t/flush_read_lock_kill.test: Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX and bug #15668: Test 'sp-error' crashes server on Mac OS X. - accept 2013 error as well. mysql-test/t/rpl000001.test: Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX and bug #15668: Test 'sp-error' crashes server on Mac OS X. - accept 2013 error as well. mysql-test/t/rpl_error_ignored_table.test: Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX and bug #15668: Test 'sp-error' crashes server on Mac OS X. - accept 2013 error as well. sql/sql_class.cc: Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX and bug #15668: Test 'sp-error' crashes server on Mac OS X. - don't call the close_active_vio() in case of KILL_QUERY.
| * | | | | | | | | | | | | | Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictableunknown2005-12-142-0/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | bug#15682 - ndbunknown2005-12-142-0/+27
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incorrect handling of varchar in position/rnd_pos Commit for 5.0.17 release clone mysql-test/r/ndb_basic.result: bug#15682 mysql-test/t/ndb_basic.test: bug#15682 sql/ha_ndbcluster.cc: bug#15682
| * | | | | | | | | | | | | BUG#15624: Use --real_sleep in rpl_deadlock.test to avoid breaking when run ↵unknown2005-12-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with --sleep. mysql-test/t/rpl_deadlock.test: BUG#15624: Use --real_sleep to avoid breaking when run with --sleep.
| * | | | | | | | | | | | | Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-releaseunknown2005-12-122-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M50/clone-5.0
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/M50/bug12429 into mysql.com:/M50/clone-5.0unknown2005-12-122-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/local/mysql/mysql-5.0-mergeunknown2005-12-151-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/mysql-5.1-new mysql-test/r/skip_name_resolve.result: Auto merged mysql-test/t/skip_name_resolve.test: Auto merged
| * | | | | | | | | | | | | | | skip_name_resolve.result, skip_name_resolve.test:unknown2005-12-123-6/+3
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore columns with unpredictable values. rpl_relayrotate.result: Changed result file to match change in test mysql-test/r/rpl_relayrotate.result: Changed result file to match change in test mysql-test/t/skip_name_resolve.test: Ignore columns with unpredictable values. mysql-test/r/skip_name_resolve.result: Ignore columns with unpredictable values.
* | | | | | | | | | | | | | | Merge joerg@trift2:/M50/part2-ramilunknown2005-12-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift-lap.fambruehe:/MySQL/M51/merge-5.1 sql/sp_head.cc: Auto merged sql/table.cc: Auto merged
| * | | | | | | | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2005-12-121-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-5.0-release
| | * | | | | | | | | | | | | | Fix for bug #15605: 5.0.17 test case 'mysqltest' failure.unknown2005-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/mysqltest.test: Fix for bug #15605: 5.0.17 test case 'mysqltest' failure. - use 'test -s' instead of 'cat' to get assured 1 (cat returns >0 in case of errors)