summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* bug #12620 (UTF-8 indexing causes ER_NO_KEYFILE error)unknown2006-09-042-4/+9
| | | | | | | | | | | | The problem is that on some Mac OS X-es the file writing/reading call with zero bytes to read/write returns error. So here i try to eliminate that kinds of calls. myisam/mi_check.c: zero length copying avoided mysys/my_chsize.c: no file operations if it's not necessary
* Merge lamia.home:/home/timka/mysql/src/4.1-virginunknown2006-09-013-5/+38
|\ | | | | | | | | | | | | | | into lamia.home:/home/timka/mysql/src/4.1-bug-21787 sql/sql_select.cc: Auto merged
| * Fix for BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong resultunknown2006-09-013-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was due to a prior fix for BUG 9676, which limited the rows stored in a temporary table to the LIMIT clause. This optimization is not applicable to non-group queries with aggregate functions. The fix disables the optimization in this case. mysql-test/r/limit.result: Test case for BUG#21787 mysql-test/t/limit.test: Test case for BUG#21787 sql/sql_select.cc: If there is an aggregate function in a non-group query, materialize all rows in the temporary table no matter if there is a LIMIT clause. This is necessary, since the aggregate functions must be computed over all result rows, not just the first LIMIT rows.
* | Backport from 5.0unknown2006-09-012-10/+0
| | | | | | | | | | | | | | | | | | | | - Dont test "encrypt" in ctype_ucs mysql-test/r/ctype_ucs.result: Don't test "encrypt" function in ctype_ucs.test mysql-test/t/ctype_ucs.test: Don't test "encrypt" function in ctype_ucs.test
* | Merge bk-internal:/home/bk/mysql-4.1-maintunknown2006-09-012-1/+7
|\ \ | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
| * | Add target to make "mtr", shortcut for running test suiteunknown2006-09-012-1/+7
| | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added mysql-test/mtr to the ignore list
* | | Merge bk-internal:/home/bk/mysql-4.1-maintunknown2006-08-313-5/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into rama.(none):/home/jimw/my/mysql-4.1-21288
| * | | Bug #21288: mysqldump segmentation fault when using --whereunknown2006-08-173-5/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the error handling was using a too-small buffer to print the error message generated. We fix this by not using a buffer at all, but by using fprintf() directly. There were also some problems with the error handling in table dumping that was exposed by this fix that were also corrected. client/mysqldump.c: Use fprintf() instead of my_printf_error() to avoid buffer overflow issues. Since ME_BELL wasn't specified, calling my_printf_error() offered no advantage except for adding my_progname, which we just go ahead and do manually. Also, fix the error handling in dumpTable() when queries to get data fail and --force was specified. mysql-test/r/mysqldump.result: Add new results mysql-test/t/mysqldump.test: Add new regression test
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053unknown2006-08-311-22/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
| * \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my40-bug04053unknown2006-08-301-22/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053 mysys/my_read.c: Auto merged
| | * | | | Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \unknown2006-08-301-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event' from master" Since there is no repeatable test case, and this is obviously wrong, this is the most conservative change that might possibly work. The syscall read() wasn't checked for a negative return value for an interrupted read. The kernel sys_read() returns -EINTR, and the "library" layer maps that to return value of -1 and sets errno to EINTR. It's impossible (on Linux) for read() to set errno EINTR without the return value being -1 . So, if we're checking for EINTR behavior, we should not require that the return value be zero. mysys/my_read.c: The read() syscall should check for negative one, since that (usually) signals errors (like being interrupted) and zero (usually) signals end-of-file .
* | | | | | Merge ↵unknown2006-08-311-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my41-no-strange-literals into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint tests/mysql_client_test.c: Auto merged
| * | | | | | Bitkeeper's Tk interface uses UTF8 by default, so mixing charsets in a unknown2006-08-311-2/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | single file is a bad practice. tests/mysql_client_test.c: Replace literal characters which don't make sense in UTF8 with ubiquitously- understood numbers.
* | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/g41unknown2006-08-3113-14/+145
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into maint2.mysql.com:/data/localhome/tsmith/bk/41
| * | | | | | Bug#20393 User name truncation in mysql clientunknown2006-08-307-8/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte include/mysql_com.h: Bug#20393 User name truncation in mysql client Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte added new constants NAME_BYTE_LEN, USERNAME_BYTE_LENGTH, SYSTEM_CHARSET_MBMAXLEN mysql-test/r/ctype_utf8.result: Bug#20393 User name truncation in mysql client Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte test case mysql-test/t/ctype_utf8.test: Bug#20393 User name truncation in mysql client Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte test case sql-common/client.c: Bug#20393 User name truncation in mysql client Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte increased buffers for user name & db sql/sql_acl.cc: Bug#20393 User name truncation in mysql client Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte check that user name is not longer than USERNAME_LENGTH symbols sql/sql_parse.cc: Bug#20393 User name truncation in mysql client Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte increased buffers for user name & db sql/table.cc: Bug#20393 User name truncation in mysql client Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte check that db name is not longer than NAME_LEN symbols
| * | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-08-276-6/+100
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/tmp_merge-4.1-opt-mysql
| | * \ \ \ \ \ Merge moonbone.local:/work/tmp_merge-4.1-mysqlunknown2006-08-266-6/+100
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/tmp_merge-4.1-opt-mysql
| | | * | | | | BUG#16255: Post-review fixes: adjust the testcase.unknown2006-08-242-17/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: BUG#16255: A proper testcase mysql-test/t/subselect.test: BUG#16255: A proper testcase
| | | * | | | | Bug #16255: Subquery in WHERE (the cset by Georgi Kodinov)unknown2006-08-243-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Must not use Item_direct_ref in HAVING because it points to the new value (witch is not yet calculated for the first row). mysql-test/r/subselect.result: Bug #16255: Subquery in where - test case mysql-test/t/subselect.test: Bug #16255: Subquery in where - test case sql/item_subselect.cc: Bug #16255: Subquery in where Must not use Item_direct_ref in HAVING because it points to the new value (witch is not yet calculated for the first row).
| | | * | | | | BUG#21077: Possible crash caused by invalid sequence of handler::* calls: ↵unknown2006-08-153-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash was caused by invalid sequence of handler::** calls: ha_smth->index_init(); ha_smth->index_next_same(); (2) (2) is an invalid call as it was not preceeded by any 'scan setup' call like index_first() or index_read(). The cause was that QUICK_SELECT::reset() didn't "fully reset" the quick select- current QUICK_RANGE wasn't forgotten, and quick select might attempt to continue reading the range, which would result in the above mentioned invalid sequence of handler calls. 5.x versions are not affected by the bug - they already have the missing "range=NULL" clause. mysql-test/r/innodb_mysql.result: Testcase for BUG#21077 mysql-test/t/innodb_mysql.test: Testcase for BUG#21077 sql/opt_range.h: BUG#21077: Possible crash caused by invalid sequence of handler::* calls: - Make QUICK_SELECT::reset() really reset the quick select
* | | | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41unknown2006-08-303-184/+187
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into maint2.mysql.com:/data/localhome/tsmith/bk/41 BUILD/SETUP.sh: Auto merged
| * | | | | | | | Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windowsunknown2006-08-302-8/+8
| | | | | | | | |
| * | | | | | | | portability fix in BUILD/* for solarisunknown2006-08-301-176/+179
| | | | | | | | |
| * | | | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40unknown2006-08-301-9/+3
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41 BUILD/SETUP.sh: SCCS merged
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2006-08-291-9/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into maint2.mysql.com:/data/localhome/tsmith/bk/41
| * \ \ \ \ \ \ \ \ Merge maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/40unknown2006-08-291-9/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/41 BUILD/SETUP.sh: SCCS merged
| | * | | | | | | minor portability fix in SETUP.shunknown2006-08-291-9/+3
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Dont' ever use cluster for slave in 4.1unknown2006-08-261-1/+1
| | | | | | | |
* | | | | | | | Ignore --skip-im if specified on command line unknown2006-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Null merge to 5.0 mysql-test/mysql-test-run.pl: Ignore --skip-im if specified on command line
* | | | | | | | Add mysqld-max-nt to list of mysqld executales to look for on windowsunknown2006-08-251-1/+2
| | | | | | | |
* | | | | | | | Backport from 5.0 a fix that will start ndb only for tests that needs itunknown2006-08-253-2/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/lib/mtr_cases.pl: Detect which tests that need ndb mysql-test/lib/mtr_match.pl: Add function mtr_match_substring mysql-test/mysql-test-run.pl: Only start cluster for test cases that need it
* | | | | | | | Fix running tests suite with non standard tmp dir.unknown2006-08-252-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default is "var/tmp" mysql-test/r/myisam.result: Update result file mysql-test/t/myisam.test: If running test suite with a non standard tmp dir, the "show create table" will print "DATA DIRECTORY=" Use replace_result to mask it out Set tmpdir to var/log to get the printout of DATA DIRECTORY also when running with standard tmpdir
* | | | | | | | Merge bk-internal:/home/bk/mysql-4.1-maintunknown2006-08-251-2/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
| * | | | | | | | Backport fix for finding executables from 5.0unknown2006-08-251-2/+16
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/lib/mtr_misc.pl: On windows the exe does not need to be executable for it to be found
* | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194unknown2006-08-241-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-maint support-files/mysql.spec.sh: Auto merged
| * | | | | | | mysql.spec.sh:unknown2006-08-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ndb_size.{pl,tmpl} to the RPM install (bug#20426) support-files/mysql.spec.sh: Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)
* | | | | | | | Merge tim@tsmith.mysql.internal:m/bk/41unknown2006-08-247-14/+128
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into maint1.mysql.com:/data/localhome/tsmith/bk/41
| * \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41unknown2006-08-234-5/+13
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/41 sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged
| | * | | | | | | Bug #21531: EXPORT_SET() doesn't accept args with coercible character setsunknown2006-08-234-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail - Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors mysql-test/r/func_misc.result: Test EXPORT_SET() with charset coersion (bug #21531) mysql-test/t/func_misc.test: Test EXPORT_SET() with charset coersion (bug #21531) sql/item_func.h: Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors. sql/item_strfunc.cc: Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail.
| * | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-41unknown2006-08-234-9/+115
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | / / / / / | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/41 sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged
| | * | | | | | Bug #20402: DROP USER failure logged as ERROR rather than WARNINGunknown2006-08-232-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some sql_print_error() calls which were triggered by user error (i.e., not server-level events at all). Also, convert an sql_print_error -> sql_print_information for a non-error server event. sql/slave.cc: Change sql_print_error to sql_print_information for non-error status message. sql/sql_acl.cc: Remove sql_print_error calls for events which are not server errors
| | * | | | | | Bug #20536: md5() with GROUP BY and UCS2 return different results on ↵unknown2006-08-114-9/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myisam/innodb Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results. Make MAKE_SET() and EXPORT_SET() use the correct character set for their default separator strings. mysql-test/r/ctype_ucs.result: Add tests for bug #20536. mysql-test/t/ctype_ucs.test: Add tests for bug #20536. Tests showing correct behavior for MD5(), SHA1(), MAKE_SET() and EXPORT_SET(). Also, tests showing incorrect behavior, which will remain "Won't fix", for PASSWORD(), OLD_PASSWORD(), ENCRYPT() and QUOTE(). sql/item_strfunc.cc: Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results. Make MAKE_SET() and EXPORT_SET() use the correct character set for their default separator strings. sql/item_strfunc.h: Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results.
* | | | | | | | Merge bk-internal:/home/bk/mysql-4.1unknown2006-08-237-66/+48
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into maint1.mysql.com:/data/localhome/tsmith/bk/41
| * | | | | | | Bug#20328 - Correction to test/result for broken Windows build.unknown2006-08-162-47/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/mysql_client.result: Removed OS dependant output. mysql-test/t/mysql_client.test: Re-directed output to a temporary file because the actual output isn't important and was causing a Windows test failure.
| * | | | | | | Bug#19844: time_format in Union truncates valuesunknown2006-08-103-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time_format() claimed %H and %k would return at most two digits (hours 0-23), but this coincided neither with actual behaviour nor with docs. this is not visible in simple queries; forcing a temp-table is probably the easiest way to see this. adjusted the return-length appropriately; the alternative would be to adjust the docs to say that behaviour for > 99 hours is undefined. --- Bug#19844: time_format in Union truncates values time_format() claimed %H and %k would return at most two digits (hours 0-23), but this coincided neither with actual behaviour nor with docs. this is not visible in simple queries; forcing a temp-table is probably the easiest way to see this. adjusted the return-length appropriately; the alternative would be to adjust the docs to say that behaviour for > 99 hours is undefined. mysql-test/r/func_time.result: Bug#19844: time_format in Union truncates values show time_format() handles %H and %k correctly four > 99 hours mysql-test/t/func_time.test: Bug#19844: time_format in Union truncates values show time_format() handles %H and %k correctly four > 99 hours sql/item_timefunc.cc: Bug#19844: time_format in Union truncates values unbreak promises we make about field-length of %H and %k in time_format() so they coincide with the actual range rather than just 0..23. the docs say we must operate outside that range, so we'd better do it right. --- Bug#19844: time_format in Union truncates values unbreak promises we make about field-length of %H and %k in time_format() so they coincide with the actual range rather than just 0..23. the docs say we must operate outside that range, so we'd better do it right. One digit values are padded to two digits with %H, "longer" values are handled correctly up to seven digits including any sign. (clarified comments as per jimw's suggestion.)
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2006-08-022-16/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/done/b20402-41
| | * | | | | | | Bug #20402: DROP USER failure logged as ERROR rather than WARNINGunknown2006-07-262-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slave.cc, sql_acl.cc: - remove sql_print_error() for events that are not server errors sql/slave.cc: Bug #20402: DROP USER failure logged as ERROR rather than WARNING remove sql_print_error() for events that are not server errors sql/sql_acl.cc: Bug #20402: DROP USER failure logged as ERROR rather than WARNING remove sql_print_error() for events that are not server errors
* | | | | | | | | Merge lamia.home:/home/timka/mysql/src/4.1-virginunknown2006-08-233-30/+52
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lamia.home:/home/timka/mysql/src/4.1-bug-21456 sql/sql_select.cc: Auto merged
| * | | | | | | | | Bug #21456: SELECT DISTINCT(x) produces incorrect results when using order byunknown2006-08-233-30/+52
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GROUP BY/DISTINCT pruning optimization must be done before ORDER BY optimization because ORDER BY may be removed when GROUP BY/DISTINCT sorts as a side effect, e.g. in SELECT DISTINCT <non-key-col>,<pk> FROM t1 ORDER BY <non-key-col> DISTINCT must be removed before ORDER BY as if done the other way around it will remove both. mysql-test/r/distinct.result: Test for BUG#21456. mysql-test/t/distinct.test: Test for BUG#21456. sql/sql_select.cc: Bug #21456: SELECT DISTINCT(x) produces incorrect results when using order by GROUP BY/DISTINCT pruning optimization must be done before ORDER BY optimization because ORDER BY may be removed when GROUP BY/DISTINCT sorts as a side effect.
* | | | | | | | | Merge hf@192.168.21.12:work/mysql-4.1.15440unknown2006-08-191-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-4.1.clean