summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-optmhansson@dl145s.mysql.com2007-05-302-1/+9
|\ | | | | | | into dl145s.mysql.com:/users/mhansson/mysql/autopush/my51-bug28250
| * Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug28250/my50-bug28250mhansson@dl145s.mysql.com2007-05-292-1/+9
| |\ | | | | | | | | | into dl145s.mysql.com:/users/mhansson/mysql/push/bug28250/my51-bug28250
| | * Bug #28250: Run-Time Check Failure #3 - The variable 'value' is mhansson@dl145s.mysql.com2007-05-232-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being used without being def Inside method Item_func_unsigned::val_int, the variable value can be returned without being initialized when the CAST argument is of type DECIMAL and has a NULL value. This gives a run-time error when building debug binaries using Visual C++ 2005. Solution: Initialize value to 0
* | | Added comment for ha_statistics::recordssergefp@mysql.com2007-05-291-1/+9
| | |
* | | Merge bk-internal:/home/bk/mysql-5.1-optgkodinov/kgeorge@magare.gmz2007-05-2931-372/+372
|\ \ \ | | | | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/autopush/join_cache_explain-5.1-opt
| * | | Bug #27531: 5.1 part of the fixgkodinov/kgeorge@macbook.gmz2007-05-2931-372/+372
| | | | | | | | | | | | | | | | | | | | | | | | - Renamed "Using join cache" to "Using join buffer". - "Using join buffer" is now printed on the last table that "reads" from the join buffer cache.
* | | | Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-optmhansson@dl145s.mysql.com2007-05-290-0/+0
|\ \ \ \ | |/ / / |/| | | | | | | into dl145s.mysql.com:/users/mhansson/mysql/autopush/my51-bug23856
| * | | Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my50-bug23856mhansson@dl145s.mysql.com2007-05-231-1/+1
| |\ \ \ | | | | | | | | | | | | | | | into dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my51-bug23856
| | * | | Bug #23856: GROUP_CONCAT and ORDER BY: junk from previous mhansson@dl145s.mysql.com2007-05-233-74/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rows for query on I_S This is a patch to get rid of some warnings about comparisons between singed and unsigned ints, which turn up on sapsrv1 and sapsrv2.
* | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-05-270-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into olga.mysql.com:/home/igor/mysql-5.1-opt
| * | | | | Post-merge fix.igor@olga.mysql.com2007-05-271-1/+2
| | | | | |
| * | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0ibabaev@bk-internal.mysql.com2007-05-2839-167/+894
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
* | \ \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1ibabaev@bk-internal.mysql.com2007-05-2835-123/+832
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
| * | | | | | | view.result, mysqldump.result:gshchepa/uchum@gleb.loc2007-05-282-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge with 5.0-opt.
| * | | | | | | Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-optgshchepa/uchum@gleb.loc2007-05-2814-8/+333
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | into gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
| | * | | | | | Avoided warnings on Windows.igor@olga.mysql.com2007-05-261-5/+5
| | | | | | | |
| | * | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-05-263-25/+60
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28571
| | | * | | | | | Fixed bug #28571. Outer join queries with ON conditions overigor@olga.mysql.com2007-05-263-25/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constant outer tables did not return null complemented rows when conditions were evaluated to FALSE. Wrong results were returned because the conditions over constant outer tables, when being pushed down, were erroneously enclosed into the guard function used for WHERE conditions.
| | * | | | | | | field.h:gshchepa/uchum@gleb.loc2007-05-261-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Warnings elimination.
| | * | | | | | Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-optgshchepa/uchum@gleb.loc2007-05-253-2/+23
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
| | | * | | | | | Fixed bug #28522:gshchepa/uchum@gleb.loc2007-05-253-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes `mysqldump --hex-blob' overruned output buffer by '\0' byte. The dump_table() function has been fixed to reserve 1 byte more for the last '\0' byte of dumped string.
| | * | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-05-243-1/+29
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28561
| | | * | | | | | Fixed bug #28561: assertion abort for update on multi-table view withigor@olga.mysql.com2007-05-233-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHECK OPTION and a subquery in WHERE condition. The abort was triggered by setting the value of join->tables for subqueries in the function JOIN::cleanup. This function was called after an invocation of the JOIN::join_free method for subqueries used in WHERE condition.
| | * | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-05-235-1/+220
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | into moonbone.local:/mnt/gentoo64/work/27563-bug-5.0-opt-mysql
| | | * | | | | | Bug#27563: Stored functions and triggers wasn't throwing an error when killed.evgen@moonbone.local2007-05-235-1/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a stored function or a trigger was killed it had aborted but no error was thrown. This allows the caller statement to continue without a notice. This may lead to a wrong data being inserted/updated to/deleted as in such cases the correct result of a stored function isn't guaranteed. In the case of triggers it allows the caller statement to ignore kill signal and to waste time because of re-evaluation of triggers that always will fail because thd->killed flag is still on. Now the Item_func_sp::execute() and the sp_head::execute_trigger() functions check whether a function or a trigger were killed during execution and throws an appropriate error if so. Now the fill_record() function stops filling record if an error was reported through thd->net.report_error.
| * | | | | | | | sql_table.cc:evgen@moonbone.local2007-05-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merge fix.
| * | | | | | | | Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-optevgen@moonbone.local2007-05-233-3/+112
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
| | * | | | | | | Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-optmhansson@dl145s.mysql.com2007-05-227-6/+93
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145s.mysql.com:/users/mhansson/mysql/autopush/mysql-5.0o-pushee
| | | * \ \ \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@magare.gmz2007-05-227-6/+93
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/autopush/B28476-5.0-opt
| | * | \ \ \ \ \ \ \ Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my50-bug23856mhansson@dl145s.mysql.com2007-05-226-6/+109
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | / / / | | | | |_|_|_|/ / / | | | |/| | | | | | into dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/mysql-5.0o-pushee
| | * | | | | | | | Added initializations to avoid compiler warnings.igor@olga.mysql.com2007-05-211-2/+2
| | | | | | | | | |
| | * | | | | | | | Bug#27507: Wrong DATETIME value was allowed by ALTER TABLE in the NO_ZERO_DATEevgen@moonbone.local2007-05-223-3/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode. When a new DATE/DATETIME field without default value is being added by the ALTER TABLE the '0000-00-00' value is used as the default one. But it wasn't checked whether such value was allowed by the set sql mode. Due to this '0000-00-00' values was allowed for DATE/DATETIME fields even in the NO_ZERO_DATE mode. Now the mysql_alter_table() function checks whether the '0000-00-00' value is allowed for DATE/DATETIME fields by the set sql mode. The new error_if_not_empty flag is used in the mysql_alter_table() function to indicate that it should abort if the table being altered isn't empty. The new new_datetime_field field is used in the mysql_alter_table() function for error throwing purposes. The new error_if_not_empty parameter is added to the copy_data_between_tables() function to indicate the it should return error if the source table isn't empty.
| * | | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B28476-5.0-optgkodinov/kgeorge@magare.gmz2007-05-222-0/+44
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/work/B28476-5.1-opt Zero merge all except the new test
| | * | | | | | | | Bug #28476: force index on a disabled myisam index gives error 124gkodinov/kgeorge@magare.gmz2007-05-227-6/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When processing the USE/FORCE index hints the optimizer was not checking if the indexes specified are enabled (see ALTER TABLE). Fixed by: Backporting the fix for bug 20604 to 5.0
| * | | | | | | | | Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my51-bug23856mhansson@dl145s.mysql.com2007-05-226-6/+109
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | into dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/mysql-5.1o-pushee
| | * | | | | | | | Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my50-bug23856mhansson@dl145s.mysql.com2007-05-216-6/+111
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | / / | | | |_|_|_|_|/ / | | |/| | | | | | into dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my51-bug23856
| | | * | | | | | bug#23856mhansson@dl145s.mysql.com2007-05-216-6/+111
| | | | |_|_|_|/ | | | |/| | | |
| * | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-optholyfoot/hf@hfmain.(none)2007-05-213-1/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/27984/my51-27984
| | * \ \ \ \ \ \ Merge mysql.com:/home/hf/work/27984/my50-27984holyfoot/hf@hfmain.(none)2007-05-210-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | into mysql.com:/home/hf/work/27984/my51-27984
| | | * | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optholyfoot/hf@mysql.com/hfmain.(none)2007-05-213-1/+10
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/27984/my50-27984
| | | | * \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/hfmain.(none)2007-05-213-1/+10
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/27984/my50-27984
| | | * | \ \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optholyfoot/hf@mysql.com/hfmain.(none)2007-05-211-16/+16
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/28361/my50-28361
| | | * | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optholyfoot/hf@mysql.com/hfmain.(none)2007-05-215-96/+96
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/27894/my50-27894
| | * | \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@hfmain.(none)2007-05-213-1/+10
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/27984/my51-27984
| | | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/27984/my50-27984holyfoot/hf@hfmain.(none)2007-05-213-1/+10
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/27984/my51-27984
| | | | * | | | | | | | | Bug #27984 Long Decimal Maths produces truncated results.holyfoot/hf@mysql.com/hfmain.(none)2007-05-213-1/+10
| | | | | |_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decimal_round failed to perform a correct rounding of a decimal number if its first nine digits were '9'. It just sets those digits to 0.
| * | | | | | | | | | | Merge mysql.com:/home/hf/work/28361/my50-28361holyfoot/hf@hfmain.(none)2007-05-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | / / / / / | | | |_|_|_|/ / / / / | | |/| | | | | | | | into mysql.com:/home/hf/work/28361/my51-28361
| | * | | | | | | | | test result fixedholyfoot/hf@mysql.com/hfmain.(none)2007-05-211-16/+16
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-optholyfoot/hf@hfmain.(none)2007-05-215-96/+96
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/27894/my51-27894
| | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/27894/my50-27894holyfoot/hf@hfmain.(none)2007-05-215-96/+96
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/27894/my51-27894