mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45474 commits 2778 branches 343 tags 1.6 GiB
Commit graph

13656 commits

Author SHA1 Message Date
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
tomas@whalegate.ndb.mysql.com
5610fb9f42 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-29 20:50:19 +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
gkodinov/kgeorge@magare.gmz
fca2a0c4ac Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26815-5.0-opt
 2007-03-29 19:20:33 +03:00
iggy@recycle.(none)
6a9811b594 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug23491/my50-bug23491
 2007-03-29 12:20:13 -04:00
iggy@recycle.(none)
c90400c538 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug23491/my51-bug23491
 2007-03-29 12:13:42 -04: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
iggy@recycle.(none)
4f498dec3a Merge recycle.(none):/src/bug23491/my50-bug23491 
into  recycle.(none):/src/bug23491/my51-bug23491
 2007-03-29 10:42:03 -04: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
msvensson@pilot.blaudden
c4a13137e5 After merge fixes 2007-03-29 16:11:02 +02:00
cbell/Chuck@mysql_cab_desk.
a591514a67 Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
 2007-03-29 09:54:59 -04: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
holyfoot/hf@mysql.com/hfmain.(none)
497ff2fa9c bug #24633 (sql_mode NO_DIR_IN_CREATE doesn't work with partitioned tables) 
additional patch to fix SHOW CREATE behaviour
 2007-03-29 18:42:27 +05:00
msvensson@pilot.blaudden
9f2bee02d2 Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-29 15:29:26 +02:00
msvensson@pilot.blaudden
f865bd1da4 Bug#19991 CHANGE MASTER need option ssl-verify-server-cert 
- Add MASTER_SSL_VERIFY_SERVER_CERT option to CHANGE MASTER TO
 - Add Master_Ssl_Serify_Server_Cert to SHOW SLAVE STATUS
 - Save and restore ssl_verify_server_cert  to master info file
   setting it to disabled as default.
 2007-03-29 15:09:57 +02:00
cbell/Chuck@mysql_cab_desk.
0627a31d7d Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629
 2007-03-29 08:38:06 -04:00
msvensson@pilot.blaudden
62c63239d0 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-29 14:35:03 +02:00
msvensson@pilot.blaudden
79b2bd53b2 Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-03-29 14:33:50 +02:00
tomas@whalegate.ndb.mysql.com
d10de8e783 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-29 14:18:22 +02:00
msvensson@pilot.blaudden
f9c5bb36b0 Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 14:16:28 +02:00
tomas@whalegate.ndb.mysql.com
ca5f4f4642 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-29 14:15:19 +02:00
tomas@whalegate.ndb.mysql.com
3129179178 Bug #27378 update becomes delete on slave 
- quick workaround, better patch is needed later
 - test case
 2007-03-29 14:14:42 +02:00
msvensson@pilot.blaudden
a71d195183 Bug#25482 GRANT statements are not replicated if you use "replicate-ignore-table" 
- GRANT and REVOKE statments didn't have the "updating" flag set and
   thus statements with a table specified would not replicate if
   slave filtering rules where turned on.
   For example "GRANT ... ON test.t1 TO ..." would not replicate.
 2007-03-29 14:12:32 +02:00
lars/lthalmann@dl145j.mysql.com
771e05d657 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-29 13:49:10 +02:00
tsmith@quadxeon.mysql.com
91809fed36 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-29 13:29:45 +02:00
tsmith@quadxeon.mysql.com
9e99b24305 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-29 13:09:16 +02:00
tsmith@quadxeon.mysql.com
4f95bd3438 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-29 13:08:32 +02:00
tsmith@quadxeon.mysql.com
0b0d2c3258 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-29 12:58:26 +02:00
tsmith@quadxeon.mysql.com
a7f506db2a Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-29 12:52:31 +02:00
tsmith@quadxeon.mysql.com
9a7f345133 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-29 12:43:31 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
75668471d1 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-03-29 12:25:28 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
890bdb4fed Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b21976/my50-b21976
 2007-03-29 15:17:18 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
c29f404e53 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b21976/my51-b21976
 2007-03-29 15:16:48 +05:00
tsmith@quadxeon.mysql.com
da8875a2ef Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-29 12:00:32 +02:00
msvensson@pilot.blaudden
dc01a80c37 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-29 11:55:09 +02:00
msvensson@pilot.blaudden
071783117f Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 11:54:59 +02:00
msvensson@pilot.blaudden
cb806be68d Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-29 11:48:05 +02:00
msvensson@pilot.blaudden
72cc8618d7 Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 11:40:38 +02:00
msvensson@pilot.blaudden
f47c4368de Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309 
into  pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309
 2007-03-29 11:38:48 +02:00
gkodinov/kgeorge@magare.gmz
82ecff6a76 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27300-5.0-opt
 2007-03-29 12:09:55 +03:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c132038451 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b21976/my50-b21976
 2007-03-29 13:37:07 +05:00
sergefp@pylon.mylan
87d98bec74 Merge mysql.com:/home/psergey/mysql-5.0-merge 
into  mysql.com:/home/psergey/mysql-5.1-merge
 2007-03-29 12:24:23 +04:00
gkodinov/kgeorge@magare.gmz
1a2ca44e2b Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27300-5.0-opt
 2007-03-29 11:01:32 +03:00
joerg@trift-lap.fambruehe
4507c6757a Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-03-29 09:41:39 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
8c5b59e416 Merge mysql.com:/home/ram/work/b21976/my50-b21976 
into  mysql.com:/home/ram/work/b21976/my51-b21976
 2007-03-29 12:04:02 +05:00
istruewing@chilla.local
d0ad6cd45b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-29 08:36:57 +02:00
sergefp@mysql.com
399bc9861e Merge of BUG#26624 and BUG#26625 2007-03-29 10:35:28 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
73f0c5d7c6 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b26359/b26359.5.0
 2007-03-29 11:06:15 +05:00
bar@bar.myoffice.izhnet.ru
306af7f4bc Merge mysql.com:/home/bar/mysql-5.0.b27079 
into  mysql.com:/home/bar/mysql-5.1-new-rpl
 2007-03-29 10:36:28 +05:00