gshchepa/uchum@gleb.loc
30f8c35bca
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-10-26 18:05:46 +05:00
gshchepa/uchum@gleb.loc
9bcd2fb0a6
Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31663
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-10-26 17:55:16 +05:00
gshchepa/uchum@gleb.loc
e36846deca
Fixed bug #27695 : View should not be allowed to have empty or
...
all space column names.
The parser has been modified to check VIEW column names
with the check_column_name function and to report an error
on empty and all space column names (same as for TABLE
column names).
2007-10-25 10:32:52 +05:00
gluh@mysql.com/eagle.(none)
97e0180b2b
result fix
2007-10-24 12:49:58 +05:00
sergefp@mysql.com
7ca65155ad
Post-merge fixes
2007-10-23 21:32:30 +04:00
sergefp@foxhole.(none)
849d0f9da4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug31450
2007-10-23 20:03:06 +04:00
sergefp@mysql.com
28e5063d93
BUG#31450: Query causes error 1048
...
- Let Item::save_in_field() call set_field_to_null_with_conversions()
for decimal type, like this is done for the other item result types.
2007-10-23 19:24:59 +04:00
gluh@mysql.com/eagle.(none)
b2aeda7699
result fix
2007-10-23 20:12:50 +05:00
gluh@eagle.(none)
d639739022
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 20:11:39 +05:00
gluh@mysql.com/eagle.(none)
1d42094d18
after merge fix
2007-10-23 19:28:47 +05:00
gluh@eagle.(none)
17acda6ca8
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 19:08:21 +05:00
gluh@eagle.(none)
237383f0fe
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-23 18:51:43 +05:00
kaa@polly.(none)
173108956a
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-10-23 16:24:56 +04:00
kaa@polly.(none)
6832d2cc1b
Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-10-23 16:07:03 +04:00
kaa@polly.(none)
23c65a3b01
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-10-23 16:03:48 +04:00
kaa@polly.(none)
17a533e0d0
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550
...
into polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
2007-10-23 15:52:27 +04:00
gkodinov/kgeorge@magare.gmz
58bce232a8
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
2007-10-23 14:28:50 +03:00
gkodinov/kgeorge@magare.gmz
7ac179bc34
merge 5.0-opt -> 5.1-opt for bug 30825
2007-10-23 14:26:57 +03:00
gkodinov/kgeorge@magare.gmz
7c344185bd
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
2007-10-23 14:21:50 +03:00
gshchepa/uchum@gleb.loc
5adc332c63
Fixed bug #31663 : if the FIELDS TERMINATED BY string
...
in the SELECT INTO OUTFILE clause starts with a special
character (one of n, t, r, b, 0, Z or N) and ENCLOSED BY
is empty, every occurrence of this character within a
field value is duplicated.
Duplication has been avoided.
New warning message has been added: "First character of
the FIELDS TERMINATED string is ambiguous; please use
non-optional and non-empty FIELDS ENCLOSED BY".
2007-10-23 16:16:59 +05:00
gkodinov/kgeorge@magare.gmz
62737d6d42
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
2007-10-23 13:10:35 +03:00
gkodinov/kgeorge@magare.gmz
3553f6eac2
Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt
2007-10-23 11:44:14 +03:00
gkodinov/kgeorge@magare.gmz
d066e2173c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
2007-10-23 11:26:37 +03:00
gkodinov/kgeorge@magare.gmz
0a14d1a19b
Merge magare.gmz:/home/kgeorge/mysql/work/B28687-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B28687-5.1-opt
2007-10-23 11:22:59 +03:00
gluh@mysql.com/eagle.(none)
ffea2073b1
Bug#31633 Information schema = NULL queries crash the server
...
added correct handling of NULL values for lookup fields
2007-10-23 13:20:51 +05:00
gkodinov/kgeorge@magare.gmz
52b35112cf
Bug #28687 : Search fails on '0000-00-00' date after sql_mode change
...
When doing indexed search the server constructs a key image for
faster comparison to the stored keys. While doing that it must not
perform (and stop if they fail) the additional date checks that can
be turned on by the SQL mode because there already may be values in
the table that don't comply with the error checks.
Fixed by ignoring these SQL mode bits while making the key image.
2007-10-22 19:32:18 +03:00
kaa@polly.(none)
53a9e7f478
Fix for bug #31742 : delete from ... order by function call that causes
...
an error, asserts server
In case of a fatal error during filesort in find_all_keys() the error
was returned without the necessary handler uninitialization.
Fixed by changing the code so that handler uninitialization is performed
before returning the error.
2007-10-22 16:10:08 +04:00
tnurnberg@white.intern.koehntopp.de
478079b2e8
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/scratch/tnurnberg/31588/50-31588
2007-10-22 01:57:49 +02:00
tnurnberg@white.intern.koehntopp.de
44fbb702b9
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/scratch/tnurnberg/31588/51-31588
2007-10-21 22:49:16 +02:00
kaa@polly.(none)
d998b471c9
Merge polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-10-21 21:57:57 +04:00
kaa@polly.(none)
f9ba86ee86
Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-10-21 21:55:26 +04:00
kaa@polly.(none)
d55d309380
Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550
...
into polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550
2007-10-21 21:49:30 +04:00
kaa@polly.(none)
349841118f
Bug #28550 "Potential bugs related to the return type of the CHAR function".
...
Since, as of MySQL 5.0.15, CHAR() arguments larger than 255 are converted into multiple result bytes, a single CHAR() argument can now take up to 4 bytes. This patch fixes Item_func_char::fix_length_and_dec() to take this into account.
This patch also fixes a regression introduced by the patch for bug21513. As now we do not always have the 'name' member of Item set for Item_hex_string and Item_bin_string, an own print() method has been added to Item_hex_string so that it could correctly be printed by Item_func::print_args().
2007-10-21 21:45:31 +04:00
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
antony@pcg5ppc.xiphis.org
3b95727600
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines
...
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
2007-10-19 13:06:37 -07:00
antony@pcg5ppc.xiphis.org
fb27ce61bc
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines
...
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge
2007-10-19 13:04:30 -07: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
malff@lambda.hsd1.co.comcast.net.
94b4f4a870
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-18 19:21:07 -06:00
malff@lambda.hsd1.co.comcast.net.
2d6fbbda59
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-18 16:57:51 -06:00
malff@lambda.hsd1.co.comcast.net.
6fa35a5d3b
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-10-18 16:39:55 -06:00
antony@pcg5ppc.xiphis.org
407f73c821
Merge pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1
...
into pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1-merge-5.1-engines
2007-10-18 15:02:20 -07:00
antony@pcg5ppc.xiphis.org
f4a153c3c4
Bug#31473
...
"CSV does not work with NULL value in datetime fields"
Attempting to insert a row with a NULL value for a DATETIME field
results in a CSV file which the storage engine cannot read.
Don't blindly assume that "0" is acceptable for all field types,
Since CSV does not support NULL, we find out from the field the
default non-null value.
Do not permit the creation of a table with a nullable columns.
2007-10-18 14:48:04 -07:00
davi@moksha.com.br
5a2e5cf205
Merge moksha.com.br:/Users/davi/mysql/bugs/21557-5.1
...
into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
2007-10-18 17:31:36 -03:00
davi@moksha.com.br
a2aafb6034
Post merge fix for Bug 21557
2007-10-18 17:24:57 -03:00
davi@moksha.com.br
3b44d6e8b9
Merge moksha.com.br:/Users/davi/mysql/bugs/21557-5.1
...
into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
2007-10-18 15:47:22 -03:00
davi@moksha.com.br
dd135211d8
Bug#21557 entries in the general query log truncated at 1000 characters.
...
The general log write function (general_log_print) uses printf style
arguments which need to be pre-processed, meaning that the all arguments
are copied to a single buffer and the problem is that the buffer size is
constant (1022 characters) but queries can be much larger then this.
The solution is to introduce a new log write function that accepts a
buffer and it's length as arguments. The function is to be used when
a formatted output is not required, which is the case for almost all
query write-to-log calls.
This is a incompatible change with respect to the log format of prepared
statements.
2007-10-18 15:45:07 -03:00
tnurnberg@white.intern.koehntopp.de
30dd4d9fca
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/scratch/tnurnberg/31588/50-31588
2007-10-18 16:09:03 +02: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