Commit graph

15317 commits

Author SHA1 Message Date
konstantin@mysql.com
0ae0f2cd39 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-root
2006-03-15 20:40:52 +03:00
konstantin@mysql.com
386ec52a6b A fix and test case for Bug#16164 "Easter egg":
SHOW AUTHORS caused 'Packets out of order' in stored functions:
add the corresponding SQLCOM to sp_get_flags_for_command so that
it'd return sp-related flags for it. 
Fix Bug#17403 "Events: packets out of order with show create event"
in the same chaneset.
2006-03-15 20:21:59 +03:00
bell@book.local
1626c2d9e1 We should prohobit concurent read of inserting file in SP
because it can couse problem with Query cache (BUG#14767)
2006-03-15 19:15:52 +02:00
Reggie@xgeek.
11979eec94 Moved cmake scripts into the proper directories 2006-03-15 10:22:12 -06:00
mats@mysql.com
4097d049d2 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new
2006-03-15 16:59:54 +01:00
jani@ibmlab.site
f803908e97 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  ibmlab.site:/home/my/bk/mysql-5.1-new
2006-03-15 14:08:59 +02:00
mats@mysql.com
bea2ca46b3 Bug#18250 (Truncate table replicate both as statement and as individual
rows for SEs using injector):
Table truncation ("DELETE FROM t1" and "TRUNCATE t1") was logged as
a statement even when the storage engine deletes the rows individually
using the injector.
2006-03-15 11:21:36 +01:00
bar@mysql.com
e983bc7486 xml.result, xml.test:
Adding test.
item_xmlfunc.cc:
  Bug #18171 XML: ExtractValue: the XPath position() function crashes the server!
  Disallowing use of position() and last() without context.
2006-03-15 11:57:37 +04:00
mskold@mysql.com
ce9fdb3846 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-15 08:25:46 +01:00
jani@ibmlab.site
4700bb9366 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  ibmlab.site:/home/my/bk/mysql-5.1-new
2006-03-15 09:02:21 +02:00
paul@kite-hub.kitebird.com
c52a092c62 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0-r1.2084
2006-03-14 13:32:48 -06:00
paul@kite-hub.kitebird.com
dd0635dc38 mysqld.cc:
Backport option description change from 5.1 to 5.0.
2006-03-14 13:26:28 -06:00
evgen@sunlight.local
a152cac2e7 sql_select.cc:
Afterfix for bug#17366: Unchecked Item_int results in server crash
2006-03-14 18:49:37 +03:00
jani@ibmlab.site
18b2c36d3e Re commit of previous fix as the bk tree was broken. 2006-03-14 17:46:25 +02:00
mskold@mysql.com
40913583a5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-14 16:20:56 +01:00
mskold@mysql.com
7e7a78911a Fixed typo in debug printout 2006-03-14 15:43:28 +01:00
mskold@mysql.com
a73e81898d Fix for bug#17899 Partitions: crash, NDB, Select .. ORDER BY 2006-03-14 15:27:38 +01:00
evgen@sunlight.local
5866eb948a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into sunlight.local:/work_local/17336-bug-5.0-mysql
2006-03-14 15:33:13 +03:00
mikael@zim.(none)
083e3da011 Manual merge 2006-03-14 03:46:12 -08:00
mikael@zim.(none)
cad342ae02 Merge zim.(none):/home/mikael/bug17127
into  zim.(none):/home/mikael/bug16370
2006-03-14 02:50:29 -08:00
mikael@zim.(none)
516ac72a75 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug16370
2006-03-14 02:39:24 -08:00
mikael@zim.(none)
b829321dd0 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug17127
2006-03-14 02:37:24 -08:00
mikael@zim.(none)
4b4b8f933e Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug17127
2006-03-14 02:32:46 -08:00
mikael@zim.(none)
0ec5ee2c50 Manual merge 2006-03-14 01:39:27 -08:00
mikael@zim.(none)
ff77d7665d Merge zim.(none):/home/mikael/bug15961
into  zim.(none):/home/mikael/bug16370
2006-03-14 01:24:06 -08:00
mikael@zim.(none)
946979d2af Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug16370
2006-03-14 01:07:29 -08:00
mikael@zim.(none)
a0f22844a7 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug15961
2006-03-14 00:51:44 -08:00
mikael@zim.(none)
4adb973df4 BUG#15961: After review fixes
New error message
2006-03-14 00:39:06 -08:00
gbichot@production.mysql.com
2c297c0753 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new
2006-03-14 09:00:45 +01:00
jimw@mysql.com
741b14a0ef Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 10:59:42 -08:00
gbichot@production.mysql.com
8a7a35fd3f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new
2006-03-13 19:59:27 +01:00
evgen@sunlight.local
af660df0ef Fixed bug#17366: Unchecked Item_int results in server crash
When there is conjunction of conds, the substitute_for_best_equal_field()
will call the eliminate_item_equal() function in loop to build final
expression. But if eliminate_item_equal() finds that some cond will always
evaluate to 0, then that cond will be substituted by Item_int with value ==
0. In this case on the next iteration eliminate_item_equal() will get that 
Item_int and treat it as Item_cond. This is leads to memory corruption and
server crash on cleanup phase.

