mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38320 commits 2779 branches 343 tags 1.6 GiB
Commit graph

17981 commits

Author SHA1 Message Date
kroki/tomash@moonlight.intranet
b9173c1023 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
 2006-10-02 23:17:40 +04:00
kroki/tomash@moonlight.intranet
8aa33bf46d Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
 2006-10-02 15:01:19 +04:00
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
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
brian@zim.(none)
8685747f06 This patch makes ndbcluster_hton not static. I have a second patch for ndbcluster_hton to be static, but I want to talk to Jonas first. 2006-10-01 11:17:59 -07: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)
fc0fa8da3f Merge fix. 2006-09-30 19:08:13 -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
brian@zim.(none)
46ae2113ba This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch). 
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
 2006-09-30 12:49:46 -07:00
gkodinov@dl145s.mysql.com
869d1a6a1d Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-30 09:35:11 +02:00
brian@zim.(none)
a756fd36ef This removes the passing of global hton to engine instance. 2006-09-29 17:19:02 -07:00
baker@bk-internal.mysql.com
802292ae37 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-09-29 18:23:11 +02: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
sergefp@mysql.com
e37d6ca7cd Remove empty line 2006-09-29 18:26:57 +04: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
gkodinov@dl145s.mysql.com
8da0a672af merge fixes 2006-09-29 15:10:20 +02:00
sergefp@mysql.com
47b357522a BUG#14940: Slow join order is chosen: [2nd commit with post-review fixes] 
- Re-worked the prev_record_reads() function to return the lower bound of
  number of different table access scans that will be performed.
 2006-09-29 15:58:47 +04:00
istruewing@chilla.local
8148bf497a Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID 
Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
Merge from 5.0.
Changed auto_increment handling to the 5.1 pattern.
 2006-09-29 13:23:33 +02:00
gkodinov@dl145s.mysql.com
0012fb3ed6 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-29 11:30:35 +02:00
gkodinov@dl145s.mysql.com
0293b69ac7 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-29 11:21:40 +02:00
evgen@moonbone.local
ee67c4c453 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/5505-bug-5.0-opt-mysql
 2006-09-29 01:01:52 +04:00
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
brian@zim.(none)
bb09a2a940 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-28 11:25:02 -07:00
brian@zim.(none)
542cf080a4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-28 10:51:56 -07: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
gluh@mysql.com/gluh.(none)
353c5bd154 after merge fix 2006-09-28 18:00:44 +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
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
gbichot@dl145h.mysql.com
7493331fa4 Merge gbichot@bk-internal:/home/bk/mysql-5.1-arch 
into  dl145h.mysql.com:/users/gbichot/mysql-5.1-arch
 2006-09-28 13:22:56 +02:00
gbichot@dl145h.mysql.com
041dedfcfb In the handlerton, cursor creation function don't have an argument 
and so the engine calls current_thd to derive transaction information;
instead we now pass THD to those functions, it looks more logical
(it makes the implicit current_thd parameter more visible).
Approved by Brian and Monty.
 2006-09-28 13:19:43 +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
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
gluh@mysql.com/gluh.(none)
4aaf7e34ff additional 'after merge' fix 2006-09-27 20:11:11 +05:00
gkodinov/kgeorge@macbook.gmz
4dcac0ff19 merge fixes 5.0-opt -> 5.1-opt 2006-09-27 17:49:51 +03:00
gluh@mysql.com/gluh.(none)
c3d63bef2b after merge fix 2006-09-27 19:21:29 +05:00
svoj@april.(none)
9353e3cf73 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-27 18:58:23 +05:00
petr/cps@mysql.com/owlet.local
6cb96bb8b4 Remove unused error messages (no release contains them 
at the moment, so we can safely do that). Update an error
mesage to make it translateable.
 2006-09-27 17:48:00 +04:00
svoj@mysql.com/april.(none)
b724a03e08 After merge fix. 2006-09-27 18:33:31 +05:00
gluh@mysql.com/gluh.(none)
437c94317b Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-09-27 18:06:46 +05:00
gluh@mysql.com/gluh.(none)
a039376c43 Patch for bug#21432 is reverted 2006-09-27 17:49:16 +05:00
gkodinov/kgeorge@macbook.gmz
24c5bf6a96 Bug#21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX 
- fix moved to 5.1
 2006-09-27 13:11:00 +03:00
gkodinov/kgeorge@macbook.gmz
a01e7b12ce Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.1-opt
 2006-09-27 13:03:41 +03:00
gkodinov/kgeorge@macbook.gmz
903387afc0 Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX 
- reversed the patch for 5.0 and moved to 5.1
 2006-09-27 12:53:53 +03:00
kroki/tomash@moonlight.intranet
a53e628181 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21414
 2006-09-27 12:22:16 +04:00
brian@zim.(none)
4bce203fdf Merge zim.(none):/home/brian/mysql/merge-5.1 
into  zim.(none):/home/brian/mysql/arch-5.1
 2006-09-26 22:51:53 -07:00