evgen@moonbone.local
f6fbbf2002
Fixed bug#5505: Wrong error message on INSERT into a view
...
On an INSERT into an updatable but non-insertable view an error message was
issued stating the view being not updatable. This can lead to a confusion of a
user.
A new error message is introduced. Is is showed when a user tries to insert
into a non-insertable view.
2006-09-29 01:00:18 +04:00
evgen@moonbone.local
e0461067b8
Fixed bug#20503: Server crash due to the ORDER clause not taken into account
...
while space allocation
Under some circumstances DISTINCT clause can be converted to grouping.
In such cases grouping is performed by all items in the select list.
If an ORDER clause is present then items from it is prepended to group list.
But the case with ORDER wasn't taken into account when allocating the
array for sum functions. This leads to memory corruption and crash.
The JOIN::alloc_func_list() function now allocates additional space if there
is an ORDER by clause is specified and DISTINCT -> GROUP BY optimization is
possible.
2006-09-29 00:50:00 +04:00
svoj@mysql.com/april.(none)
15d330ebce
After merge fix.
2006-09-29 01:36:17 +05:00
iggy@rolltop.ignatz42.dyndns.org
06ea6d7323
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-09-28 15:56:14 -04:00
iggy@rolltop.ignatz42.dyndns.org
3f2c9aa796
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-09-28 15:56:05 -04:00
iggy@rolltop.ignatz42.dyndns.org
78154af633
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-09-28 15:54:59 -04:00
cmiller@zippy.cornsilk.net
8dd3e7f489
Fixed incorrect merge of gluh's reversion of B-g#21432.
2006-09-28 15:45:17 -04:00
svoj@april.(none)
7ed413d17b
Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.1-engines
2006-09-29 00:23:43 +05:00
svoj@mysql.com/april.(none)
ad7da7f1de
Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
2006-09-29 00:00:27 +05:00
iggy@rolltop.ignatz42.dyndns.org
70dcbe3e6c
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305
2006-09-28 14:33:39 -04:00
iggy@rolltop.ignatz42.dyndns.org
d36444a9ec
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
2006-09-28 14:32:30 -04:00
iggy@rolltop.ignatz42.dyndns.org
f063bee3b2
Bug#20305: PROCEDURE ANALYSE() returns wrong M for FLOAT(M, D) and DOUBLE(M, D)
2006-09-28 14:30:20 -04:00
svoj@mysql.com/april.(none)
2de51adffa
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
2006-09-28 22:14:31 +05:00
svoj@mysql.com/april.(none)
b271d7653b
BUG#21617 - crash when selecting from merge table with inconsistent indexes
...
Crash may happen when selecting from a merge table that has underlying
tables with less indexes than in a merge table itself.
If number of keys in merge table is not bigger than requested key number,
return error.
2006-09-28 22:10:06 +05:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
5962886dce
bug#22027: CREATE TABLE IF NOT EXISTS SELECT logged improperly with rbr binlog,
...
and #22762 : create talbe if not exists like a-temp-table binlogged w/o "if not exists"
These are rbr bugs.
store_create_info, which generates the create statement e.g for binlogging,
did not account a lex option HA_LEX_CREATE_IF_NOT_EXISTS.
The fix makes the generated query to include the parent's statement option
if
that was supplied.
2006-09-28 18:51:27 +03:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
a8c9d45dfc
Result of a binlog_statement_insert_delayed was affected by recent fixing of
...
binlog_row_binlog.test failure in team tree.
Fixing the result that gets wrong with --binlog-format=mixed
(so that skipped on pushbuild currently)
2006-09-28 18:42:41 +03:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
9f75ff2c28
the results of binlog_statement_insert_delayed in STATEMENT - non-recommended mode i.e not checked
...
by make test - got changed due to show binlog events relocation to deterministic
position at extra/binlog_tests/binlog_insert_delayed.test.
2006-09-28 17:55:45 +03:00
cmiller@zippy.cornsilk.net
43bdd2c2ed
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 10:32:37 -04:00
cmiller@zippy.cornsilk.net
e72bc63906
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 10:15:32 -04:00
cmiller@zippy.cornsilk.net
b2ee81a6ec
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-28 10:09:57 -04:00
cmiller@zippy.cornsilk.net
56d2406375
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-09-28 10:02:53 -04:00
gluh@gluh.(none)
12b3672a69
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1
2006-09-28 18:03:00 +05:00
gkodinov@dl145s.mysql.com
41a2631cb3
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-09-28 14:53:31 +02:00
gkodinov@dl145s.mysql.com
7a84e12442
Merge bk-internal:/home/bk/mysql-5.1-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-09-28 14:52:09 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
326a56dc3f
Fix for bug #22271 : data casting may affect data stored in the next column(s?)
...
Using wrong filling value may cause unneeded extra bit rewriting.
Fix: use proper value to fill uneven bits.
2006-09-28 17:00:29 +05:00
msvensson@neptunus.(none)
5f099df3be
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-28 13:54:48 +02:00
evgen@moonbone.local
16f59a5e56
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into moonbone.local:/work/18360-bug-5.1-opt-mysql
2006-09-28 15:53:22 +04:00
anozdrin/alik@alik.
107d6ca01d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2006-09-28 15:41:49 +04:00
anozdrin/alik@alik.
ba96c5aed6
5.0-rt -> 5.1-rt after-merge fixes.
2006-09-28 15:40:23 +04:00
cmiller@zippy.cornsilk.net
6042eebda6
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 07:35:04 -04:00
cmiller@zippy.cornsilk.net
ca7ade8825
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-28 07:30:24 -04:00
anozdrin/alik@alik.
2c73dbfaac
Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2006-09-28 15:10:18 +04:00
mikael/pappa@dator5.(none)
fef3cb337c
Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
...
into dator5.(none):/home/pappa/bug18198
2006-09-28 06:16:16 -04:00
mikael/pappa@dator5.(none)
c7a3df765d
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug18198
2006-09-28 06:10:28 -04:00
msvensson@neptunus.(none)
648a9ae116
Increase time to wait for mysqld to get restarted(it will take some time when running in valgrind)
2006-09-28 11:53:42 +02:00
gluh@gluh.(none)
b7e59b7085
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.1
2006-09-28 14:09:31 +05:00
gkodinov@dl145s.mysql.com
3abb604333
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-09-28 10:41:42 +02:00
gkodinov@dl145s.mysql.com
b0167d265f
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-28 10:36:04 +02:00
gkodinov@dl145s.mysql.com
55cc4fd5c6
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-09-28 10:19:25 +02:00
msvensson@neptunus.(none)
8399b9e155
Merge neptunus.(none):/home/msvensson/mysql/work/my51-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-28 09:38:26 +02:00
msvensson@neptunus.(none)
d0bdc01ae3
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-09-28 09:33:09 +02:00
msvensson@neptunus.(none)
3eb44cb137
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-28 09:32:49 +02:00
msvensson@neptunus.(none)
712a937e30
Increase test suite timeout to 3 hours
2006-09-28 09:30:24 +02:00
kroki/tomash@moonlight.intranet
79d196be86
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081
2006-09-28 11:12:28 +04:00
andrey@example.com
00c54ad530
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into example.com:/work/mysql-5.1-runtime-fresh2
2006-09-28 09:11:22 +02:00
kroki/tomash@moonlight.intranet
7bfe643120
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21081
2006-09-28 11:04:49 +04:00
dlenev@mockturtle.local
7897f061aa
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mockturtle.local:/home/dlenev/src/mysql-4.1-runtime
2006-09-28 11:02:10 +04:00
msvensson@neptunus.(none)
4a00ae2d02
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-28 08:55:44 +02:00
petr/cps@owlet.local
64c2c0cb19
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/cps/mysql/trees/5.1-runtime-new
2006-09-28 04:44:55 +04:00
cmiller@zippy.cornsilk.net
33bf71e9d1
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-27 20:08:44 -04:00