mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40492 commits 2778 branches 343 tags 1.6 GiB
Commit graph

18748 commits

Author SHA1 Message Date
cmiller@zippy.cornsilk.net
19cb3d3bf7 Fix after merge. 2006-11-06 20:41:18 -05:00
cmiller@zippy.cornsilk.net
a759280347 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my51-bug23411
 2006-11-06 17:46:50 -05:00
cmiller@zippy.cornsilk.net
40170fbf58 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411
 2006-11-06 17:45:47 -05:00
cmiller@zippy.cornsilk.net
87a5134b7c Bug#23411: ... MOD-ing zero returns strange result 
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.
 2006-11-06 17:13:19 -05:00
holyfoot/hf@mysql.com/deer.(none)
7ddb8b68fa bug #19491 (5.0-related additional fixes) 2006-11-06 22:33:18 +04:00
holyfoot/hf@mysql.com/deer.(none)
aa7a27d28b Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/8663/my50-8663
 2006-11-06 15:04:58 +04:00
holyfoot/hf@deer.(none)
711e8d1b4b Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/8663/my51-8663
 2006-11-06 15:00:10 +04:00
holyfoot/hf@mysql.com/deer.(none)
fca6f71435 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/8663/my50-8663
 2006-11-06 14:57:47 +04:00
holyfoot/hf@mysql.com/deer.(none)
0d10dbe332 Merge abotchkov@production.mysql.com:mysql-5.0-opt 
into  mysql.com:/home/hf/work/21790/my50-21790
 2006-11-06 11:16:13 +04:00
holyfoot/hf@mysql.com/deer.(none)
50d199848b Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/19491/my50-19491
 2006-11-06 11:10:08 +04:00
holyfoot/hf@deer.(none)
c9cf558667 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/8663/my51-8663
 2006-11-06 11:02:50 +04:00
holyfoot/hf@deer.(none)
7e1c6b480d Merge mysql.com:/home/hf/work/8663/my50-8663 
into  mysql.com:/home/hf/work/8663/my51-8663
 2006-11-06 11:01:35 +04:00
petr/cps@outpost.site
b28b07f09f Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191
 2006-11-06 00:19:55 +03:00
petr/cps@outpost.site
bfbf1cdee9 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191
 2006-11-06 00:11:34 +03:00
petr/cps@outpost.site
8de747b0c7 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1-runtime 
into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
 2006-11-06 00:05:02 +03:00
petr/cps@outpost.site
1b231a177f Merge outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191 
into  outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191
 2006-11-06 00:00:44 +03:00
petr/cps@outpost.site
660c2f0cde Merge outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191 
into  outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191
 2006-11-05 23:31:42 +03:00
petr/cps@outpost.site
51ff0db079 Add missing DBUG_RETURN() 2006-11-05 23:25:34 +03:00
brian@zim.(none)
8a56fcff6a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-11-05 12:06:09 -08:00
brian@zim.(none)
1a92614216 Removed Innodb variable at request of Innobase. 2006-11-05 12:03:19 -08:00
mats@romeo.(none)
efaa0f4092 Post-merge fixes. 2006-11-03 21:55:51 +01:00
mats@romeo.(none)
a726fec6e7 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
 2006-11-03 21:11:58 +01:00
gkodinov/kgeorge@macbook.gmz
77acba320d Bug #22457: Column alias in ORDER BY works, but not if in an expression 
The parser is allocating Item_field for references by name in ORDER BY
 expressions. Such expressions however may point not only to Item_field 
 in the select list (or to a table column) but also to an arbitrary Item. 
 This causes Item_field::fix_fields to throw an error about missing 
 column.
 The fix substitutes Item_field for the reference with an Item_ref when 
 not pointing to Item_field.
 2006-11-03 18:48:16 +02:00
aelkin/elkin@dsl-hkigw8-feaef900-46.dhcp.inet.fi
8823b832bb Bug#16228/Bug#20697 - related. 
Bug#23831  deadlock not noticed

RBR bug in that when replicated msta (multi-statement-trans-action) deadlocks
with a local at write row event or gets timed-out, the event handler did not return
the correct error code.
Wrong error code stops slave sql thread instead of to proceed with
rollback and replay.

The correct code is typed in error log and stored for error handling rotine
to conduct rollback and replay of the transaction. The handling for the rbr
remains the same as for the sbr events.
Particularly, timed-out transaction still is rolled back - look at the related bugs.
 2006-11-03 14:26:40 +02:00
