mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50110 commits 2793 branches 343 tags 1.7 GiB
Commit graph

50110 commits

This branch
This branch
All branches
Author SHA1 Message Date
gkodinov/kgeorge@magare.gmz
3c0ca8259f Merge magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31156-5.1-opt
 2007-10-13 09:22:37 +03:00
gkodinov/kgeorge@magare.gmz
a4da332ea5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt
 2007-10-13 09:20:23 +03:00
gkodinov/kgeorge@magare.gmz
ce1ce20e73 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.1-opt
 2007-10-13 09:13:00 +03:00
gkodinov/kgeorge@magare.gmz
737dd70435 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt
 2007-10-13 09:12:15 +03:00
gshchepa/uchum@gleb.loc
1e3fd4942e Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-10-12 22:55:33 +05:00
gshchepa/uchum@gleb.loc
f9c7587d8e Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-10-12 20:54:54 +05:00
gkodinov/kgeorge@magare.gmz
df422f7c3f Merge magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31440-5.1-opt
 2007-10-12 14:14:27 +03:00
gkodinov/kgeorge@magare.gmz
d330469f10 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt
 2007-10-12 14:11:27 +03:00
holyfoot/hf@hfmain.(none)
bf9be15bd2 Merge mysql.com:/home/hf/work/31155/my50-31155 
into  mysql.com:/home/hf/work/31155/my51-31155
 2007-10-12 15:37:42 +05:00
holyfoot/hf@hfmain.(none)
46cbb26b04 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/31155/my51-31155
 2007-10-12 15:36:51 +05:00
holyfoot/hf@hfmain.(none)
a453b2f715 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/31155/my50-31155
 2007-10-12 15:35:16 +05:00
holyfoot/hf@hfmain.(none)
44325614ec Merge mysql.com:/home/hf/work/31155/my50-31155 
into  mysql.com:/home/hf/work/31155/my51-31155
 2007-10-12 15:33:26 +05:00
gshchepa/uchum@gleb.loc
ace00f9fd0 Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31471 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-10-11 23:09:08 +05:00
gshchepa/uchum@gleb.loc
a1e8f81e91 Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31471 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-10-11 22:42:11 +05:00
gluh@mysql.com/eagle.(none)
da023efb5d after merge fix 2007-10-11 16:41:05 +05:00
gluh@eagle.(none)
16a0ecdb2b Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-11 16:13:14 +05:00
gluh@mysql.com/eagle.(none)
db39976a06 Bug#30981 CHAR(0x41 USING ucs2) doesn't add leading zero 
Bug#30982 CHAR(..USING..) can return a not-well-formed string
Bug#30986 Character set introducer followed by a HEX string can return bad result
check_well_formed_result moved to Item from Item_str_func
fixed Item_func_char::val_str for proper ucs symbols converting
added check for well formed strings for correct conversion of constants with underscore
charset
 2007-10-11 16:07:10 +05:00
gkodinov/kgeorge@magare.gmz
99f1606e94 Bug #31440: 'select 1 regex null' asserts debug server 
The special case with NULL as a regular expression
was handled at prepare time. But in this special case
the item was not marked as fixed. This caused an assertion
at execution time.
Fixed my marking the item as fixed even when known to 
return NULL at prepare time.
 2007-10-11 11:29:26 +03:00
gshchepa/uchum@gleb.loc
356007a8a4 Fixed bug #31471: decimal_bin_size: Assertion `scale >= 0 && 
precision > 0 && scale <= precision'.

A sign of a resulting item of the IFNULL function was not
updated and the maximal length of this result was calculated
improperly. Correct algorithm was copy&pasted from the IF
function implementation.
 2007-10-10 20:14:29 +05:00
gluh@eagle.(none)
e71717ab63 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-10 14:34:40 +05:00
gluh@eagle.(none)
27762854ef Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-10 14:33:46 +05:00
gluh@eagle.(none)
20ec6605d3 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-10-10 14:31:19 +05:00
gluh@mysql.com/eagle.(none)
f71e5825e5 after merge fix 2007-10-10 14:22:21 +05:00
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 #31310. 
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
gkodinov/kgeorge@magare.gmz
67302b12f6 Bug #31156: mysqld: item_sum.cc:918: virtual bool 
Item_sum_distinct::setup(THD*): Assertion

There was an assertion to detect a bug in ROLLUP
implementation. However the assertion is not true
when used in a subquery context with non-cacheable
statements.
Fixed by turning the assertion to accepted case
(just like it's done for the other aggregate functions).
 2007-10-08 12:57:43 +03: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 #31094: 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