tnurnberg@sin.intern.azundris.com
b8feb23321
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into sin.intern.azundris.com:/misc/mysql/31588/51-31588
2007-10-20 17:18:23 +02:00
gkodinov/kgeorge@magare.gmz
c95b24cba7
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B31157-5.1-opt
2007-10-19 17:01:13 +03:00
gkodinov/kgeorge@magare.gmz
fb640797b8
Bug #31157 : crash when select+order by the avg of some field within the group by
...
The uncacheable flag should be set at fix_fields() stage.
Fixed by moving the flag setting to match the one in 5.1
2007-10-19 15:43:19 +03:00
gkodinov/kgeorge@magare.gmz
7f8c4aacf6
Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B31221-5.1-opt
2007-10-18 15:57:59 +03:00
gkodinov/kgeorge@magare.gmz
abdc597b78
Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt
2007-10-18 15:53:45 +03:00
gkodinov/kgeorge@magare.gmz
d67cd9e8af
Bug #31221 : Optimizer incorrectly identifies impossible WHERE clause
...
No warning was generated when a TIMESTAMP with a non-zero time part
was converted to a DATE value. This caused index lookup to assume
that this is a valid conversion and was returning rows that match
a comparison between a TIMESTAMP value and a DATE keypart.
Fixed by generating a warning on such a truncation.
2007-10-18 15:19:04 +03:00
tnurnberg@sin.intern.azundris.com
194b4761dc
Bug#31588: buffer overrun when setting variables
...
post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output
2007-10-18 11:13:52 +02:00
tnurnberg@sin.intern.azundris.com
2a9d32f8eb
Merge sin.intern.azundris.com:/misc/mysql/31588/50-31588
...
into sin.intern.azundris.com:/misc/mysql/31588/51-31588
2007-10-18 10:55:42 +02:00
tnurnberg@sin.intern.azundris.com
4a48f2b3f4
Merge sin.intern.azundris.com:/misc/mysql/31588/41-31588
...
into sin.intern.azundris.com:/misc/mysql/31588/50-31588
2007-10-18 10:51:10 +02:00
tnurnberg@sin.intern.azundris.com
e6ef54b31f
Bug#31588: buffer overrun when setting variables
...
Buffer used when setting variables was not dimensioned to accomodate
trailing '\0'. An overflow by one character was therefore possible.
CS corrects limits to prevent such overflows.
2007-10-18 10:47:54 +02:00
gkodinov/kgeorge@magare.gmz
5f5b7cc311
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27099-5.1-opt
2007-10-17 13:39:41 +03:00
gluh@mysql.com/eagle.(none)
9992761343
Bug#31381 Error in retrieving Data from INFORMATION_SCHEMA
...
move 'table_collation' field filling outside of if(file) condition
because this field has 'OPEN_FRM_ONLY' attribute
2007-10-17 14:08:03 +05:00
gluh@eagle.(none)
9659588287
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-17 13:26:20 +05:00
gluh@mysql.com/eagle.(none)
7f67efccef
Bug#31568 Some "information_schema" entries suddenly report a NULL default
...
updated result files
2007-10-17 13:22:34 +05:00
gluh@eagle.(none)
97ce1f8cf1
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-16 14:10:07 +05:00
gluh@eagle.(none)
20baa313b5
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-16 13:19:01 +05:00
gkodinov/kgeorge@magare.gmz
ba03c12b24
Bug #27099 : system_mysql fail in pushbuild windows
...
On Windows the debug log was doing freopen () instead of
fflush() and that was slowing the logging down that much
that some tests timed out.
Fixed by replacing the freopen() with an syncing-to-disk
flag to fopen() and fflush().
Also increased the timeout of the tests running with --debug
on windows : seems to slow down as much as valgrind on linux.
2007-10-15 19:56:24 +03:00
gluh@mysql.com/eagle.(none)
55a7338f39
Bug#30986 Character set introducer followed by a HEX string can return bad result(addon)
...
issue an error if string has illegal characters
2007-10-15 18:40:58 +05:00
gshchepa/uchum@gleb.loc
88aa7b0a6e
Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31019
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-10-15 14:18:26 +05:00
gshchepa/uchum@gleb.loc
18ecc5bb5a
Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31019
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-10-15 13:34:58 +05:00
gkodinov/kgeorge@magare.gmz
deb62b6c77
Merge magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.1-opt
2007-10-14 11:30:28 +03:00
gkodinov/kgeorge@magare.gmz
f0d5ed8147
item_sum.cc:
...
Fixed dbug macros usage errors
2007-10-14 11:28:43 +03:00
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