Commit graph

49979 commits

Author SHA1 Message Date
gluh@eagle.(none)
3023ee9401 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-10 12:37:06 +05:00
gluh@mysql.com/eagle.(none)
a5e7b726c1 Bug#28893 --relay-log variable is not exposed with SHOW VARIABLES
added variables relay_log, relay_log_index, relay_log_info_file to init_vars[]
to make them visible within SHOW VARIABLES
2007-10-10 12:21:11 +05:00
gluh@mysql.com/eagle.(none)
91a7fbc8bb Bug#25359 Test 'view' is dependent on current year to be 2006
removed now() call to make the test to be year independent
2007-10-10 12:16:13 +05:00
mhansson@dl145s.mysql.com
1566f370a8 Merge bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug31160/my51-bug31160
2007-10-09 15:35:03 +02:00
mhansson@dl145s.mysql.com
98220d761e Merge martin@mhansson.mysql.internal:/home/martin/mysql/src/bug31160/my51-bug31160
into  dl145s.mysql.com:/data0/mhansson/bug31160/my51-bug31160
2007-10-09 15:27:38 +02:00
mhansson@dl145s.mysql.com
8e2a56ea9d Merge bk-internal:/home/bk/mysql-5.0-opt
into  dl145s.mysql.com:/data0/mhansson/bug31160/my50-bug31160
2007-10-09 15:25:27 +02:00
mhansson@dl145s.mysql.com
c7ff50622c Merge martin@mhansson.mysql.internal:/home/martin/mysql/src/bug31160/my50-bug31160
into  dl145s.mysql.com:/data0/mhansson/bug31160/my50-bug31160
2007-10-09 15:23:16 +02:00
mhansson/martin@linux-st28.site
6d6c475fe8 Merge linux-st28.site:/home/martin/mysql/src/bug31160/my50-bug31160
into  linux-st28.site:/home/martin/mysql/src/bug31160/my51-bug31160
2007-10-09 15:00:06 +02:00
mhansson/martin@linux-st28.site
148ce22add Bug#31160: MAKETIME() crashes server when returning NULL in ORDER BY using filesort
Even though it returns NULL, the MAKETIME function did not have this property set,
causing a failed assertion (designed to catch exactly this).
Fixed by setting the nullability property of MAKETIME().
2007-10-09 14:58:09 +02:00
mhansson/martin@linux-st28.site
a06a6579e8 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  linux-st28.site:/home/martin/mysql/src/bug30832-again-push/my51-bug30832-again
2007-10-09 12:06:44 +02:00
mhansson/martin@linux-st28.site
ddc67f087a Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into  linux-st28.site:/home/martin/mysql/src/bug30832-again-push/my50-bug30832-again
2007-10-09 12:04:50 +02:00
mhansson/martin@linux-st28.site
600d2ba0b1 Merge linux-st28.site:/home/martin/mysql/src/bug30832-again/my50-bug30832-again
into  linux-st28.site:/home/martin/mysql/src/bug30832-again/my51-bug30832-again
2007-10-09 11:37:46 +02:00
mhansson/martin@linux-st28.site
d29146f9f4 Bug#30832:Assertion + crash with select name_const('test',now());
Completion of previous patch. Negative number were denied
as the second argument to NAME_CONST.
2007-10-09 11:36:05 +02:00
mhansson@dl145s.mysql.com
731cba7b23 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
2007-10-09 08:58:53 +02:00
gshchepa/uchum@gleb.loc
09f6306ac3 Fixed bug .
Locked rows of the InnoDB storage was silently skipped in the read-committed
isolation level.

QUICK_RANGE_SELECT for unique ranges lacks second (blocking) read
of the record that was read semi-consistently and just skip it.

