sven@murkla.(none)
c302f74da6
BUG#29046: rpl_stm_mystery22 unstable
...
Problem: rpl_stm_mystery22 is unstable.
Reason: At one place, the test case *should* wait until the SQL thread on the
slave receives an error, but instead it waits until the SQL thread stops. The
SQL thread may stop before the error flag is set, so that when the test case
continues to execute, the error flag is not set.
Fix: Introduce the subroutine mysql-test/include/wait_for_slave_sql_error.inc,
which waits until there is an error in the sql thread of the slave.
Re-commit: fixed one logical error and two smaller things noted by Mats.
2007-10-10 18:10:54 +02:00
aelkin/elkin@koti.dsl.inet.fi
4c6e14ce8d
Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/5.1-merge
2007-10-04 12:27:14 +03:00
bar@mysql.com/bar.myoffice.izhnet.ru
2b42750a51
Bug#29323 mysql client only accetps ANSI encoded files
...
Fix: ignore BOM marker in the first line.
2007-10-04 13:06:01 +05:00
bar@bar.myoffice.izhnet.ru
3745968ddc
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b30315
...
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
2007-10-03 12:18:17 +05:00
bar@bar.myoffice.izhnet.ru
5efd35b0f3
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b30315
...
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
2007-10-03 12:02:30 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
065bcba38e
Fixing comments to use "#" instead of "--"
2007-10-02 13:28:58 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
aacebc7ce8
Bug#30315 Character sets: insertion of euckr code value 0xa141 fails
...
Problem: some valid euc-kr characters were rejected because
condition checking multi-byte tail didn't allow
multi-byte characters having the second byte in the ranges
[0x41..0x5A] and [0x61..0x7A].
Fix: allow these byte ranges for mb tails
2007-10-01 15:35:42 +05:00
lars/lthalmann@dl145h.mysql.com
b6553689fd
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-10-01 11:25:32 +02:00
lars/lthalmann@dl145h.mysql.com
b89dcdffcd
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-10-01 11:24:11 +02:00
df@pippilotta.erinye.com
43310df9d9
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-25 17:44:53 +02:00
df@pippilotta.erinye.com
461f559adf
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-09-25 17:42:25 +02:00
mats@kindahl-laptop.dnsalias.net
cd88c4dc8a
Fixing bug in test in that a database was not dropped and was visible
...
in following tests.
2007-09-21 08:13:52 +02:00
mats@kindahl-laptop.dnsalias.net
8b5248a52b
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-rpl
2007-09-20 18:30:00 +02:00
mats@kindahl-laptop.dnsalias.net
c5622b424f
BUG#31076 (Server crashes when start slave is issued):
...
Row-based replication crashes when replicating from pre-5.1.22 to 5.1.22
due to an uninitialized variable.
2007-09-20 16:31:05 +02:00
gluh@eagle.(none)
7dbcdf9a64
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 16:28:46 +05:00
gluh@mysql.com/eagle.(none)
eef0772b89
result fix
2007-09-20 16:27:58 +05:00
gluh@eagle.(none)
2a02dd13e2
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 14:40:24 +05:00
gluh@mysql.com/eagle.(none)
4ffcc4f266
result fix
2007-09-20 14:38:41 +05:00
gluh@eagle.(none)
88a4df4ec0
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 14:10:05 +05:00
gluh@mysql.com/eagle.(none)
6b81174cde
Bug#27747 database metadata doesn't return sufficient column default info
...
added get_field_default_value() function which obtains default value from the field
(used in store_create_info() & get_schema_column_record() functions)
2007-09-20 13:54:46 +05:00
gkodinov/kgeorge@magare.gmz
3dd2ed30ae
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30639-5.1-opt
2007-09-19 18:02:59 +03:00
gkodinov/kgeorge@magare.gmz
c2abf960f9
Bug #30639 : limit offset,rowcount wraps when rowcount >= 2^32 in windows
...
The parser uses ulonglong to store the LIMIT number. This number
then is stored into a variable of type ha_rows. ha_rows is either
4 or 8 byte depending on the BIG_TABLES define from config.h
So an overflow may occur (and LIMIT becomes zero) while storing an
ulonglong value in ha_rows.
Fixed by :
1. Using the maximum possible value for ha_rows on overflow
2. Defining BIG_TABLES for the windows builds (to match the others)
2007-09-19 17:47:52 +03:00
gluh@eagle.(none)
e7a9c4d648
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-19 14:09:23 +05:00
gluh@eagle.(none)
56c927e696
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-09-19 13:50:38 +05:00
lars/lthalmann@dl145h.mysql.com
0ad6384f9e
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
2007-09-17 14:14:02 +02:00
lars/lthalmann@dl145h.mysql.com
234e55623b
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-09-17 12:38:22 +02:00
aelkin@dl145j.mysql.com
0c153419ce
Merge: bug@27417,23333 and bug#28960 tests with 5.1
2007-09-17 12:31:10 +02:00
aelkin@dl145j.mysql.com
11c9a13a24
Merge: bug#27417,23333 manual work for fixing tests and a source code.
2007-09-16 18:16:40 +02:00
aelkin@dl145j.mysql.com
e9b287f27e
Manual merge fixes/tests for bugs_28960,27417,23333.
2007-09-16 12:07:00 +02:00
aelkin@dl145j.mysql.com
1a0fea60a3
Merge dl145j.mysql.com:/tmp/andrei/mysql-5.0-rpl
...
into dl145j.mysql.com:/tmp/andrei/5.1-merge
2007-09-15 21:25:56 +02:00
gshchepa@devsrv-b.mysql.com
2e26008c3e
Many files:
...
Post-merge fix.
2007-09-15 07:39:58 +02:00
gshchepa@devsrv-b.mysql.com
6234432241
Merge devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
2007-09-15 07:08:07 +02:00
gshchepa@devsrv-b.mysql.com
0aa6e95768
select.test:
...
Post-fix for bug#27695.
2007-09-15 07:04:32 +02:00
gkodinov/kgeorge@magare.gmz
3b58ae43c8
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B31001-5.1-opt
2007-09-14 23:48:23 +03:00
gshchepa@devsrv-b.mysql.com
3dc13a6444
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
2007-09-14 21:17:07 +02:00
gshchepa@devsrv-b.mysql.com
4bf2408ed4
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
2007-09-14 21:15:43 +02:00
joerg@trift2.
8fd3d71109
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-09-14 19:29:26 +02:00
joerg@trift2.
100f69154d
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-09-14 19:23:05 +02:00
gkodinov/kgeorge@magare.gmz
0133bc639c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B31001-5.0-opt
2007-09-14 19:04:47 +03:00
gkodinov/kgeorge@magare.gmz
6927e67dd9
Merge magare.gmz:/home/kgeorge/mysql/work/B31001-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B31001-5.1-opt
2007-09-14 19:03:14 +03:00
gshchepa@devsrv-b.mysql.com
ca15f7b190
Many files:
...
Merge with 5.0-opt.
2007-09-14 17:21:50 +02:00
gkodinov/kgeorge@magare.gmz
a2afc56f61
Bug #31001 : ORDER BY DESC in InnoDB not working
...
The optimizer sets index traversal in reverse order only if there are
used key parts that are not compared to a constant.
However using the primary key as an ORDER BY suffix rendered the check
incomplete : going in reverse order must still be used even if
all the parts of the secondary key are compared to a constant.
Fixed by relaxing the check and set reverse traversal even when all
the secondary index keyparts are compared to a const.
Also account for the case when all the primary keys are compared to a
constant.
2007-09-14 17:43:14 +03:00
sergefp@pylon.mylan
c54ce038cb
Merge mysql.com:/home/psergey/mysql-5.0-bug30324
...
into mysql.com:/home/psergey/mysql-5.1-bug27927
2007-09-14 15:05:20 +04:00
sergefp@pylon.mylan
15b7d5e8af
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug30324
2007-09-14 15:00:10 +04:00
sergefp@mysql.com
8a3e6201b3
BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
...
- The bug was caused by COUNT(DISTINCT ...) code using Unique object in
a way that assumed that BIT(N) column occupies a contiguous space in
temp_table->record[0] buffer.
- The fix is to make COUNT(DISTINCT ...) code instruct create_tmp_table to
create temporary table with column of type BIGINT, not BIT(N).
2007-09-14 14:53:13 +04:00
sergefp@pylon.mylan
003bb7b994
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/psergey/mysql-5.1-bug27927
2007-09-14 14:25:45 +04:00
sergefp@mysql.com
41404ec52e
BUG#27927:Partition pruning not optimal with TO_DAYS and YEAR functions
...
- Introduced val_int_endpoint() function which converts between func
argument intervals and func value intervals for monotonic functions.
- Made partition interval analyzer use part_expr->val_int_endpoint()
to check if the edge values should be included.
2007-09-14 14:18:42 +04:00
tomas@whalegate.ndb.mysql.com
0f36ce8f86
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-09-14 11:13:00 +02:00
tomas@whalegate.ndb.mysql.com
7cf77f49d3
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-14 11:08:55 +02:00
gshchepa@devsrv-b.mysql.com
a9987ffde4
Merge devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
2007-09-14 10:37:42 +02:00