mats@romeo.(none)
490bed495e
Merge romeo.(none):/home/bkroot/mysql-5.1-rpl
...
into romeo.(none):/home/bk/b27779-mysql-5.1-rpl
2007-04-13 08:55:03 +02:00
tomas@whalegate.ndb.mysql.com
059b899381
remove warning
2007-04-12 16:33:39 +02:00
tomas@whalegate.ndb.mysql.com
036f4e4059
Bug#17095 circular replication for ndb
...
- test case
- reset server id in injector
2007-04-12 16:13:49 +02:00
mats@romeo.(none)
06faf8f411
BUG#27779 (Slave cannot read old rows log events):
...
Taking code from before BUG#22583 and incorporating as events to be able
to read old events. Also incorporating old pack and unpack functions
into patch.
2007-04-12 15:50:54 +02:00
jani@ua141d10.elisa.omakaista.fi
335153121b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
2007-04-12 12:50:02 +03:00
msvensson@pilot.blaudden
2218fafa1f
Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 09:34:02 +02:00
lars/lthalmann@dl145h.mysql.com
1e5d279451
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-04-10 18:26:14 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
904c75ede5
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-04-10 18:25:27 +02:00
msvensson@pilot.blaudden
19f379b807
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 17:17:53 +02:00
msvensson@pilot.blaudden
3d847358de
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 17:17:08 +02:00
msvensson@pilot.blaudden
9917d018a6
Take into account wether vertical_results are in effect
2007-04-10 17:09:35 +02:00
msvensson@pilot.blaudden
73c6cde9d4
Init dying to 1 just after passing the guard
2007-04-10 17:06:36 +02:00
msvensson@pilot.blaudden
da2a216895
Add OPT_LOG_DIR
2007-04-10 17:05:22 +02:00
jani@ua141d10.elisa.omakaista.fi
b4ba815967
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-10 16:28:47 +03:00
serg@janus.mylan
102f58fe34
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.0
2007-04-10 15:27:26 +02:00
serg@janus.mylan
1c678b34aa
Bug#27171 mysqlbinlog produces different output depends from option -R
...
a better fix, that works with 4.1 servers which don't send a fake
Format_description_log_event.
2007-04-10 15:26:35 +02:00
msvensson@pilot.blaudden
448a6778cb
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 14:59:46 +02:00
msvensson@pilot.blaudden
d4f01284bd
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 14:47:53 +02:00
msvensson@pilot.blaudden
829ca34daf
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 14:46:57 +02:00
msvensson@pilot.blaudden
5c5271754b
Add --logdir option ot mysqltest
2007-04-10 14:45:13 +02:00
msvensson@pilot.blaudden
4496a8f546
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 14:31:33 +02:00
msvensson@pilot.blaudden
34a784f3d0
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 14:29:22 +02:00
msvensson@pilot.blaudden
60eb839e77
Merge 192.168.0.4:mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-04-10 13:51:32 +02:00
bar@mysql.com
220c453194
Merge mysql.com:/home/bar/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-5.1-new-rpl
2007-04-09 18:06:27 +05:00
bar@mysql.com
9faaec9e1b
bug#27608 XML output is not well-formed
...
Problem: output was empty if the result is empty.
Fix: print XML header and footer, even if the result
is empty, to produce well-formed XML output.
2007-04-09 17:53:10 +05:00
Kristofer.Pettersson@naruto.
7d3c4c29da
Merge naruto.:C:/cpp/bug26121/my51-bug26121
...
into naruto.:C:/cpp/mysql-5.1-runtime
2007-04-07 21:03:35 +02:00
holyfoot/hf@hfmain.(none)
ce426dd622
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 14:59:53 +05:00
Kristofer.Pettersson@naruto.
1902786808
Bug#26121 mysqldump includes LOCK TABLES general_log WRITE
...
- Giving the directive '--all-databases' to mysqldump caused
an attempt to lock and dump log tables which don't support this
operation.
- With this patch the log tables are excluded from the set of
databases tables to dump.
2007-04-05 21:53:02 +02:00
msvensson@shellback.(none)
2df8524391
Add "query_sorted" command to mysqltest
...
Usage:
query_sorted <query>;
2007-04-05 20:12:56 +02:00
msvensson@pilot.blaudden
dec5334a2b
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-05 14:51:49 +02:00
msvensson@pilot.blaudden
c3dc142df5
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-05 13:54:24 +02:00
msvensson@pilot.blaudden
9cd8b2b8fb
Protect against dying twice
...
Cleanup exit handling
2007-04-05 13:53:44 +02:00
msvensson@pilot.blaudden
ff0ee38bd7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-04 15:43:03 +02:00
msvensson@pilot.blaudden
3b1fc84a5e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-04 15:17:00 +02:00
msvensson@pilot.blaudden
fc992b0667
Add "skip" function, makeing mysqltest return an
...
error code indicating test should be skipped
2007-04-04 15:15:40 +02:00
msvensson@pilot.blaudden
19801cbfdc
Add expansion of $variables in "let from query",
...
"if with query" and "while with query"
2007-04-04 15:09:12 +02:00
jamppa@bk-internal.mysql.com
cbfd66e754
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
2007-04-03 13:55:20 +02:00
jani@ua141d10.elisa.omakaista.fi
e4fde44948
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-03 14:51:32 +03:00
jamppa@bk-internal.mysql.com
879725900b
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-04-03 13:51:31 +02:00
gluh@mysql.com/eagle.(none)
2d47f0cb1b
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
2007-04-03 16:13:27 +05:00
msvensson@pilot.blaudden
fc904eaead
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-02 11:15:09 +02:00
msvensson@pilot.blaudden
bb9a601829
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:50:39 +02:00
lars/lthalmann@dl145j.mysql.com
f6f848b9e7
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-03-31 00:17:12 +02:00
tomas@whalegate.ndb.mysql.com
77d37e5810
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-03-30 08:37:47 +02:00
mats@romeo.(none)
e12cc44ac3
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
2007-03-29 21:38:03 +02:00
mats@romeo.(none)
7c187c2c9b
WL#3464: Add replication event to denote gap in replication
...
Adding an event that can be used to denote that an incident occured
on the master. The event can be used to denote a gap in the replication
stream, but can also be used to denote other incidents.
In addition, the injector interface is extended with functions to
generate an incident event. The function will also rotate the binary
log after generating an incident event to get a fresh binary log.
2007-03-29 20:31:09 +02:00
jani@ua141d10.elisa.omakaista.fi
28c122a721
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-03-29 17:45:56 +03:00
jani@ua141d10.elisa.omakaista.fi
1c7beca65e
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-03-29 17:27:42 +03:00
jamppa@bk-internal.mysql.com
16de7d21cc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-03-29 16:11:29 +02:00
tomas@whalegate.ndb.mysql.com
5143b870dd
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-03-29 15:49:44 +02:00