The handler::read_multi_range_next method has been modified
to retry previous unique range if the previous read was
semi-consistent.
2007-10-09 01:07:15 +05:00
mhansson@dl145s.mysql.com
193bb6ebf5 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
2007-10-08 10:45:36 +02:00
gkodinov/kgeorge@magare.gmz
5df890e524 Merge bk-internal:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31094-5.1-opt
2007-10-06 16:08:39 +03:00
gkodinov/kgeorge@magare.gmz
91455690b5 Bug : Forcing index-based sort doesn't work anymore if joins are done
A rule was introduced by the 5.1 part of the fix for bug 27531 to 
prefer filesort over indexed ORDER BY when accessing all of the rows of a 
table (because it's faster). This new rule was not accounting for the 
presence of a LIMIT clause.
Fixed the condition for this rule so it will prefer filesort over 
indexed ORDER BY only if no LIMIT.
2007-10-05 17:28:34 +03:00
holyfoot/hf@hfmain.(none)
f32f9ab9f5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 18:56:37 +05:00
holyfoot/hf@hfmain.(none)
9c2de8b28f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/hf/work/30286/my50-30286
2007-10-05 18:53:44 +05:00
mhansson@dl145s.mysql.com
122ea13767 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
2007-10-05 15:20:56 +02:00
mhansson@dl145s.mysql.com
b4b84f6134 Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my50-bug30942
2007-10-05 13:42:19 +02:00
holyfoot/hf@hfmain.(none)
9f8842c265 Merge mysql.com:/home/hf/work/30286/my50-30286
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 16:33:37 +05:00
holyfoot/hf@hfmain.(none)
1ab2fd9bb8 Merge mysql.com:/home/hf/work/30286/my41-30286
into  mysql.com:/home/hf/work/30286/my50-30286
2007-10-05 16:33:08 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
39f6cbc221 Merge mysql.com:/home/hf/work/30955/my41-30955
into  mysql.com:/home/hf/work/30286/my41-30286
2007-10-05 16:32:05 +05:00
holyfoot/hf@hfmain.(none)
b768b1a50b Merge mysql.com:/home/hf/work/30286/my50-30286
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 15:51:27 +05:00
holyfoot/hf@hfmain.(none)
b93759b011 Merge mysql.com:/home/hf/work/30286/my41-30286
into  mysql.com:/home/hf/work/30286/my50-30286
2007-10-05 15:50:02 +05:00
holyfoot/hf@hfmain.(none)
345fb4e9f0 Merge mysql.com:/home/hf/work/30286/my41-30286
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 15:49:23 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
b95dd64d50 Merge bk@192.168.21.1:mysql-4.1-opt
into  mysql.com:/home/hf/work/30286/my41-30286
2007-10-05 15:48:42 +05:00
holyfoot/hf@hfmain.(none)
36ecbf5ff8 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/30286/my50-30286
2007-10-05 15:47:55 +05:00
holyfoot/hf@hfmain.(none)
24e84f15b6 Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 15:46:42 +05:00
holyfoot/hf@hfmain.(none)
e3b4267c12 Merge mysql.com:/home/hf/work/30286/my50-30286
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 15:43:15 +05:00
holyfoot/hf@hfmain.(none)
0b79b24f03 Merge mysql.com:/home/hf/work/30286/my41-30286
into  mysql.com:/home/hf/work/30286/my50-30286
2007-10-05 15:41:56 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
54b0cf97b3 Bug spatial index cause corruption and server crash!
As the result of DOUBLE claculations can be bigger
than DBL_MAX constant we use in code, we shouldn't use this constatn
as a biggest possible value.
Particularly the rtree_pick_key function set 'min_area= DBL_MAX' relying
that any rtree_area_increase result will be less so we return valid
key. Though in rtree_area_increase function we calculate the area
of the rectangle, so the result can be 'inf' if the rectangle is
huge enough, which is bigger than DBL_MAX.

Code of the rtree_pick_key modified so we always return a valid key.
2007-10-05 15:40:32 +05:00
holyfoot/hf@hfmain.(none)
e19efc0a6e Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/26527/my51-26527
2007-10-05 14:21:59 +05:00
gluh@eagle.(none)
0b2f20bb9c Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-05 12:32:29 +05:00
gluh@mysql.com/eagle.(none)
ac8559359c test fix(to satisfy WIN) 2007-10-05 12:29:02 +05:00
mhansson@dl145s.mysql.com
02dacd20e8 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
2007-10-04 15:32:46 +02:00
gluh@eagle.(none)
16c07b16fe Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-04 17:13:57 +05:00
gluh@mysql.com/eagle.(none)
ce2430bcb6 after merge fix 2007-10-04 17:08:59 +05:00
mhansson@dl145s.mysql.com
eb8d5c36c9 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
2007-10-04 13:58:34 +02:00
gluh@eagle.(none)
4741df1878 manual merge 2007-10-04 16:35:12 +05:00
gluh@mysql.com/eagle.(none)
d6e626a61d Bug#30079 A check for "hidden" I_S tables is flawed
added check for hidden I_S tables for 'show columns|keys' commands
2007-10-04 16:20:56 +05:00
gluh@mysql.com/eagle.(none)
e2614270c3 after merge fix 2007-10-04 15:35:45 +05:00
gluh@eagle.(none)
53fa81ac03 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-04 14:23:55 +05:00
mhansson@dl145s.mysql.com
c10447053c Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my50-bug30942
2007-10-04 11:06:01 +02:00
mhansson/martin@linux-st28.site
ec959efa71 Merge linux-st28.site:/home/martin/mysql/src/bug30942/my50-bug30942
into  linux-st28.site:/home/martin/mysql/src/bug30942/my51-bug30942
2007-10-04 10:06:33 +02:00
mhansson/martin@linux-st28.site
028992ac69 Bug : select str_to_date from derived table returns varying results
The function str_to_date has a field to say whether it's invoked constant 
arguments. But this member was not initialized, causing the function to
think that it could use a cache of the format type when said cache was in 
fact not initialized.
Fixed by initializing the field to false.
2007-10-04 09:15:26 +02:00
gshchepa/uchum@gleb.loc
009d8b609e mysqldump.c:
Post-merge fix.
2007-10-03 15:49:51 +05:00
gshchepa/uchum@gleb.loc
5184ff828c Merge gleb.loc:/home/uchum/work/bk/5.0-opt-31077
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-10-03 15:05:11 +05:00