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
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
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
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
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
brian@zim.(none)
f9a02811da
Removed Field (this came in as an idea from a previous patch by Serg)
2006-09-26 21:26:04 -07:00
evgen@moonbone.local
9fc769ff72
Fixed bug #18360 : Type aggregation for IN and CASE may lead to a wrong
...
result
The IN function aggregates result types of all expressions. It uses that
type in comparison of left expression and expressions in right part.
This approach works in most cases. But let's consider the case when the
right part contains both strings and integers. In that case this approach may
cause wrong results because all strings which do not start with a digit are
evaluated as 0.
CASE uses the same approach when a CASE expression is given thus it's also
affected.
The idea behind this fix is to make IN function to compare expressions with
different result types differently. For example a string in the left
part will be compared as string with strings specified in right part and
will be converted to real for comparison to int or real items in the right
part.
A new function called collect_cmp_types() is added. It collects different
result types for comparison of first item in the provided list with each
other item in the list.
The Item_func_in class now can refer up to 5 cmp_item objects: 1 for each
result type for comparison purposes. cmp_item objects are allocated according
to found result types. The comparison of the left expression with any
right part expression is now based only on result types of these expressions.
The Item_func_case class is modified in the similar way when a CASE
expression is specified. Now it can allocate up to 5 cmp_item objects
to compare CASE expression with WHEN expressions of different types.
The comparison of the CASE expression with any WHEN expression now based only
on result types of these expressions.
2006-09-26 20:52:54 +04:00
andrey@example.com
f7a779acfb
Fix for bug#22662 Inconsistent values displayed for event_scheduler
...
when set to DISABLED
It was a silly ordering number error.
2006-09-25 17:22:23 +02:00
andrey@example.com
db3a25fd78
Fix for bug#22397 Events: crash with procedure which alters events
...
ALTER EVENT in stored procedure body led to a crash during the
procedure call. Affected was only ALTER EVENT which changed the
interval of the event. No problems with AT, STARTS, ENDS and so on.
2006-09-25 16:49:25 +02:00
igor@rurik.mysql.com
df1376a542
Merge rurik.mysql.com:/home/igor/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21646
2006-09-25 07:40:54 -07:00
andrey@example.com
d993720268
cleanups - fix a test and remove unneeded declaration
2006-09-25 15:50:49 +02:00
igor@rurik.mysql.com
c0569012d0
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-09-25 06:46:15 -07:00
igor@rurik.mysql.com
a661bdda19
Fixed bug #21646 .
...
Presence of a subquery in the ON expression of a join
should not block merging the view that contains this join.
Before this patch the such views were converted into
into temporary table views.
2006-09-25 06:15:14 -07:00