bar@bar.intranet.mysql.r18.ru
6e5bd8a7f8
Merge mysql.com:/usr/home/bar/mysql-5.0.b24158
...
into mysql.com:/usr/home/bar/mysql-5.1.b20396
2006-12-08 16:15:43 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
3df9fde7aa
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/usr/home/bar/mysql-5.0.b24158
2006-12-08 15:18:03 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
c57bde5ff1
After merge fix
2006-12-08 15:13:12 +04:00
bar@bar.intranet.mysql.r18.ru
864ad7daa0
After merge fix
2006-12-08 10:33:05 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
0d4b26fa71
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/usr/home/bar/mysql-5.0.b20396
2006-12-08 09:48:46 +04:00
cbell/Chuck@suse.vabb.com
ab2d6dcd65
Merge suse.vabb.com:/home/Chuck/development/mysql-5.1-new-rpl
...
into suse.vabb.com:/home/Chuck/development/mysql-5.1_WL_3618
2006-12-07 09:19:56 -05:00
cbell/Chuck@suse.vabb.com
9f36c1c286
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
...
Please see worklog for details on files changed.
2006-12-07 09:18:35 -05:00
bar@bar.intranet.mysql.r18.ru
293a356277
Merge mysql.com:/usr/home/bar/mysql-5.0.b22645
...
into mysql.com:/usr/home/bar/mysql-5.1.b22645
2006-12-05 16:09:27 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
58149eaf61
Merge mysql.com:/usr/home/bar/mysql-4.1.b22645
...
into mysql.com:/usr/home/bar/mysql-5.0.b22645
2006-12-05 14:08:19 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
224660d14a
Bug#22645 LC_TIME_NAMES: Statement not replicated
...
Problem: replication of LC_TIME_NAMES didn't work.
Thus, INSERTS or UPDATES using date_format() always
worked with en_US on the slave side.
Fix: adding ONE_SHOT implementation for LC_TIME_NAMES.
2006-12-05 13:45:21 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
dcde1be17d
Bug#24158 SET PASSWORD in binary log fails under ANSI_QUOTES
...
Problem: ``SET PASSWORD FOR foo@localhost'' was written into
binary log using double quites: ``SET PASSWORD FOR "foo"@"localhost"...''.
If sql_mode was set to ANSI_QUOTES, parser on slave considered
"foo" and "localhost" as identifiers instead of strigns constants,
so it failed to parse, generated syntax error and slave then stopped.
Fix: changing binary log entries to use single quotes:
``SET PASSWORD FOR 'foo'@'localhost'...'' not to depend on ANSI_QUOTES.
2006-11-30 11:08:23 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
a70028a855
Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails
...
Problem: when loading mysqlbinlog dumps, CREATE PROCEDURE having semicolons
in their bodies failed.
Fix: Using safe delimiter "/*!*/;" to dump log entries.
2006-11-28 16:26:15 +04:00
lars@black.(none)
6a85cca986
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-22 02:24:16 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
e396432904
Preparing to merge "backport of bug#13926 into 5.0"
...
Moving tests to 4.1 section
2006-11-21 12:22:10 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
78c74b0396
Prepare to merge "backport of bug#13926 from 5.0 to 4.1" back into 5.0:
...
Moving tests into their new place into 4.1 tests section
2006-11-21 12:09:14 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
fb419c4241
BUG#13926: --order-by-primary fails if PKEY contains quote character.
...
Backporting from 5.0
2006-11-21 11:09:33 +04:00
iggy/Administrator@amd64.
3d1b9a66e4
Bug#23983 ps.test fails to open shared library
...
- When a shared library argument is supplied, it's checked for an OS
specific directory separator. The expected error is different
depending on the separator used. Create OS specific versions of these
tests.
2006-11-20 15:18:57 -05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
a363599a81
Merge mysql.com:/usr/home/bar/mysql-4.1.b22646
...
into mysql.com:/usr/home/bar/mysql-4.1-rpl
2006-11-20 18:08:46 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
17d0ff0e3b
After merge fix
2006-11-20 18:05:01 +04:00
bar@bar.intranet.mysql.r18.ru
079e4ce91f
Merge mysql.com:/usr/home/bar/mysql-5.0.b22646
...
into mysql.com:/usr/home/bar/mysql-5.1.b22646
2006-11-20 18:01:22 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
2b25e2b3f6
After merge fix
2006-11-20 17:57:57 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
6f6868bfe2
Merge mysql.com:/usr/home/bar/mysql-4.1.b22646
...
into mysql.com:/usr/home/bar/mysql-5.0.b22646
2006-11-20 15:06:33 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
c1d25bf216
After merge fix: modifying test results according to the fix
2006-11-16 20:07:46 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
9543b7dfba
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/usr/home/bar/mysql-5.0.b23619
2006-11-16 13:44:23 +04:00
bar@bar.intranet.mysql.r18.ru
8c369a4700
Merge mysql.com:/usr/home/bar/mysql-5.0.b23619
...
into mysql.com:/usr/home/bar/mysql-5.1.b23619
2006-11-16 12:51:49 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
d3603eb152
Merge mysql.com:/usr/home/bar/mysql-5.0-rpl
...
into mysql.com:/usr/home/bar/mysql-5.0.b23619
2006-11-16 12:28:09 +04:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
3af7d5fa9d
Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
...
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2006-11-15 13:05:37 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
10767f3f9a
Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/4.1
...
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
2006-11-15 12:55:43 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
5235785b2e
bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
...
mending windows test.
2006-11-15 12:53:07 +02:00
lars@black.(none)
07ac3d3a95
Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-13 17:59:51 +01:00
lars@mysql.com/black.(none)
7aa562ad20
Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-11-13 17:54:01 +01:00
lars@black.(none)
63c906f749
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-13 12:45:31 +01:00
lars@mysql.com/black.(none)
c5d56416ba
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-11-13 12:44:53 +01:00
lars@mysql.com/black.(none)
de01754c19
Merge mysql.com:/home/bkroot/mysql-4.1-rpl
...
into mysql.com:/home/bk/MERGE/mysql-4.1-merge
2006-11-13 12:44:24 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
7b0eb936d1
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50
2006-11-13 12:45:47 +02:00
petr/cps@outpost.site
e06f74f9f9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
2006-11-10 15:05:38 +03:00
bar@bar.intranet.mysql.r18.ru
da0a0ad20a
Merge mysql.com:/usr/home/bar/mysql-5.0.b21505
...
into mysql.com:/usr/home/bar/mysql-5.1.b21505
2006-11-09 14:46:01 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
aa1c8a5826
Bug#21505 Create view - illegal mix of collation for operation 'UNION'
...
The problem was that any VIEW columns had always implicit derivation.
Fix: derivation is now copied from the original expression
given in VIEW definition.
For example:
- a VIEW column which comes from a string constant
in CREATE VIEW definition have now coercible derivation.
- a VIEW column having COLLATE clause
in CREATE VIEW definition have now explicit derivation.
2006-11-09 14:41:34 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
a5de478d51
Bug#23619 Incorrectly escaped multibyte characters in binary log break replication
...
Problem: when embedding a character string with introducer with charset X
into a SQL query which is generally in character set Y, the string constants
were escaped according to their own character set (i.e.X), then after reading
such a "mixed" query from binlog, the string constants were unescaped
using character set of the query (i.e. Y), instead of X, which gave wrong
results or even syntax errors with tricky charsets (e.g. sjis)
Fix: when embedding a string constant of charset X into a query of charset Y,
the string constant is now escaped according to character Y, instead of
its own character set X.
2006-11-09 14:27:34 +04:00
tsmith@quadxeon.mysql.com
9e3e6a7c0b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
2006-11-09 00:28:31 +01:00
tsmith@quadxeon.mysql.com
f663ba45e5
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
2006-11-09 00:26:22 +01:00
anozdrin/alik@alik.
9421205b49
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt
2006-11-08 22:20:58 +03:00
bar@bar.intranet.mysql.r18.ru
41a324ea3a
Merge mysql.com:/usr/home/bar/mysql-5.0.b23451
...
into mysql.com:/usr/home/bar/mysql-5.1.b23451
2006-11-08 22:14:36 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
bd2529d0a1
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1-rpl
...
into mysql.com:/usr/home/bar/mysql-4.1.b23451v2
2006-11-08 22:03:08 +04:00
cmiller@zippy.cornsilk.net
d9845ccfd2
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my51-bug10963
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-08 10:19:02 -05:00
cmiller@zippy.cornsilk.net
c6b028404d
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my50-bug10963
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-08 10:18:16 -05:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
37c78abf24
bug#19402 SQL close to the size of the max_allowed_packet fails on slave
...
fixing a flow of the test
2006-11-08 17:17:28 +02:00
cmiller@zippy.cornsilk.net
f05faf34af
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my50-bug10963
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my51-bug10963
2006-11-08 10:12:06 -05:00
cmiller@zippy.cornsilk.net
6260e12b99
Bug#10963: LEFT/RIGHT/SUBSTR/.. string functions returns wrong result \
...
on large length
Problem: Most (all) of the numeric inputs were being coerced into
int (32 bit) sized variables. Works OK for sane inputs; any input
larger than 2^32 (or 2^31 for signed vars) exihibited predictable
wrapping behavior (up to about 10^18) and then started having really
strange behaviour past that point (since the conversion to 64 bit int
from the DECIMAL type can do weird things on out of range numbers).
Solution: 1) Add many tests. 2) Convert input from (u)long type to
(u)longlong. 3) Do (sometimes multiple) sanity checks on input,
keeping in mind that sometimes a negative longlong is not a negative
longlong (if the unsigned_flag is set). 4) Emulate existing behavior
w/rt negative and "small" out-of-bounds values.
2006-11-08 10:11:02 -05:00
mats@romeo.(none)
a932160a85
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
2006-11-08 14:07:13 +01:00