To the eliminate_item_equal() function was added DBUG_ASSERT for checking
that all items treaten as Item_cond are really Item_cond.
The substitute_for_best_equal_field() now checks that if
eliminate_item_equal() returns Item_int and it's value is 0 then this 
value is returned as the result of whole conjunction.
2006-03-13 21:11:15 +03:00
mikael@zim.(none)
09440e6d7f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug16370
2006-03-13 09:59:07 -08:00
paul@snake-hub.snake.net
01d94fa5b5 mysqld.cc:
Revise option description. And let's put it in the proper
  lexical order within the option list.
2006-03-13 11:58:36 -06:00
jimw@mysql.com
786abc60a9 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 08:31:39 -08:00
knielsen@mysql.com
7f27d9824f Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-03-13 16:08:20 +01:00
knielsen@mysql.com
4d3ad1564d Misc. portability compile fixes. 2006-03-13 16:07:00 +01:00
guilhem@production.mysql.com
aa4de1c9f0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new
2006-03-13 15:45:57 +01:00
guilhem@mysql.com
e485f8e12c Fixes to the replication mixed mode (patch approved by Monty):
- detect the need for row-based binlogging not at execution stage but earlier at parsing stage; needed for example for CREATE TABLE SELECT UUID().
- more tests of this mixed mode.
2006-03-13 15:34:30 +01:00
jimw@mysql.com
cf48e4cde6 Merge mysql.com:/home/jimw/my/mysql-5.1-17097
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 06:20:20 -08:00
jimw@mysql.com
d7762d4eb2 Merge mysql.com:/home/jimw/my/mysql-5.1-17497
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 06:18:04 -08:00
jimw@mysql.com
9e2bafbc5f Merge mysql.com:/home/jimw/my/mysql-5.1-14526
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 06:15:21 -08:00
jimw@mysql.com
f9fa05a0c9 Merge mysql.com:/home/jimw/my/mysql-5.1-14673
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 06:12:42 -08:00
rburnett@production.mysql.com
b81dbad79b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  production.mysql.com:/usersnfs/rburnett/mysql-5.1-bug17173
2006-03-13 14:54:39 +01:00
rburnett@production.mysql.com
c9472ee254 Bug # 17173 - Partitions: less than search fails
Bug # 17894 - Comparison with "less than" operator fails with range partition

The problem here was that on queries such as < 3, the range given is NULL < n < 3.
The null part works correctly where the null value is stored in rec[0] and the
field is marked as being null.  However, when the 3 is processed, the 3 is places
on rec[0] but the null flag is left uncleared.

partition_range.result:
  Results block for bug #17894
partition_range.test:
  Test block for bug #17894
partition_list.result:
  Results block for bug #17173
partition_list.test:
  Test block for bug #17173
opt_range.cc:
  call set_notnull to clear any null flag that may have been set
2006-03-13 14:50:16 +01:00
jimw@mysql.com
ed453f077f Bug #17097: Partitions: failing ADD PRIMARY KEY leads to temporary rotten metadata,crash
When doing an ALTER TABLE on a table using partitioning, force the table
  definition to get reloaded, since it may become invalid whenever the ALTER
  TABLE fails (even for an ALTER TABLE without specific partitioning changes).
2006-03-13 05:01:11 -08:00
petr@mysql.com
f513420d12 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-03-13 13:57:22 +03:00
mikael@zim.(none)
6b185a935f BUG#15407: Crash if error in subpartition definition 2006-03-13 02:36:02 -08:00
tomas@poseidon.ndb.mysql.com
5a4e512942 changed test to make it predictable 2006-03-13 09:55:41 +01:00
petr@mysql.com
d91ea9e0cb Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-03-13 10:27:03 +03:00