summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/mydev/mysql-5.0unknown2006-03-03190-1769/+16613
|\ | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-bug11527
| * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-035-31/+45
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-5.0
| | * Merge mysql.com:/home/gluh/MySQL/Merge/mysql-5.0-releaseunknown2006-03-035-31/+45
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.0 mysql-test/r/binary.result: Auto merged mysql-test/t/binary.test: Auto merged sql/field_conv.cc: Auto merged
| | | * Fix for bug#17826 'type_decimal' fails with ps-protocolunknown2006-03-033-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed unnecessary calculation of cache value otherwise Join::preapre tries to calculate undefined values(filed values) mysql-test/r/type_decimal.result: Fix for bug#17826 'type_decimal' fails with ps-protocol test case, this test case reproduce the same bug but without PS protocol mysql-test/t/type_decimal.test: Fix for bug#17826 'type_decimal' fails with ps-protocol test case, this test case reproduce the same bug but without PS protocol
| | | * mysql.spec.sh:unknown2006-03-031-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create empty embedded RPM, bug#15769 support-files/mysql.spec.sh: Don't create empty embedded RPM, bug#15769
| | | * Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2006-03-033-1/+48
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
| | | | * Expanding a binary field should result in 0x00-filled positions, not 0x20 unknown2006-03-023-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (ASCII space). For Bug#16857. sql/field_conv.cc: Bug#16857: Do not expand BINARY fields as if they are strings (which presumably /should/ be filled with spaces). Instead, fill BINARY fields with 0x00 bytes.
| | | * | Makefile.am:unknown2006-03-031-5/+6
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use libtool convenience lib, to access get_password object correctly, bug#17155 server-tools/instance-manager/Makefile.am: Use libtool convenience lib, to access get_password object correctly, bug#17155
| * | | Merge mysql.com:/usr/home/ram/work/mysql-4.1unknown2006-03-031-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-5.0 sql/hostname.cc: Auto merged
| | * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-0372-212/+1239
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.1.b13659
| | * | | Fix for bug #15756: incorrect ip address matching in ACL due to use of ↵unknown2006-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | latin1 collation. Thanks Deomid Ryabkov <mysqlbugs@rojer.pp.ru> for the great help! sql/hostname.cc: Fix for bug #15756: incorrect ip address matching in ACL due to use of latin1 collation. - use my_charset_bin instead of my_charset_latin1 to properly compare IP addresses.
| * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-033-0/+38
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/5.0.b17615 mysql-test/r/sp.result: merging mysql-test/t/sp.test: merging
| | * | | | Fix for bug #17615: invalid handling of function results in UPDATE...SET ↵unknown2006-03-023-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statement. sql/item_func.cc: Fix for bug #17615: invalid handling of function results in UPDATE...SET statement. - set proper collation
| * | | | | Expanding a binary field should result in 0x00-filled positions, not 0x20 unknown2006-03-023-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (ASCII space). For Bug#16857. sql/field_conv.cc: Bug#16857: Do not expand BINARY fields as if they are strings (which presumably /should/ be filled with spaces). Instead, fill BINARY fields with 0x00 bytes.
| * | | | | Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-026-83/+390
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into selena.:H:/MYSQL/src/#17595-mysql-5.0
| | * | | | | Postfix for #17595. few lines in a test were accidentally commented.unknown2006-02-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comments removed.
| | * | | | | project files update for win32 buildunknown2006-02-273-83/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/mysql.sln: gen_lex_hash.vcproj is added into mysql.sln for win32 build. VC++Files/sql/gen_lex_hash.dsp: gen_lex_hash project file is added for win32 build. VC++Files/sql/gen_lex_hash.vcproj: gen_lex_hash project file is added for win32 build.
| | * | | | | Fixes bug #17595. UDFs are not initialized when running mysqld with unknown2006-02-273-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --skip-grant-tables. However when deleting functions UDFs list was checked regardless of whther UDFs are initialized or not. Additional check is added into free_udf() and find_udf() functions to prevent possible runtime errors. mysql-test/r/skip_grants.result: Test result for #17595 patch. mysql-test/t/skip_grants.test: Test for #17595 patch.
| * | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-03-024-4/+54
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
| | * | | | | Fixed BUG#17476: Stored procedure not returning data when it is called firstunknown2006-03-024-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time per connection Removed const_string() method from Item_string (it was only used in one place, in a bad way). Defer possible SP variable, and access data directly instead, in date_format item. mysql-test/r/sp.result: Updated results for new test (BUG#17476). mysql-test/t/sp.test: New test case (BUG#17476) sql/item.h: Removed const_string() from Item_string. It was only used in one place, and we can just use str_value in Item directly. sql/item_timefunc.cc: Must defer a (possible) local SP variable to use max_length and str_value in Item_func_date_format::fix_length_and_dec(), and refer to str_value directly without the const_string() method (now removed); the cast didn't work in all cases anyway.
| * | | | | | configure.in:unknown2006-03-021-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cloned configure.in: cloned
| * | | | | Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0unknown2006-03-023-3/+4
| |\ \ \ \ \
| | * \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-023-3/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M50/mysql-5.0
| | | * | | | | Bug#17279 user with no global privs and with create priv in db can createunknown2006-03-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database - Fix test case for systems with "lowercase names" mysql-test/r/grant2.result: Fix for system with "lowercase names", allow error 1007 to be returned mysql-test/t/grant2.test: Fix for system with "lowercase names", allow error 1007 to be returned
| | | * | | | | Make the define start at "start of line"unknown2006-03-021-1/+1
| | | | | | | |
| * | | | | | | Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0unknown2006-03-020-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run.sh: Auto merged scripts/make_binary_distribution.sh: Auto merged
| | * | | | | Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1unknown2006-03-021-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/make_binary_distribution.sh: Auto merged
| | | * \ \ \ \ Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0unknown2006-03-012-25/+45
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
| | | * \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2006-03-011-0/+7
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M40/comment-4.0
| | * | \ \ \ \ \ \ Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1unknown2006-03-012-34/+42
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478 mysql-test/README: SCCS merged
| | * \ \ \ \ \ \ \ \ Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173unknown2006-03-010-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 mysql-test/README: Auto merged
| | * \ \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-012-0/+18
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/comment-4.1 mysql-test/mysql-test-run.sh: Auto merged
| * | \ \ \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-0215-70/+150
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M50/mysql-5.0 mysql-test/mysql-test-run.sh: Auto merged
| | * | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-024-3/+23
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0.9088
| | | * \ \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0unknown2006-03-024-3/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0.9088
| | | | * | | | | | | | | | bug #9088 (bigint WHERE fails)unknown2006-03-014-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/bigint.result: test result mysql-test/t/bigint.test: testcase sql/item.h: unsigned_arg is a separate parameter now sql/item_cmpfunc.cc: we can get unsigned field from the signed Item - from string like '1234'
| | * | | | | | | | | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478unknown2006-03-011-27/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| | | * | | | | | | | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173unknown2006-03-011-27/+33
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478 mysql-test/README: Auto merged
| | | | * | | | | | | | | | README:unknown2006-03-011-27/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revise README. mysql-test/README: revise README.
| | * | | | | | | | | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478unknown2006-03-011-7/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| | | * | | | | | | | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173unknown2006-03-011-7/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
| | | | * | | | | | | | | | README.gcov:unknown2006-03-011-7/+9
| | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise README.gcov. mysql-test/README.gcov: Revise README.gcov.
| | * | | | | | | | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478unknown2006-03-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | / / / / / / / / | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| | | * | | | | | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173unknown2006-03-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | / / / / / / | | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478 mysql-test/README: Auto merged
| | | | * | | | | | | README:unknown2006-03-011-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise mysql-test README. mysql-test/README: Revise mysql-test README.
| | * | | | | | | | | Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virginunknown2006-03-013-2/+28
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-bug-17523
| | | * \ \ \ \ \ \ \ \ Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virginunknown2006-03-013-2/+28
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-dbg
| | | | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/timka/mysql/src/5.0-virginunknown2006-03-013-2/+28
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/timka/mysql/src/5.0-bug-17523
| | | | | * | | | | | | | | Fix for BUG#17523: natural join and information schema.unknown2006-02-223-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cause of the bug was an ASSERT that checked the consistency of TABLE_SHARE::db and TABLE_LIST::db and failed for I_S tables. The fix relaxes the requirement for consistency for I_S. mysql-test/r/join.result: Added test for BUG#17523 mysql-test/t/join.test: Added test for BUG#17523 sql/table.cc: Take into account that for I_S tables, TABLE_SHARE::db == 0, while TABLE_LIST::db contains the database name of a table. The only change is in the ASSERTs.
| | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-012-5/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0