guilhem@mysql.com
c1b11edfac
Removing the binlog-show-xid option as it was only a temporary solution until we have replace-regex which we have now.
...
That option was used to suppress the XID from the output of SHOW BINLOG EVENTS (to create a repeatable testsuite),
was available only in debug builds, and was explicitely marked as "may be removed in future versions" in mysqld --help.
Idea of the removal approved by the replication team.
2006-05-17 22:16:51 +02:00
igor@rurik.mysql.com
62f61f527f
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-05-17 11:46:21 -07:00
lars@mysql.com
7cbba084d7
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
2006-05-17 15:14:07 +02:00
knielsen@mysql.com
bf153b66a3
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-05-17 15:09:40 +02:00
rburnett@bk-internal.mysql.com
3f694eaea2
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-17 15:03:17 +02:00
holyfoot@mysql.com
54a75ed1d5
Merge mysql.com:/home/hf/work/mysql-4.1.clean
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-17 18:01:05 +05:00
holyfoot@mysql.com
e5f04160d5
Merge bk@192.168.21.1:mysql-5.1-kt
...
into mysql.com:/home/hf/work/mysql-5.1.14573
2006-05-17 17:12:25 +05:00
ramil@mysql.com
7319ef4ef1
Fix for #16327 : invalid TIMESTAMP values retrieved
2006-05-17 17:00:30 +05:00
gkodinov@mysql.com
9f9a76eb6e
Merge mysql.com:/home/kgeorge/mysql/5.0/tmp_merge
...
into mysql.com:/home/kgeorge/mysql/5.1/merge
2006-05-17 13:29:20 +03:00
tomas@poseidon.ndb.mysql.com
0cb31d7d5f
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
2006-05-17 08:34:48 +02:00
igor@rurik.mysql.com
767d25dabd
Fixed bug #19573 .
...
The select statement that specified a view could be
slightly changed when the view was saved in a frm file.
In particular references to an alias name in the HAVING
clause could be substituted for the expression named by
this alias.
This could result in an error message for a query of
the form SELECT * FROM <view>. Yet no such message
appeared when executing the query specifying the view.
2006-05-16 22:19:44 -07:00
cmiller@zippy.(none)
593daae150
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-05-16 18:42:59 -04:00
kent@mysql.com
9fca0d766b
mysql.spec.sh:
...
Removed Berkeley DB
configure.in:
Adjusted Netware support
basic.t.c:
Change for Netware
Makefile.am:
Use thread safe libmysqlclient_r if it was built
valgrind.supp:
Hide report about strlen/_dl_init_paths
ha_tina.cc:
Temporarely disable CSV engine on Netware,
as the engine depends on mmap()
net_serv.cc:
Include <sys/select.h> for Netware
2006-05-16 22:47:22 +02:00
tulin@production.mysql.com
4d0169c6f6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/tulin/mysql-4.1
2006-05-16 21:46:52 +02:00
tulin@production.mysql.com
b3d8b9bbd8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/tulin/mysql-5.0
2006-05-16 21:46:00 +02:00
tomas@poseidon.ndb.mysql.com
86c898febe
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 20:58:19 +02:00
tomas@poseidon.ndb.mysql.com
c5987ab67a
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
...
- adoptions to handle binlog
2006-05-16 20:56:45 +02:00
rburnett@bk-internal.mysql.com
d8d222f261
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-16 19:17:18 +02:00
aelkin@mysql.com
8648412531
Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-05-16 19:33:24 +03:00
aelkin@mysql.com
713d17d5e7
BUG#14157: utf8 encoding in binlog without set character_set_client: e.g DROP temporary
...
fixing encoding example because of table names can not be in koi8r
on some platforms.
2006-05-16 16:50:05 +03:00
jmiller@mysql.com
44d1f74f99
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-16 15:39:41 +02:00
jmiller@mysql.com
d022cacbc1
Updated to fix bug in AIX
2006-05-16 15:38:21 +02:00
jmiller@mysql.com
46ad615f6e
rpl_log.test:
...
Fix for failure in aix52 failure during push build
2006-05-16 14:59:44 +02:00
sergefp@mysql.com
c89fc77116
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug19618
2006-05-16 15:34:23 +04:00
tomas@poseidon.ndb.mysql.com
b467bdfcdb
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-16 12:33:24 +02:00
tomas@poseidon.ndb.mysql.com
a5686c3138
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-05-16 12:32:36 +02:00
andrey@lmy004.
743a57fda1
disable events_logs_tests
2006-05-16 12:05:15 +02:00
tulin@production.mysql.com
d4c739fda3
information_schema.result:
...
corrected merge
2006-05-16 12:00:17 +02:00
sergefp@mysql.com
b7c52881d1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug19618
2006-05-16 13:46:30 +04:00
mats@mysql.com
66766ad596
Bug#16837 (Missing #ifdef cause compile problem --without-row-based-replication):
...
Added #ifdef's to make code work even when the system is built without
row-based replication.
2006-05-16 11:16:23 +02:00
tomas@poseidon.ndb.mysql.com
6cb699d208
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 10:37:40 +02:00
knielsen@mysql.com
62e0e90a51
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/knielsen/tmp-5.0
2006-05-16 10:34:12 +02:00
tomas@poseidon.ndb.mysql.com
08438b6054
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 10:21:37 +02:00
lars@mysql.com
a29504cbcb
Test used a charset not available on many platforms
2006-05-16 10:01:07 +02:00
pekka@mysql.com
d0d8b6c9f3
Merge mysql.com:/space/pekka/ndb/version/my50-bug14509
...
into mysql.com:/space/pekka/ndb/version/my51-bug14509
2006-05-16 09:37:11 +02:00
lars@mysql.com
3b8a10dbd7
Fixed result file (rpl_temporary)
2006-05-16 09:26:57 +02:00
tnurnberg@mysql.com
0613889746
Merge mysql.com:/home/tmp_merge
...
into mysql.com:/home/mysql-5.1-18997e
2006-05-16 03:33:43 +02:00
tnurnberg@mysql.com
d1311e1ac7
Bug#18997: DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value
...
if input year for date_add() / date_sub() with INTERVAL is low enough for
calc_daynr() to possibly return incorrect results (calc_daynr() has no information
on whether the year is low because it was a two-digit year ('77) or because it
was a really low four-digit year (0077) and will indiscriminately try to turn the
value into a four-digit year by adding 1900 or 2000 respectively), the functions
will now throw NULL.
2006-05-16 03:32:24 +02:00
cmiller@zippy.(none)
d8330e2858
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-05-15 19:26:49 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
414d5c0983
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-05-16 00:37:34 +03:00
knielsen@mysql.com
70aa60752c
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/knielsen/tmp-5.0
2006-05-15 23:21:37 +02:00
knielsen@mysql.com
2abf957c91
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix2
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-05-15 22:12:17 +02:00
lars@mysql.com
3148efad35
Merge mysql.com:/users/lthalmann/bkroot/andrei-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
2006-05-15 20:49:14 +02:00
tomas@poseidon.ndb.mysql.com
5971c0872b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-15 20:35:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
1b524d6b5f
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-15 21:33:47 +03:00
aelkin@dl145j.mysql.com
6bdd2bbcc1
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145j.mysql.com:/tmp/andrei/5.0
2006-05-15 19:57:11 +02:00
knielsen@mysql.com
5d1c68ed35
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix2
...
into mysql.com:/usr/local/mysql/tmp-5.0
2006-05-15 19:57:11 +02:00
reggie@big_geek.
34396a5d24
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
...
into big_geek.:C:/Work/mysql/mysql-5.1
2006-05-15 12:44:20 -05:00
reggie@big_geek.
7876c07b51
patch to get archive test working on Windows.
2006-05-15 12:31:14 -05:00
tomas@poseidon.ndb.mysql.com
747dc71f9f
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-15 18:44:17 +02:00