kroki/tomash@moonlight.intranet
5ea8adfae7
BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID
...
Non-upper-level INSERTs (the ones in the body of stored procedure,
stored function, or trigger) into a table that have AUTO_INCREMENT
column didn't affected the result of LAST_INSERT_ID() on this level.
The problem was introduced with the fix of bug 6880, which in turn was
introduced with the fix of bug 3117, where current insert_id value was
remembered on the first call to LAST_INSERT_ID() (bug 3117) and was
returned from that function until it was reset before the next
_upper-level_ statement (bug 6880).
The fix for bug#21726 brings back the behaviour of version 4.0, and
implements the following: remember insert_id value at the beginning
of the statement or expression (which at that point equals to
the first insert_id value generated by the previous statement), and
return that remembered value from LAST_INSERT_ID() or @@LAST_INSERT_ID.
Thus, the value returned by LAST_INSERT_ID() is not affected by values
generated by current statement, nor by LAST_INSERT_ID(expr) calls in
this statement.
Version 5.1 does not have this bug (it was fixed by WL 3146).
2006-10-02 14:28:23 +04:00
svoj@april.(none)
115c4fe8dc
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2006-10-02 15:11:08 +05:00
svoj@mysql.com/april.(none)
361c46eefe
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-10-02 14:52:09 +05:00
svoj@mysql.com/april.(none)
7afbe5f86e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-10-02 14:42:12 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
e585a7d189
bug#6147 - fixing ndb test results (forgot to include into the main commit)
2006-10-02 14:17:41 +05:00
msvensson@neptunus.(none)
c5ddd64bb8
Merge neptunus.(none):/home/msvensson/mysql/work/my51-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-02 10:27:38 +02:00
msvensson@neptunus.(none)
c3820867ce
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-02 10:11:18 +02:00
msvensson@neptunus.(none)
6ebcb3d701
Don't run crash_commit_before under valgrind
2006-10-02 10:07:46 +02:00
baker@bk-internal.mysql.com
8a5fef1419
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-10-01 22:31:04 +02:00
holyfoot/hf@mysql.com/deer.(none)
1f8057a61f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/16813/my50-16813
2006-10-01 21:16:32 +05:00
holyfoot/hf@deer.(none)
6633173d51
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/hf/work/16813/my51-16813
2006-10-01 21:14:36 +05:00
holyfoot/hf@mysql.com/deer.(none)
8eec4bf164
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into mysql.com:/home/hf/work/21888/my41-21888
2006-10-01 19:04:08 +05:00
holyfoot/hf@mysql.com/deer.(none)
58d8211822
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/16813/my50-16813
2006-10-01 18:06:07 +05:00
holyfoot/hf@deer.(none)
00629ea17c
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/16813/my51-16813
2006-10-01 16:43:35 +05:00
holyfoot/hf@mysql.com/deer.(none)
e1f31863ab
bug #21790 (UNKNOWN ERROR message in geometry)
...
We issued UNKNOWN ERROR initially in this place and forgot to
fix it when we implemented informative error message for this
2006-10-01 16:36:26 +05:00
holyfoot/hf@mysql.com/deer.(none)
fbbaf00a55
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/21888/my50-21888
2006-10-01 15:28:50 +05:00
holyfoot/hf@deer.(none)
5edde5a859
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/21888/my51-21888
2006-10-01 15:21:06 +05:00
brian@zim.(none)
8096f1c4b2
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-09-30 19:12:50 -07:00
brian@zim.(none)
4117860ec6
Merge zim.(none):/home/brian/mysql/merge-5.1
...
into zim.(none):/home/brian/mysql/arch-5.1
2006-09-30 18:44:42 -07:00
brian@zim.(none)
56505c01f9
This patch updates to remove most global hton needs. Cleans up wrong message in partition.
2006-09-30 18:31:13 -07:00
mikael/pappa@dator5.(none)
81248942b7
BUG#18198: Partition function handling
...
Review fixes
2006-09-30 17:38:15 -04:00
dlenev@mockturtle.local
79bf51461e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-bg20670-2
2006-09-30 11:35:34 +04:00
tsmith/tim@siva.hindu.god
c36f165629
Post-merge fix. New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt, means that the error number in 5.1 is 1573, while in 5.0 it is 1471.
2006-09-30 01:21:27 -06:00
tsmith/tim@siva.hindu.god
44f0e55ca4
Merge siva.hindu.god:/usr/home/tim/m/bk/50
...
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
2006-09-29 18:04:34 -06:00
cmiller@zippy.cornsilk.net
cca474bb67
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-09-29 17:23:44 -04:00
dlenev@mockturtle.local
93fed182eb
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg20670
2006-09-30 00:31:33 +04:00
cmiller@zippy.cornsilk.net
5275e2437a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-29 16:24:21 -04:00
igor@rurik.mysql.com
3cf0903528
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-09-29 11:36:27 -07:00
kroki/tomash@moonlight.intranet
5c9420bb18
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-29 22:33:08 +04:00
kroki/tomash@moonlight.intranet
de7c5f1b98
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-29 22:30:48 +04:00
evgen@moonbone.local
299d243fcb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/20503-bug-5.0-mysql
2006-09-29 21:22:47 +04:00
dlenev@mockturtle.local
8b63a55b3a
After merge fixes.
2006-09-29 21:05:12 +04:00
sergefp@mysql.com
cd094b71af
BUG#14940: Update test results
2006-09-29 20:42:37 +04:00
evgen@moonbone.local
0c9f941bb2
Fixed bug#20825: rollup puts non-equal values together
...
Fix for bug 7894 replaces a field(s) in a non-aggregate function with a item
reference if such a field was specified in the GROUP BY clause in order to
get a correct result.
When ROLLUP is involved this lead to a wrong result due to value of a such
field is got through a copy function and copying happens after the function
evaluation.
Such replacement isn't needed if grouping is also done by such a function.
The change_group_ref() function now isn't called for a function present in
the group list.
2006-09-29 20:02:53 +04:00
istruewing@chilla.local
fe7de5b96c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug20627
2006-09-29 17:59:56 +02:00
dlenev@mockturtle.local
5c2a51292d
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
2006-09-29 19:39:15 +04:00
igor@rurik.mysql.com
964f4d7ba3
Merge rurik.mysql.com:/home/igor/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug22753
2006-09-29 08:29:59 -07:00
cmiller@zippy.cornsilk.net
fa438d86cc
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-29 11:20:47 -04:00
cmiller@zippy.cornsilk.net
097d60a883
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-29 11:18:26 -04:00
cmiller@zippy.cornsilk.net
2a7d7dd939
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778
2006-09-29 11:14:28 -04:00
igor@rurik.mysql.com
89028dbba4
Fixed bug #22753 .
...
After the patch for big 21698 equality propagation stopped
working for BETWEEN and IN predicates with STRING arguments.
This changeset completes the solution of the above patch.
2006-09-29 07:43:25 -07:00
sergefp@pylon.mylan
16506e906b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/psergey/mysql-5.1-bug14940-r10a
2006-09-29 18:35:03 +04:00
dlenev@mockturtle.local
ae117f23a8
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20670-2
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg20670
2006-09-29 18:26:30 +04:00
svoj@mysql.com/april.(none)
0297046a10
Fix a test case according to fix for bug#10974.
2006-09-29 19:00:52 +05:00
istruewing@chilla.local
ec86974a51
Merge chilla.local:/home/mydev/mysql-5.1--team
...
into chilla.local:/home/mydev/mysql-5.1-bug20627
2006-09-29 15:58:15 +02:00
cmiller@zippy.cornsilk.net
53c14121d8
Update from Stefan. 2006-09-29 msg id <451BEF1.4030506@mysql.com>
2006-09-29 09:12:23 -04:00
gkodinov@dl145s.mysql.com
8da0a672af
merge fixes
2006-09-29 15:10:20 +02:00
holyfoot/hf@deer.(none)
7392296414
Merge mysql.com:/home/hf/work/21888/my50-21888
...
into mysql.com:/home/hf/work/21888/my51-21888
2006-09-29 17:58:36 +05:00
holyfoot/hf@mysql.com/deer.(none)
348e3570ce
Merge mysql.com:/home/hf/work/21888/my41-21888
...
into mysql.com:/home/hf/work/21888/my50-21888
2006-09-29 17:57:16 +05:00
holyfoot/hf@mysql.com/deer.(none)
8190b7231b
bug #21888 (Query on GEOMETRY field crashes the server)
...
RTree keys are really different from BTree and need specific
paramters to be set by optimizer to work.
Sometimes optimizer doesn't set those properly.
Here we decided just to add code to check that the parameters
are correct. Hope to fix optimizer sometimes.
2006-09-29 17:56:02 +05:00