sergefp@mysql.com
00a560c727
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bugs
2005-03-03 05:04:00 +03:00
jimw@mysql.com
5d2bedc391
Fix bug in checking of table-specific grats that caused IP/NETMASK
...
hostnames to not be matched correctly. (Bug #3309 )
2005-03-02 16:30:24 -08:00
ramil@mysql.com
89d44e039e
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1
2005-03-02 20:04:38 +04:00
ramil@mysql.com
89a105abc5
a fix for --ps-protocol (bug #6089 : FOUND_ROWS returns wrong values when no table/view is used)
2005-03-02 20:00:48 +04:00
guilhem@mysql.com
c6f1a2e453
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-03-02 11:38:38 +01:00
guilhem@mysql.com
11a1c83c03
Fix for BUG#8325 "Deadlock in replication thread stops replication":
...
in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).
2005-03-02 11:29:48 +01:00
ingo@mysql.com
d3d7c46b1c
Bug#8306 - TRUNCATE leads to index corruption
...
Added a check, if the table, which we are going to create, is open.
This can happen if a MERGE mapped table is TRUNCATEd.
2005-03-02 10:35:00 +01:00
jimw@mysql.com
ac69a4a22c
Make sure that the filename for temporary tables is built with fn_format()
...
so that extra slashes are handled in tmpdir. (Bug #8497 )
2005-03-01 19:05:48 -08:00
ramil@mysql.com
c862c11aab
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b6089
2005-03-01 14:19:32 +04:00
ramil@mysql.com
8f90906961
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b6089
2005-03-01 12:31:05 +04:00
ramil@mysql.com
4225b8e8ff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b5615
2005-03-01 12:20:55 +04:00
sergefp@mysql.com
d2fec05179
Fix for BUG#8562: In Item_int_with_ref::new_item() create Item_int or Item_uint
...
depending on ref->unsigned_flag. Item_int_with_ref can refer to both signed and
unsigned integers.
2005-02-28 23:50:06 +03:00
sergefp@mysql.com
a6ad8a4d0f
Fix for BUG#8726: In JOIN::optimize on ER_TOO_BIG_SELECT error set JOIN::error to -1 to cause
...
the error to be sent to the client.
2005-02-28 20:21:21 +03:00
ramil@mysql.com
c896fcb483
merging
2005-02-28 19:59:38 +04:00
ramil@mysql.com
883ff0cc81
merging
2005-02-28 18:11:18 +04:00
sergefp@mysql.com
a06c6d41bb
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/psergey/mysql-4.0-look
2005-02-28 15:40:45 +03:00
sergefp@mysql.com
b44f24000b
Merge
2005-02-28 14:52:35 +03:00
monty@mysql.com
253bfcf783
Fixed wrong memory references found by purify
...
(No really critical errors found, but a few possible wrong results)
2005-02-28 11:59:46 +02:00
sergefp@mysql.com
eb5d5de05f
Fix for BUG#8560: Set max_sort_char for any 8-bit charset with binary collation. max_sort_char is needed by
...
my_like_range_simple to produce upper bound constants for LIKE "str_%" and similar expressions.
2005-02-26 17:15:04 +03:00
lars@mysql.com
c99c44805c
Fix of an incorrect merge
2005-02-24 17:25:06 +01:00
jimw@mysql.com
624f855e94
Make sure that warning message when GROUP_CONCAT() cuts values is also
...
updated with the correct number of lines. (Bug #8681 )
2005-02-23 17:58:20 -08:00
jimw@mysql.com
3ecabaa9f7
Don't try to create a symlink if the DATA DIRECTORY specified for a table
...
is the same as the normal datadir for that database. (Bug #8707 )
2005-02-23 13:59:04 -08:00
mats@mysql.com
6ad51ffb3c
Bug#8412: Merge from 4.0
2005-02-23 19:58:54 +01:00
mats@mysql.com
a4cdb93b38
Merge mysql.com:/home/bkroot/mysql-4.0
...
into mysql.com:/home/bk/b8412-mysql-4.0
2005-02-23 19:40:31 +01:00
gluh@gluh.mysql.r18.ru
fc9c20995f
Fix for bug #6572 : SHOW ERRORS doesn't
2005-02-23 20:18:21 +03:00
gluh@gluh.mysql.r18.ru
2b5ee94a33
Fix for bug#6317: string function CHAR, parameter is NULL, wrong result
2005-02-23 18:15:45 +03:00
jimw@mysql.com
df3c8db4f3
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:14:49 -08:00
lars@mysql.com
c583eb6954
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
2005-02-22 14:17:17 +01:00
lars@mysql.com
6b06ff5956
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/bkroot/mysql-4.1
2005-02-22 14:12:42 +01:00
monty@mysql.com
7914e24409
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-22 14:43:14 +02:00
lars@mysql.com
e31ea39d0c
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
2005-02-22 13:39:41 +01:00
bell@51.0.168.192.in-addr.arpa
babcdb6407
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 14:34:59 +02:00
lars@mysql.com
d2ecf8e6a5
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
2005-02-22 13:29:20 +01:00
lars@mysql.com
2d1089e8c1
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
2005-02-22 13:22:34 +01:00
bar@mysql.com
89a5530822
A user variable are now always have IMPLICIT coercibility,
...
independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.
2005-02-22 15:55:40 +04:00
lars@mysql.com
1d3c67000b
BUG#6662: Changes after Guilhems and Sergs review
2005-02-22 12:40:31 +01:00
bell@51.0.168.192.in-addr.arpa
9a9811f3a4
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 13:00:00 +02:00
monty@mysql.com
22a76c1dfb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-22 12:51:54 +02:00
monty@mysql.com
e2dc9b4099
Backport my_strntod() from 5.0
...
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740 )
2005-02-22 12:51:23 +02:00
bar@mysql.com
c0230f6f5f
ctype_latin1.result, ctype_latin1.test, charset.c:
...
Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
2005-02-22 09:56:07 +04:00
lars@mysql.com
be28ef0a20
BUG#6662: Importing mysqldumps should not show any warnings of level "notes".
2005-02-21 18:40:28 +01:00
lars@mysql.com
5cffeb2b85
BUG#6676: Derivation of user variables should be of derivation "IMPLICIT"
2005-02-21 16:26:04 +01:00
bar@mysql.com
1bd47888b3
ctype_utf8.result, ctype_utf8.test, ctype-utf8.c:
...
Bugs: #8385 : utf8_general_ci treats cyrillic letters I and SHORT I as the same
2005-02-21 17:17:30 +04:00
jimw@mysql.com
10800c1eb5
Merge mysql.com:/home/jimw/my/mysql-4.1-8475
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-18 15:40:17 -08:00
bar@mysql.com
47b85939a5
Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
...
Backporting Monty's fix for 5.0 into 4.1.
2005-02-18 16:10:12 +04:00
jimw@mysql.com
3c700572b4
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 15:23:28 -08:00
jimw@mysql.com
e3ff1bf326
Merge mysql.com:/home/jimw/my/mysql-4.1-8303
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:54:05 -08:00
jimw@mysql.com
9de31feab9
Merge mysql.com:/home/jimw/my/mysql-4.1-7617
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:53:35 -08:00
jimw@mysql.com
219e29d7ae
Merge mysql.com:/home/jimw/my/mysql-4.1-8471
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:53:07 -08:00
jimw@mysql.com
08624c0061
Merge mysql.com:/home/jimw/my/mysql-4.1-8355
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:48:34 -08:00