kaa@polly.local
16f7290359
Merge polly.local:/home/kaa/src/maint/bug27643/my50-bug27643
...
into polly.local:/home/kaa/src/maint/bug27643/my51-bug27643
2007-05-31 14:58:22 +04:00
kaa@polly.local
d435b3ed74
Fix for bug #27643 "query failed : 1114 (The table '' is full)
...
Problem:
HASH indexes on VARCHAR columns with binary collations did not ignore trailing spaces from strings before comparisons. This could result in duplicate records being successfully inserted into a MEMORY table with unique key constraints.
As a direct consequence of the above, internal MEMORY tables used for GROUP BY calculation in testcases for bug #27643 contained duplicate rows which resulted in duplicate key errors when converting those temporary tables to MyISAM. Additionally, that error was incorrectly converted to the 'table is full' error.
Solution:
- ignore trailing spaces in VARCHAR fields with binary collations when calculating hashes.
- return a proper error from create_myisam_from_heap() when conversion fails.
2007-05-31 14:54:44 +04:00
holyfoot/hf@hfmain.(none)
cdda302fc1
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-31 14:23:45 +05:00
gshchepa/uchum@gleb.loc
7b4ed8001a
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
2007-05-31 14:02:50 +05:00
kaa@polly.local
f1029f99af
Merge polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-05-31 12:51:02 +04:00
lars/lthalmann@mysql.com/dl145j.mysql.com
685293b985
Disabled due to valgrind failure (talked to Tomas)
2007-05-31 10:34:22 +02:00
gshchepa/uchum@gleb.loc
89a4d89c26
Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
2007-05-31 13:28:43 +05:00
lars/lthalmann@dl145j.mysql.com
30179dd8c0
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-05-31 10:27:53 +02:00
kaa@polly.local
b729e8e2ac
Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-05-31 12:27:12 +04:00
lars/lthalmann@dl145j.mysql.com
73ca08a481
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-05-31 10:23:37 +02:00
kaa@polly.local
ab37c16a5a
Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121
...
into polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
2007-05-31 12:21:21 +04:00
lars/lthalmann@dl145h.mysql.com
4e90009904
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
2007-05-31 10:20:58 +02:00
gshchepa/uchum@gleb.loc
be69f13dff
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28598
2007-05-31 12:43:59 +05:00
gshchepa/uchum@gleb.loc
e16953dfd8
Fixed bug #28598 .
...
mysqld crashed when a long-running explain query was killed from
another connection.
When the current thread caught a kill signal executing the function
best_extension_by_limited_search it just silently returned to
the calling function greedy_search without initializing elements of
the join->best_positions array.
However, the greedy_search function ignored thd->killed status
after a calls to the best_extension_by_limited_search function, and
after several calls the greedy_search function used an uninitialized
data from the join->best_positions[idx] to search position in the
join->best_ref array.
That search failed, and greedy_search tried to call swap_variables
function with NULL argument - that caused a crash.
2007-05-31 12:10:21 +05:00
igor@olga.mysql.com
4fb062de84
Post merge fix.
2007-05-31 00:04:03 -07:00
malff/marcsql@weblab.(none)
b2d394787e
Build warning cleanup
2007-05-30 17:46:28 -06:00
tsmith@quadxeon.mysql.com
c57839166c
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-31 01:02:56 +02:00
tsmith@quadxeon.mysql.com
298e5002e3
mysqldump.c:
...
Fix harmless typo (caught thanks to warning)
2007-05-31 00:40:56 +02:00
tsmith@quadxeon.mysql.com
e97729a38f
mysqldump.c:
...
Fix harmless typo (caught thanks to warning)
2007-05-31 00:37:41 +02:00
tsmith@quadxeon.mysql.com
c1c60a17dc
Merge tsmith.mysql.internal:m/bk/maint/b4858/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-31 00:29:02 +02:00
tsmith@quadxeon.mysql.com
91c484339c
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-30 23:48:20 +02:00
tsmith@quadxeon.mysql.com
64f582396b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-05-30 23:46:21 +02:00
tsmith@quadxeon.mysql.com
d12181e9d0
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
2007-05-30 23:45:34 +02:00
dkatz@damien-katzs-computer.local
6490419bb6
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/mysql51
2007-05-30 16:45:54 -04:00
dkatz@damien-katzs-computer.local
1ac607be32
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50_dump
2007-05-30 16:42:18 -04:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
4835204dcc
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
2007-05-30 22:33:54 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
95b1be9eb1
bug#22725
...
refining the test because of Bug #28786 'reset master' does not reset binlogging on embeded server
2007-05-30 22:29:15 +03:00
evgen@moonbone.local
85b6e3f00d
Bug#28729: Field_enum wrongly reported an error while storing an empty string.
...
ENUM fields internally store their values as integers and may use integer
values as indexes to their values. Invalid values are mapped to zero value.
When storing an empty string the ENUM field fails to find an appropriate value
and tries to convert the provided string to integer. The conversion also
fails and error is returned even if the thd->count_cuted_fields is set to
CHECK_FIELD_IGNORE. This makes the range optimizer wrongly decide that an
impossible range is present.
Now the Field_enum::store() returns error while storing an empty string only
if the thd->count_cuted_fields isn't set to CHECK_FIELD_IGNORE.
2007-05-30 23:28:14 +04:00
kaa@polly.local
d30872b4b2
Got rid of log_01[], because we don't really need it. Division and log_10[] can always be used instead, which is also a more precise way.
...
This is for bug #28121 .
2007-05-30 22:47:52 +04:00
evgen@moonbone.local
1fea153652
sp.result, analyse.result:
...
Post merge fix.
2007-05-30 20:25:16 +04:00
evgen@moonbone.local
75afe5cab5
Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
2007-05-30 19:35:35 +04:00
thek@adventure.(none)
c2e2d0bfa0
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-05-30 17:34:27 +02:00
thek@adventure.(none)
d505eac7e9
Merge adventure.(none):/home/thek/Development/cpp/bug24988/my51-bug24988
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-05-30 17:17:46 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
1ec47e4ef8
Changed to vertical output for rpl_row_until.test
2007-05-30 17:00:48 +02:00
lars/lthalmann@dl145k.mysql.com
5816dfe330
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-05-30 15:58:48 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
ac1d6a7f61
Masking out error that is not generated by the test (rpl_ndb_basic.test) itself
2007-05-30 15:56:05 +02:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
1a491f3640
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2007-05-30 16:32:36 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
e87959a23a
bug#22725
...
the test is not supposed for row format. the include-guard is set.
2007-05-30 16:14:55 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
aedc19a392
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2007-05-30 15:59:21 +03:00
mhansson@dl145s.mysql.com
d20a1977b5
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/users/mhansson/mysql/autopush/my50-bug28250
2007-05-30 14:43:59 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
05c75a9c01
CMakeLists.txt:
...
Adding strnlen.c into the list of source files.
2007-05-30 17:29:05 +05:00
anozdrin/alik@ibm.
de9f159c60
1. Fix memory leak.
...
2. Use multibyte-safe constant.
2007-05-30 16:24:21 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
b0692ac99c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b28436/b28436.5.1
2007-05-30 17:13:59 +05:00
gluh@eagle.(none)
09a267852a
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-05-30 17:09:16 +05:00
gluh@mysql.com/eagle.(none)
cdbdc4e745
backport of Bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL
2007-05-30 17:04:04 +05:00
gshchepa/uchum@gleb.loc
7f63aab2e0
Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28716
2007-05-30 16:41:16 +05:00
gshchepa/uchum@gleb.loc
64ff9e4d6f
sql_update.cc:
...
Fixed bug #28716 : additional patch to eliminate compilation
error under Windows.
2007-05-30 16:39:25 +05:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
67c34a2c3c
bug#17654 --read-from-remote-server causes core
...
fixing FD event issue that showed up on pb.
2007-05-30 14:29:34 +03:00
bar@bar.myoffice.izhnet.ru
457491f58a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into mysql.com:/home/bar/mysql-5.1.b28558
2007-05-30 16:04:52 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
f6e5cfd85c
Define HAVE_STRNLEN correctly.
2007-05-30 16:02:54 +05:00