bar@bar.intranet.mysql.r18.ru
0dd8eb22e8 Merge mysql.com:/usr/home/bar/mysql-5.1.b22823 
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
 2006-11-03 15:37:15 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
afffedc0e3 Fix for bug #19736 VIEW: column names not quoted properly when view is 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.
 2006-11-03 15:27:37 +04:00
anozdrin/alik@alik.
18fb4abff4 Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-11-03 14:00:35 +03:00
bar@bar.intranet.mysql.r18.ru
8803496903 Merge mysql.com:/usr/home/bar/mysql-5.0-rpl 
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
 2006-11-03 10:29:44 +04:00
bar@bar.intranet.mysql.r18.ru
8748cde937 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
 2006-11-03 10:19:23 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
45ac13658b After merge fix for BUG#18908 ERROR 1406 (22001): Data too long for column :: using utf8 2006-11-03 10:18:13 +04:00
cmiller@zippy.cornsilk.net
b074e13483 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-02 17:51:59 -05:00
cmiller@zippy.cornsilk.net
af5acac047 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-02 17:39:52 -05:00
cmiller@zippy.cornsilk.net
c34f3219b3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-11-02 17:27:42 -05:00
cmiller@calliope.local
7b973f394f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  calliope.local:/Volumes/Source/src/mysql-5.1-maint
 2006-11-02 14:28:40 -05:00
cmiller@calliope.local
948b9831a8 Fixed misuse of automake _DEPENDENCIES item. It caused Make try to create 
a bogus dependency "-lz" .
 2006-11-02 14:26:54 -05:00
malff/marcsql@weblab.(none)
48a87f8ae0 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-21114_b
 2006-11-02 11:13:04 -07:00
malff/marcsql@weblab.(none)
62c242cc75 Bug#21114 (Foreign key creation fails to table with name format) 
Due to the complexity of this change, everything is documented in WL#3565

This patch is the third iteration, it takes into account the comments
received to date.
 2006-11-02 11:01:53 -07:00
cbell/Chuck@mysql_cab.
506b97fd5e Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql_cab.:C:/source/c++/mysql-5.1-BUG_23735
 2006-11-02 09:10:06 -05:00
ramil/ram@myoffice.izhnet.ru
4747665224 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint
 2006-11-02 17:13:10 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
26117992be Fix for bug #23762: partition.test fails (partition_hash, partition_pruning as well) 
When partition pruning is used we have to initialize key_part->flag in the 
create_partition_index_descr() as it's checked in the get_mm_leaf().
 2006-11-02 17:11:53 +04:00
andrey@example.com
63f7ca0662 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  example.com:/work/mysql-5.1-runtime-bug22830-new
 2006-11-02 13:59:44 +01:00
andrey@example.com
c27a88ca2d Better fix for bug#22830 
Events: crash with procedure which alters events with function

Post-review CS

This fix also changes the handling of KILL command combined with
subquery. It changes the error message given back to "not supported",
from parse error. The error for CREATE|ALTER EVENT has also been changed
to generate "not supported yet" instead of parse error.
In case of a SP call, the error is "not supported yet". This change
cleans the parser from code which should not belong to there. Still
LEX::expr_allows_subselect is existant because it simplifies the handling
 of SQLCOM_HA_READ which forbids subselects.
 2006-11-02 13:51:43 +01:00
baker@bk-internal.mysql.com
5214ed48e7 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-02 08:35:55 +01:00
kostja@bodhi.local
aaeef40e72 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-02 03:30:16 +03:00
kostja@bodhi.local
965669d1f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-02 03:24:11 +03:00
igor@rurik.mysql.com
79abdb38f8 Merge rurik.mysql.com:/home/igor/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21727
 2006-11-01 14:50:14 -08:00
kostja@bodhi.local
b471ea50f7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-11-02 01:21:37 +03:00
kostja@bodhi.local
6a28c436f7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2006-11-02 01:08:39 +03:00
monty@mysql.com/nosik.monty.fi
959e906768 bug#23110 Some NDB tests assert randomly on mixed mode binlog: Don't reset binlog format for NDB binlog injector thread 2006-11-01 23:35:58 +02:00
monty@nosik.monty.fi
d745fe49fe Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-01 19:46:23 +02:00