summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_incrementunknown2005-09-293-7/+41
| | | | | | | | | | | | | | | "CHARACTER SET", "COLLATE", and "DEFAULT" are always printed(excepting MODE_MYSQL323 and MODE_MYSQL40) "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only if NO_FIELD_OPTIONS is not set. mysql-test/r/sql_mode.result: Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment test case mysql-test/t/sql_mode.test: Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment test case
* Merge mysql.com:/home/mydev/mysql-4.1unknown2005-09-292-14/+10
|\ | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| * Merge mysql.com:/home/mydev/mysql-4.1unknown2005-09-282-14/+10
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| | * Merge mysql.com:/home/mydev/mysql-4.0-4000unknown2005-09-272-14/+10
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100 mysql-test/r/merge.result: Bug#9112 - Merge table with composite index producing invalid results with some queries Manual merge mysql-test/t/merge.test: Bug#9112 - Merge table with composite index producing invalid results with some queries Manual merge
| | | * Bug#9112 - Merge table with composite index producing invalid results with ↵unknown2005-09-272-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some queries Reduced the precision of the test numbers. Not all platforms could reproduce the exact numbers. mysql-test/r/merge.result: Bug#9112 - Merge table with composite index producing invalid results with some queries The new test result
* | | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-2924-205/+260
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| * | | | Many files:unknown2005-09-2919-96/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. my_regex.h: Rename: regex/regex.h -> regex/my_regex.h client/mysqltest.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. os2/MySQL-Source.icc: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/Makefile.am: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/debug.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/debug.ih: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/engine.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/engine.ih: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/main.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/main.ih: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regcomp.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regerror.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regerror.ih: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/my_regex.h: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regexec.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regfree.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/reginit.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. sql/item_cmpfunc.cc: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. sql/item_cmpfunc.h: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. sql/mysqld.cc: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib.
| * | | | mtr_process.pl:unknown2005-09-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Append to some of the log files, not overwrite mysql-test/lib/mtr_process.pl: Append to some of the log files, not overwrite
| * | | | mysql-test-run.pl:unknown2005-09-281-64/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Append to some of the log files, not overwrite. Changed introduction text to reflect the current status of the Perl version of mysql-test-run. Some code cleanup. mysql-test/mysql-test-run.pl: Append to some of the log files, not overwrite. Changed introduction text to reflect the current status of the Perl version of mysql-test-run. Some code cleanup.
| * | | | mysql-test-run.pl:unknown2005-09-281-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass on all --skip-* to mysqld mysql-test/mysql-test-run.pl: Pass on all --skip-* to mysqld
| * | | | - compile fix: don't use C++ - style comments in .c files!unknown2005-09-281-1/+1
| |/ / /
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-285-43/+64
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| | * \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-09-275-43/+64
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest client/mysqltest.c: Manual merge mysql-test/mysql-test-run.pl: patch alredy commited
| | | * | Bug #7037 Test "mysql_protocols" fails on Solaris 8 + 9 /x86unknown2005-09-231-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | mysys/my_init.c: Updated after review
| | | * | BUG#7037 MySQL Bugs: #7037: Test "mysql_protocols" fails on Solaris 8 + 9 /x86unknown2005-09-231-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/my_init.c: Changed implementation slightly to use a local variable for keeping track of wheter we should print to the info_file even if the flag is not set in infoflag Explicitly turn off print_info if there is no DBUG_FILE
| | | * | BUG#12959 mysqltest crashes if testcase passed with -x optionunknown2005-09-204-20/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Enable testcases after help from Serg client/mysqltest.c: Dump output to stdout if no result file is specified Don't print verbose_msg when command fails whith expected error mysql-test/mysql-test-run.pl: Don't add all args to the MYSQL_TEST environment variable. mysql-test/r/mysqltest.result: Add test for mysqltest -x mysql-test/t/mysqltest.test: Add test for mysqltest -x
| | | * | Improved outputunknown2005-09-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Don't print "At line: 0"
| | | * | Clean up printout of line numbersunknown2005-09-191-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Only print line no if start_lineno > 0 Remove lineno in calls to verbose_msg and die, this is handled by the function.
| | | * | BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"unknown2005-09-072-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improved solution mysql-test/r/mysqltest.result: Update test results mysql-test/t/mysqltest.test: Fix test for failing "exec" and "system", by using the false command
* | | | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-285-1/+93
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| * | | | mysql_config.sh:unknown2005-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added -lz to link using libmysqld scripts/mysql_config.sh: Added -lz to link using libmysqld
| * | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-283-0/+76
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1
| | * | | | Fixed a bug checksum table locks the InnoDB table and does not use aunknown2005-09-283-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistent read (Bug #12669). mysql-test/r/innodb.result: Added test results for a checksum test. mysql-test/t/innodb.test: Added test case for a checksum bug #12669. sql/ha_innodb.cc: Use consistent read for checksum table and convert MySQL lock type to the TL_READ because at the moment MySQL uses TL_READ_NO_INSERT.
| * | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-2822-46/+188
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1
| * | | | | disabled.def:unknown2005-09-251-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable unstable test cases new file mysql-test/t/disabled.def: Disable unstable test cases
* | | | | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-284-2/+50
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-283-0/+48
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/13356-bug-4.1-mysql
| | * | | | | Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.unknown2005-09-283-0/+48
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolve_const_item() assumed to be not called for Item_row items. For ensuring that DBUG_ASSERT(0) was set there. This patch adds section for Item_row items. If it can it recursively calls resolve_const_item() for each item the Item_row contains. If any of the contained items is null then whole Item_row substitued by Item_null. Otherwise it just returns. sql/item.cc: Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items. Added section to resolve_const_item() for Item_row items. If it can it recursively calls resolve_const_item() for each item the Item_row contains. If any of the contained items is null then Item_row is substituted by Item_null. Otherwise it just returns. Comment moved closer to function it belongs to. mysql-test/t/select.test: Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items. mysql-test/r/select.result: Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.
| * | | | | Fix for bug #13501 "build problem: too many arguments to function my_boolunknown2005-09-271-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acl_init". Updated calls to acl_init()/grant_init() in init_embedded_server() - their signatures were changed recently, now they don't need argument for passing pointer to THD object (this code was only compiled if one built embedded server library with --with-embedded-privilege-control switch). libmysqld/lib_sql.cc: acl_init/grant_init() are now used only at server start up so they always allocate temporary THD object and don't need argument for passing pointer to it.
* | | | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-2710-26/+108
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| * | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1unknown2005-09-261-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/users/lthalmann/bk/mysql-4.1-max
| | * | | | Fixed gcc error on AMD64: cast from 'char*' to 'unsigned int' loses precisionunknown2005-09-261-2/+2
| | | | | |
| * | | | | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-09-262-12/+11
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| | * | | | added make target for printSchemaFileunknown2005-09-262-12/+11
| | | | | |
| * | | | | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-09-267-12/+95
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| | * | | | Bug#9112 - Merge table with composite index producing invalid results with ↵unknown2005-09-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some queries After merge fix
| | * | | | Merge mysql.com:/home/mydev/mysql-4.0-4000unknown2005-09-237-12/+91
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100 myisam/mi_dbug.c: Auto merged myisam/mi_rkey.c: Auto merged myisam/mi_search.c: Auto merged myisam/myisamdef.h: Auto merged myisammrg/myrg_rkey.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Manual merge mysql-test/r/merge.result: Bug#9112 - Merge table with composite index producing invalid results with some queries Manual merge mysql-test/t/merge.test: Bug#9112 - Merge table with composite index producing invalid results with some queries Manual merge
| | | * | | Bug#9112 - Merge table with composite index producing invalid results with ↵unknown2005-09-237-12/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some queries The problem was an ab-use of last_rkey_length. Formerly we saved the packed key length (of the search key) in this element. But in certain cases it got replaced by the (packed) result key length. Now we use a new element of MI_INFO to save the packed key length of the search key. myisam/mi_dbug.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Fixed the recognition of NULL values in _mi_print_key(). myisam/mi_rkey.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Saved the packed key length in a new element of MI_INFO. myisam/mi_search.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Added a comment and trace prints. myisam/myisamdef.h: Bug#9112 - Merge table with composite index producing invalid results with some queries Added a new element to store the packed key length for use by the MyISAMMRG engine. myisammrg/myrg_rkey.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Changed to use the new element of MI_INFO to get at the packed key length. mysql-test/r/merge.result: Bug#9112 - Merge table with composite index producing invalid results with some queries The test result. mysql-test/t/merge.test: Bug#9112 - Merge table with composite index producing invalid results with some queries The test case.
* | | | | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-268-18/+30
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| * | | | | Fixed error found during review of new pushed codeunknown2005-09-258-18/+30
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Don't use c_ptr() for cgets() and ensure buffer is not overwritten mysql-test/r/cast.result: More test for CAST(0x.... as signed) sql/opt_sum.cc: Fix bugs found during review - Changed code to be able to remove one if - Ensure that count == 0 only if is_exact_count == TRUE sql/sql_delete.cc: Ensure 'allow_sum_func' is reset before call to setup_conds sql/sql_lex.cc: allow_sum_func doesn't have to be reset for each query (It's to be reset in setup_fields() or before call to setup_conds() sql/sql_load.cc: Move set of auto_increment_field_not_null so that it's not set if field value is NULL sql/sql_prepare.cc: allow_sum_func doesn't have to be reset for each query (It's to be reset in setup_fields() or before call to setup_conds() sql/sql_update.cc: Ensure 'allow_sum_func' is reset before call to setup_conds
* | | | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-241-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| * | | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-235-4/+62
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| * | | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-223-4/+239
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| * | | | | GCC4 build fixunknown2005-09-221-0/+1
| | | | | |
* | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-243-8/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1
| * | | | | | Makefile.am:unknown2005-09-243-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert to shell test script for test targets mysqltest.c: Windows pclose() returns error code in low byte mysql_config.sh: Remove -Xa -xstrconst from --cflags for Sun C++ scripts/mysql_config.sh: Remove -Xa -xstrconst from --cflags for Sun C++ client/mysqltest.c: Windows pclose() returns error code in low byte Makefile.am: Revert to shell test script for test targets
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-2449-267/+1648
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-245-12/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug13419
| | * | | | | | BUG#12232: Addressing docs team feedback: s/inequal/unequal/unknown2005-09-245-11/+11
| | | | | | | |
| | * | | | | | mysqld.cc:unknown2005-09-231-1/+1
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix out-of-order status variable. sql/mysqld.cc: Fix out-of-order status variable.