Commit graph

22838 commits

Author SHA1 Message Date
mhansson/martin@linux-st28.site
6d6c475fe8 Merge linux-st28.site:/home/martin/mysql/src/bug31160/my50-bug31160
into  linux-st28.site:/home/martin/mysql/src/bug31160/my51-bug31160
2007-10-09 15:00:06 +02:00
mhansson/martin@linux-st28.site
148ce22add Bug#31160: MAKETIME() crashes server when returning NULL in ORDER BY using filesort
Even though it returns NULL, the MAKETIME function did not have this property set,
causing a failed assertion (designed to catch exactly this).
Fixed by setting the nullability property of MAKETIME().
2007-10-09 14:58:09 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
b1ffa1605e Merge mysql.com:/home/ram/work/mysql-5.1-maint
into  mysql.com:/home/ram/work/b31438/b31438.5.1
2007-10-09 16:34:56 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
1e4ff5c09b Merge mysql.com:/home/ram/work/b31249/b31249.5.0
into  mysql.com:/home/ram/work/b31249/b31249.5.1
2007-10-09 16:21:27 +05:00
anozdrin/alik@station.
27ee6db9db Fix merge. 2007-10-09 14:53:15 +04:00
anozdrin/alik@station.
1d63cac004 Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2007-10-09 14:32:43 +04:00
mhansson/martin@linux-st28.site
a06a6579e8 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  linux-st28.site:/home/martin/mysql/src/bug30832-again-push/my51-bug30832-again
2007-10-09 12:06:44 +02:00
mhansson/martin@linux-st28.site
ddc67f087a Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into  linux-st28.site:/home/martin/mysql/src/bug30832-again-push/my50-bug30832-again
2007-10-09 12:04:50 +02:00
mhansson/martin@linux-st28.site
600d2ba0b1 Merge linux-st28.site:/home/martin/mysql/src/bug30832-again/my50-bug30832-again
into  linux-st28.site:/home/martin/mysql/src/bug30832-again/my51-bug30832-again
2007-10-09 11:37:46 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4792385177 Fix for bug #31249: Assertion `!table || (!table->write_set ||
bitmap_is_set(table->write_set, fiel

Problem: creating a temporary table we allocate the group buffer if needed
followed by table bitmaps (see create_tmp_table()). Reserving less memory for 
the group buffer than actually needed (used) for values retrieval may lead 
to overlapping with followed bitmaps in the memory pool that in turn leads 
to unpredictable consequences.

As we use Item->max_length sometimes to calculate group buffer size,
it must be set to proper value. In this particular case 
Item_datetime_typecast::max_length is too small.

Another problem is that we use max_length to calculate the group buffer
key length for items represented as DATE/TIME fields which is superfluous.

Fix: set Item_datetime_typecast::max_length properly,
accurately calculate the group buffer key length for items 
represented as DATE/TIME fields in the buffer.
2007-10-09 14:37:21 +05:00
mhansson/martin@linux-st28.site
d29146f9f4 Bug#30832:Assertion + crash with select name_const('test',now());
Completion of previous patch. Negative number were denied
as the second argument to NAME_CONST.
2007-10-09 11:36:05 +02:00
mhansson@dl145s.mysql.com
731cba7b23 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
2007-10-09 08:58:53 +02:00
gshchepa/uchum@gleb.loc
09f6306ac3 Fixed bug #31310.
Locked rows of the InnoDB storage was silently skipped in the read-committed
isolation level.

QUICK_RANGE_SELECT for unique ranges lacks second (blocking) read
of the record that was read semi-consistently and just skip it.

The handler::read_multi_range_next method has been modified
to retry previous unique range if the previous read was
semi-consistent.
2007-10-09 01:07:15 +05:00
dkatz@damien-katzs-computer.local
38d3575695 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
2007-10-08 13:15:02 -04:00
dkatz@damien-katzs-computer.local
b2fec8877c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime
2007-10-08 13:10:55 -04:00
cmiller@zippy.cornsilk.net
04296df344 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-10-08 12:40:21 -04:00
anozdrin/alik@station.
2885d0df15 Get rid of compilation warning. 2007-10-08 17:59:23 +04:00
anozdrin/alik@station.
128772ba1f Fix compilation warning. 2007-10-08 17:09:28 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
29dca6ef33 Fix for bug #31438: updatexml still crashes
Problem: check missed if the second updatexml() argument is valid.

Fix: check it.
2007-10-08 16:52:15 +05:00
gkodinov/kgeorge@magare.gmz
67302b12f6 Bug #31156: mysqld: item_sum.cc:918: virtual bool
Item_sum_distinct::setup(THD*): Assertion

There was an assertion to detect a bug in ROLLUP
implementation. However the assertion is not true
when used in a subquery context with non-cacheable
statements.
Fixed by turning the assertion to accepted case
(just like it's done for the other aggregate functions).
2007-10-08 12:57:43 +03:00
mhansson@dl145s.mysql.com
193bb6ebf5 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
2007-10-08 10:45:36 +02:00
kostja@bodhi.(none)
7ec30183bb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-10-08 02:05:55 +04:00
kostja@bodhi.(none)
53b0324824 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-10-08 02:05:10 +04:00
gkodinov/kgeorge@magare.gmz
5df890e524 Merge bk-internal:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31094-5.1-opt
2007-10-06 16:08:39 +03:00
tnurnberg@sin.intern.azundris.com
0ff1b80bf0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  sin.intern.azundris.com:/home/tnurnberg/31253/51-31253
2007-10-06 03:05:02 +02:00
tnurnberg@sin.intern.azundris.com
48b0c25884 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/31253/50-31253
2007-10-06 03:02:31 +02:00
tnurnberg@sin.intern.azundris.com
da8fbb7522 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/19828/50-19828
2007-10-06 00:14:22 +02:00
cmiller@zippy.cornsilk.net
eedde95a33 Change URLs.
Our web server has been restructured several times, and references
to it in our source code has stayed the same.  This patch from Paul
DuBois updates all URLs to modern semantics.
2007-10-05 13:16:54 -04:00
tnurnberg@sin.intern.azundris.com
38ccaa1f6e Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  sin.intern.azundris.com:/home/tnurnberg/19828/51-19828
2007-10-05 18:36:26 +02:00
gkodinov/kgeorge@magare.gmz
91455690b5 Bug #31094: Forcing index-based sort doesn't work anymore if joins are done
A rule was introduced by the 5.1 part of the fix for bug 27531 to 
prefer filesort over indexed ORDER BY when accessing all of the rows of a 
table (because it's faster). This new rule was not accounting for the 
presence of a LIMIT clause.
Fixed the condition for this rule so it will prefer filesort over 
indexed ORDER BY only if no LIMIT.
2007-10-05 17:28:34 +03:00
holyfoot/hf@hfmain.(none)
f32f9ab9f5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 18:56:37 +05:00
holyfoot/hf@hfmain.(none)
9c2de8b28f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/hf/work/30286/my50-30286
2007-10-05 18:53:44 +05:00
mhansson@dl145s.mysql.com
122ea13767 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
2007-10-05 15:20:56 +02:00
anozdrin/alik@station.
ac875690f7 Fix for BUG#20550: Stored function: wrong RETURN type metadata
when used in a VIEW.

The problem was that wrong function (create_tmp_from_item())
was used to create a temporary field for Item_func_sp.

The fix is to use create_tmp_from_field().
2007-10-05 16:35:01 +04:00
mhansson@dl145s.mysql.com
b4b84f6134 Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my50-bug30942
2007-10-05 13:42:19 +02:00
holyfoot/hf@hfmain.(none)
9f8842c265 Merge mysql.com:/home/hf/work/30286/my50-30286
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 16:33:37 +05:00
holyfoot/hf@hfmain.(none)
1ab2fd9bb8 Merge mysql.com:/home/hf/work/30286/my41-30286
into  mysql.com:/home/hf/work/30286/my50-30286
2007-10-05 16:33:08 +05:00
tnurnberg@sin.intern.azundris.com
66cc732748 Merge sin.intern.azundris.com:/home/tnurnberg/19828/50-19828
into  sin.intern.azundris.com:/home/tnurnberg/19828/51-19828
2007-10-05 13:11:38 +02:00
tnurnberg@sin.intern.azundris.com
00135f1ced Merge sin.intern.azundris.com:/home/tnurnberg/31253/50-31253
into  sin.intern.azundris.com:/home/tnurnberg/31253/51-31253
2007-10-05 13:00:11 +02:00
tnurnberg@sin.intern.azundris.com
455c05abcf Bug #31253: crash comparing datetime to double
convert(<invalid time>, datetime) in WHERE caused crash as function
returned (void*)NULL, but did not flag SQL NULL. It does now.
2007-10-05 12:08:38 +02:00
holyfoot/hf@hfmain.(none)
e19efc0a6e Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/26527/my51-26527
2007-10-05 14:21:59 +05:00
tnurnberg@sin.intern.azundris.com
bb86597dc2 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  sin.intern.azundris.com:/home/tnurnberg/31227/51-31227
2007-10-05 10:07:08 +02:00
tnurnberg@sin.intern.azundris.com
5f45fd05bf Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/31227/50-31227
2007-10-05 10:04:45 +02:00
tnurnberg@sin.intern.azundris.com
a34ce28c55 Merge sin.intern.azundris.com:/home/tnurnberg/31227/50-31227
into  sin.intern.azundris.com:/home/tnurnberg/31227/51-31227
2007-10-05 09:47:14 +02:00
tnurnberg@sin.intern.azundris.com
caaf8f56bd Bug#31227: memory overrun with decimal (6,6) and zerofill and group_concat
Reserve the space for the leading 0 (before the decimal point) in DECIMAL(a,a) ZEROFILL.
2007-10-05 09:38:57 +02:00
acurtis/antony@ltamd64.xiphis.org
bb6bf6792c Merge xiphis.org:/anubis/antony/work/p1-bug31382.1.fix-5.1
into  xiphis.org:/anubis/antony/work/p1-bug31382.1.merge-5.1
2007-10-04 17:37:51 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
159d5c51f2 fix undefined variable which can lead to crash 2007-10-04 17:34:28 -07:00
davi@moksha.local
a8f2ba0f80 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  moksha.local:/Users/davi/mysql/push/mysql-5.0-runtime
2007-10-04 19:56:27 -03:00
davi@moksha.local
305ebc1e21 Bug#21587 FLUSH TABLES causes server crash when used with HANDLER statements
This bug is a symptom of the way handler's tables are managed. The
most different aspect, compared to the conventional behavior, is that
the handler's tables are long lived, meaning that their lifetimes are
not bounded by the duration of the command that opened them. For this
effect the handler code uses its own list (handler_tables instead of
open_tables) to hold open handler tables so that the tables won't be
closed at the end of the command/statement. Besides the handler_tables
list, there is a hash (handler_tables_hash) which is used to associate
handler aliases to tables and to refresh the tables upon demand (flush
tables).

The current implementation doesn't work properly with refreshed tables
-- more precisely when flush commands are issued by other initiators.
This happens because when a handler open or read statement is being
processed, the associated table has to be opened or locked and, for this
matter, the open_tables and handler_tables lists are swapped so that the
new table being opened is inserted into the handler_tables list. But when
opening or locking the table, if the refresh version is different from the
thread refresh version then all used tables in the open_tables list (now
handler_tables) are refreshed. In the "refreshing" process the handler
tables are flushed (closed) without being properly unlinked from the
handler hash.

The current implementation also fails to properly discard handlers of
dropped tables, but this and other problems are going to be addressed
in the fixes for bugs 31397 and 31409.

The chosen approach tries to properly save and restore the table state
so that no table is flushed during the table open and lock operations.
The logic is almost the same as before with the list swapping, but with
a working glue code.

The test case for this bug is going to be committed into 5.1 because it
requires a test feature only avaiable in 5.1 (wait_condition).
2007-10-04 17:34:41 -03:00
tsmith@sita.local
35d9a05f9f Merge sita.local:/Users/tsmith/m/bk/50-5.0.48
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-10-04 13:58:40 -06:00