summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533unknown2007-01-181-6/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533 mysql-test/r/select.result: resolve skipped mysql-test/t/range.test: merging mysql-test/t/select.test: merging sql/item.cc: merging
| * Fix for bug #22533: Traditional: Too-long bit value not rejected.unknown2006-12-061-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: storing >=8 byte hexadecimal values we don't check data. Fix: check if the data fits the {u}longlong range. mysql-test/r/select.result: Fix for bug #22533: Traditional: Too-long bit value not rejected. - test result. mysql-test/t/range.test: Fix for bug #22533: Traditional: Too-long bit value not rejected. - adjusted. mysql-test/t/select.test: Fix for bug #22533: Traditional: Too-long bit value not rejected. - test case. sql/item.cc: Fix for bug #22533: Traditional: Too-long bit value not rejected. - limit storing value to {U}LONGLONG_MAX in numeric context.
| * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2006-11-221-4/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug22029/my41-bug22029 mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged sql/item_timefunc.cc: Auto merged
| * \ Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2006-11-161-23/+30
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into example.com:/work/bug24219/my41
| | * | Fix for bug#24219 ALTER TABLE ... RENAME TO ... , DISABLE KEYS leads to crashunknown2006-11-161-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an improper order of doing chained operations. To the documentor: ENABLE|DISABLE KEYS combined with RENAME TO, and no other ALTER TABLE clause, leads to server crash independent of the presence of indices and data in the table. mysql-test/r/alter_table.result: update result mysql-test/t/alter_table.test: add test for bug#24129 sql/sql_table.cc: If there is operation on the KEYS, first do it and then do a rename if there is such. Or, we will crash because the underlying table has changed.
| * | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2006-11-161-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug23653/my41-bug23653
* | \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-11-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint BitKeeper/etc/ignore: auto-union client/mysql.cc: Auto merged mysql-test/r/func_misc.result: Auto merged sql/item_func.h: Auto merged mysql-test/r/mysql.result: Manual merge mysql-test/t/mysql.test: Manual merge
| * | | | | Fix for Bug #21466: INET_ATON() returns signed int, not unsignedunknown2006-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_misc.result: Added test for Bug #21466: INET_ATON() returns signed int, not unsigned mysql-test/t/func_misc.test: Added test for Bug #21466: INET_ATON() returns signed int, not unsigned sql/item_func.h: Added unsigned_flag=1 value to Item_func_inet_aton. This fixes bug #21466: INET_ATON() returns signed int, not unsigned
* | | | | | Merge polly.local:/tmp/maint/bug22077/my50-bug22077unknown2006-11-241-6/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.local:/home/kaa/src/maint/mysql-5.0-maint sql/sql_parse.cc: Auto merged
| * | | | | | Fix for bug #22077 "DROP TEMPORARY TABLE fails with wrong error if read_only ↵unknown2006-11-201-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is set" Do not issue a 'read-only' error in case of DROP TEMPORARY TABLE on a non-existing temporary table. Instead produce the correct "Unknown table" error or warning (in cases when the IF EXISTS clause was specified). To a documentor: the part of the manual describing the 'read_only' system variable should be clarified to state the following: "When the read_only variable is set to ON, all operations which create/update/drop tables are rejected with the exceptions for: 1. Any operation performed by the replication thread on a slave server 2. Any operation performed by a user that have the SUPER privilege 3. Any operation that creates/updates/drops only temporary tables" mysql-test/r/read_only.result: Added testcases for bug #22077 "DROP TEMPORARY TABLE fails with wrong error if read_only is set" mysql-test/t/read_only.test: Added testcases for bug #22077 "DROP TEMPORARY TABLE fails with wrong error if read_only is set" sql/sql_parse.cc: Before issuing the 'read-only' error also check if the operation is not a DROP TEMPORARY TABLE statement
* | | | | | | Fix netware compile failureunknown2006-11-231-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove other warnings about unused variables
* | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-11-221-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029 mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged sql/item_timefunc.cc: Auto merged
| * \ \ \ \ \ \ Merge mysql.com:/usr/home/ram/work/bug22029/my41-bug22029unknown2006-11-221-3/+4
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029 mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged sql/item_timefunc.cc: merging
| | * | | | | | Fix for bug #22029: str_to_date returning NULL, while date_format works ↵unknown2006-10-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using identical format. The problem appears when we have a space followed by a non-format symbol. Fix: properly skip spaces. mysql-test/r/date_formats.result: Fix for bug #22029: str_to_date returning NULL, while date_format works using identical format. - test result. mysql-test/t/date_formats.test: Fix for bug #22029: str_to_date returning NULL, while date_format works using identical format. - test case. sql/item_timefunc.cc: Fix for bug #22029: str_to_date returning NULL, while date_format works using identical format. - skipping pre-spaces between each argument moved.
* | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2006-11-171-23/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * \ \ \ \ \ \ \ Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-11-161-23/+28
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into example.com:/work/bug24219/my50 sql/sql_table.cc: Auto merged
| | * | | | | | | | Fix for bug#24219 ALTER TABLE ... RENAME TO ... , DISABLE KEYS leads to crashunknown2006-11-161-23/+28
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (this is the 5.0 patch, because 4.1 differs) There was an improper order of doing chained operations. To the documentor: ENABLE|DISABLE KEYS combined with RENAME TO, and no other ALTER TABLE clause, leads to server crash independent of the presence of indices and data in the table. mysql-test/r/alter_table.result: post-merge fix my locale is utf8, and this breaks non-utf8 stuff when doing manual merge :( sql/sql_table.cc: If there is operation on the KEYS, first do it and then do a rename if there is such. Or, we will crash because the underlying table has changed.
* | | | | | | | | Merge 192.168.0.4:mysql/bug22958/my50-bug22958unknown2006-11-171-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint sql/mysqld.cc: Auto merged
| * | | | | | | | | Bug#22958 Com_create_user missing within 5.0unknown2006-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add Com_create_user to SHOW STATUS command sql/mysqld.cc: Add Com_create_user to the status variables list, it's already counted with the default mechanism
* | | | | | | | | | Add the two new functions to udf_example.def so they will be exported by dll'sunknown2006-11-161-0/+2
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | after-merge fixup.unknown2006-11-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - have to explicitly set null_value.
* | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-11-161-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug23653/my50-bug23653
| * \ \ \ \ \ \ \ \ Merge mysql.com:/usr/home/ram/work/bug23653/my41-bug23653unknown2006-11-161-1/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug23653/my50-bug23653 mysql-test/r/func_time.result: Auto merged mysql-test/t/func_time.test: Auto merged sql/item_timefunc.cc: Auto merged
| | * | | | | | | | Fix for bug #23653: Crash if last_day('0000-00-00')unknown2006-11-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As get_arg0_date() in the Item_func_last_day::get_date() returns 0000-00-00 date sometimes, we have to check ltime->month for 0 after the call. mysql-test/r/func_time.result: Fix for bug #23653: Crash if last_day('0000-00-00') - test result. mysql-test/t/func_time.test: Fix for bug #23653: Crash if last_day('0000-00-00') - test case. sql/item_timefunc.cc: Fix for bug #23653: Crash if last_day('0000-00-00') - return error if month is 0.
* | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug19955/my50-bug19955unknown2006-11-151-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint sql/item_func.cc: Auto merged
| * | | | | | | | | | Bug#19955: unsigned bigint used as signed with MOD functionunknown2006-11-151-0/+4
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: When we have a really large number (between 2^63 and 2^64) as the left side of the mod operator, it gets improperly corerced into a signed value. Solution: Added check to see if the "negative" number is really positive, and if so, cast it. mysql-test/r/bigint.result: Added test case result mysql-test/t/bigint.test: Added test case sql/item_func.cc: Added check to see if we have an unsigned number that looks like a signed number.
* | | | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-11-141-2/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into example.com:/work/bug23760/my50 mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/sql_parse.cc: Auto merged
| * | | | | | | | | | Fix for bug#23760 ROW_COUNT() and store procedure not owrking togetherunknown2006-11-141-2/+0
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that THD::row_count_func was zeroed too. It was zeroed as a fix for bug 4905 "Stored procedure doesn't clear for "Rows affected" However, the proper solution is not to zero, because THD::row_count_func has been set to -1 already in mysql_execute_command(), a later fix, which obsoletes the incorrect fix of #4095 mysql-test/r/sp.result: update result mysql-test/t/sp.test: test for bug#23760 ROW_COUNT() and store procedure not owrking together sql/sql_parse.cc: Remove zeroing for thd->row_count_func The fix for #4905 wasn't right. Now, it's ok without this zeroing because if there was an error THD::
* | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761unknown2006-11-132-27/+65
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint BitKeeper/etc/collapsed: auto-union sql/item_func.cc: Auto merged
| * | | | | | | | | Bug#18761: constant expression as UDF parameters not passed in as constantunknown2006-11-132-27/+65
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that set up data to be passed to user-defined functions was very old and analyzed the "Type" of the data that was passed into the UDF, when it really should analyze the "return_type", which is hard-coded for simple Items and works correctly for complex ones like functions. --- Added test at Sergei's behest. mysql-test/r/udf.result: Verify that various arguments work. --- Added test at Sergei's behest. mysql-test/t/udf.test: Verify that various arguments work. --- Added test at Sergei's behest. sql/item_func.cc: For function-Items, test whether it is constant and set the struct members for the UDF parameter appropriately. Replace tabs with spaces in affected code. sql/udf_example.c: Include a simple function that is useful in testing.
* | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860unknown2006-11-111-8/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
| * \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my41-bug22860unknown2006-11-111-8/+19
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860 BitKeeper/deleted/.del-collapsed~fbec3523369aae99: Delete: BitKeeper/etc/collapsed BitKeeper/etc/collapsed: 'Auto converge' sql/mysqld.cc: manual merge
| | * | | | | | | | Bug #22860: Option --memlock should be revisitedunknown2006-11-101-8/+19
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support says that memlock doesn't work on OSes other than Solaris. Add a warning about --memlock to the crash monologue. sql/mysqld.cc: On a crash when --memlock was active, emit advice about the insta- bility of that parameter.
* | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my50-bug20691unknown2006-11-101-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
| * | | | | | | | Bug#20691: DATETIME col (NOT NULL, NO DEFAULT) may insert garbage when \unknown2006-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specifying DEFAULT This was not specific to datetime. When there is no default value for a column, and the user inserted DEFAULT, we would write uninitialized memory to the table. Now, insist on writing a default value, a zero-ish value, the same one that comes from inserting NULL into a not-NULL field. (This is, at best, really strange behavior that comes from allowing sloppy usage, and serves as a good reason always to run one's server in a strict SQL mode.) mysql-test/r/default.result: Verify that all kinds of types work, even others other than datetime. mysql-test/t/default.test: Verify that all kinds of types work, even others other than datetime. sql/item.cc: Even if we warn that there is no default value in the table definition, we have to insert /something/.
* | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g50unknown2006-11-092-55/+152
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
| * \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my50-bug10963unknown2006-11-082-55/+152
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
| | * | | | | | | | Bug#10963: LEFT/RIGHT/SUBSTR/.. string functions returns wrong result \unknown2006-11-082-55/+152
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on large length Problem: Most (all) of the numeric inputs were being coerced into int (32 bit) sized variables. Works OK for sane inputs; any input larger than 2^32 (or 2^31 for signed vars) exihibited predictable wrapping behavior (up to about 10^18) and then started having really strange behaviour past that point (since the conversion to 64 bit int from the DECIMAL type can do weird things on out of range numbers). Solution: 1) Add many tests. 2) Convert input from (u)long type to (u)longlong. 3) Do (sometimes multiple) sanity checks on input, keeping in mind that sometimes a negative longlong is not a negative longlong (if the unsigned_flag is set). 4) Emulate existing behavior w/rt negative and "small" out-of-bounds values. mysql-test/r/func_str.result: Additional test results for #10963 mysql-test/t/func_str.test: Additional test results for #10963 sql/item_func.cc: Used larger type for counting, to avoid truncation. sql/item_strfunc.cc: Fix for #10963, including comments and cleaned up logic
* | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2006-11-083-14/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 configure.in: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged
| * | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-11-071-13/+15
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug19736/my50-bug19736
| | * | | | | | | Fix for bug #19736 VIEW: column names not quoted properly when view is ↵unknown2006-11-031-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replicated When we write 'query=...' string to a frm file for views on a slave, indentifiers are not properly quoted due to missing OPTION_QUOTE_SHOW_CREATE flag in the thd->options. Fix: properly set thd->options for the slave thread. mysql-test/r/rpl_view.result: Fix for bug #19736 VIEW: column names not quoted properly when view is replicated - result adjusted. sql/slave.cc: Fix for bug #19736 VIEW: column names not quoted properly when view is replicated - properly set thd->options only in one place (in the set_slave_thread_options()), using thd_startup_options. As a side effect we have OPTION_BIG_SELECTS flag set after the set_slave_thread_options() call from the log_enevt.cc:Rotate_log_event::exec_event().
| * | | | | | | | Fix after merge.unknown2006-11-061-0/+1
| | | | | | | | |
| * | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411unknown2006-11-061-1/+8
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411 BitKeeper/deleted/.del-collapsed~fbec3523369aae99: Delete: BitKeeper/etc/collapsed BitKeeper/etc/collapsed: 'Auto converge' mysql-test/r/func_test.result: Manual merge. mysql-test/t/func_test.test: Manual merge. sql/item_func.cc: Manual merge.
| | * | | | | | | Bug#23411: ... MOD-ing zero returns strange resultunknown2006-11-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Item_func_mod objects never had maybe_null set, so users had no reason to expect that they can be NULL, and may therefore deduce wrong results. Now, set maybe_null. mysql-test/r/func_test.result: Verify that the predictions are true. mysql-test/t/func_test.test: Verify that the predictions are true. sql/item_func.cc: MOD functions may be NULL.
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-0212-72/+221
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint configure.in: Auto merged mysql-test/t/ps.test: Auto merged sql/handler.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged tests/mysql_client_test.c: Auto merged myisam/sort.c: Manual merge. mysql-test/r/innodb_mysql.result: Manual merge. mysql-test/t/innodb_mysql.test: Manual merge. mysys/mf_iocache.c: Manual merge.
| | | * | | | | | | Fix for bug #23412: delete rows with null date fieldunknown2006-10-271-0/+8
| | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of the fix for bug #8143: A date with value 0 is treated as a NULL value mysql-test/r/delete.result: Fix for bug #23412: delete rows with null date field - test result mysql-test/t/delete.test: Fix for bug #23412: delete rows with null date field - test case sql/sql_delete.cc: Fix for bug #23412: delete rows with null date field - during SELECT queries processing we convert 'date[time]_field is null' conditions into 'date[time]_field = 0000-00-00[ 00:00:00]' for not null DATE and DATETIME fields. To be consistent, we have to do the same for DELETE queries. So we should call remove_eq_conds() in the mysql_delete() as well. Also it may simplify and speed up DELETE queries execution.
| | | * | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2006-10-234-4/+8
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
| | | | * \ \ \ \ \ Merge mysql.com:/usr/home/ram/work/mysql-4.1-maintunknown2006-10-234-4/+8
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
| | | * | \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maintunknown2006-10-201-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.local:/home/kaa/src/maint/m41-maint--07OGk
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-0215-49/+177
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-4.1-runtime mysql-test/r/ps.result: Auto merged mysql-test/t/func_gconcat.test: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_sum.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_update.cc: Auto merged
View Lorry Controller Status