mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47705 commits 2793 branches 343 tags 1.7 GiB
Commit graph

47705 commits

This branch
This branch
All branches
Author SHA1 Message Date
lars/lthalmann@mysql.com/dl145k.mysql.com
c1f2050087 merge rpl 5.0->5.1 2007-06-21 17:09:19 +02:00
lars/lthalmann@dl145k.mysql.com
1fb2aa8205 Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-06-21 17:04:33 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
fcd859ac77 Test fix 2007-06-21 16:55:52 +02:00
mats@kindahl-laptop.dnsalias.net
7438faa16b Test case fix to replication team tree. 2007-06-21 14:39:40 +02:00
mats@kindahl-laptop.dnsalias.net
e6f7d608e5 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/fix-mysql-5.1-rpl
 2007-06-21 09:35:47 +02:00
mats@kindahl-laptop.dnsalias.net
201a254788 Fixing result mismatch in rpl_deadlock_innodb result file. 2007-06-21 09:31:19 +02:00
mats@kindahl-laptop.dnsalias.net
6f9f5b01bf Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.0-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b29030-mysql-5.0-rpl
 2007-06-20 20:33:36 +02:00
lars/lthalmann@dl145j.mysql.com
76fe2aae2a Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-06-20 19:10:22 +02:00
mats@kindahl-laptop.dnsalias.net
2f74826394 BUG#29030 (DROP USER command that errors still gets written to binary log 
and replicated):

A DROP USER statement with a non-existing user was correctly written to
the binary log (there might be users that were removed, but not all),
but the error code was not set, which caused the slave to stop with an
error.

The error reporting code was moved to before the statement was logged
to ensure that the error information for the thread was correctly set
up. This works since my_error() will set the fields net.last_errno and
net.last_error for the thread that is reporting the error, and this
will then be picked up when the Query_log_event is created and written
to the binary log.
 2007-06-20 14:24:31 +02:00
mats@kindahl-laptop.dnsalias.net
1b16e4d4f0 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
 2007-06-20 13:25:53 +02:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
ab136d340f Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug27583-merge
 2007-06-20 13:35:09 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
9391d42165 Bug #27583 slave sql fails to read from iocache when slave got stopped at pos==4 
forgotten merge with 5.0. There can be some bugs waiting for this fix in 5.0 like Bug@29232
 2007-06-20 13:21:16 +03:00
mats@kindahl-laptop.dnsalias.net
d6570ec66f Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
 2007-06-20 11:43:17 +02:00
mats@kindahl-laptop.dnsalias.net
206b2c72ba Adding missing DROP TABLE statement to ndb_backup_print.test since it 
causes later tests to fail.
 2007-06-20 11:38:51 +02:00
tomas@whalegate.ndb.mysql.com
3bd4019fad Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-20 06:26:23 +02:00
tomas@whalegate.ndb.mysql.com
956b92059b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-20 05:46:36 +02:00
tomas@whalegate.ndb.mysql.com
0510a696a9 Bug #29229 memory corruption in dbtup 2007-06-20 05:41:54 +02:00
mats@kindahl-laptop.dnsalias.net
5dd26788cc Some test case fixes. 2007-06-19 22:18:16 +02:00
tomas@whalegate.ndb.mysql.com
7fa3b3cfa2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-19 15:28:26 +02:00
tomas@whalegate.ndb.mysql.com
895f2f15af Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown 2007-06-19 13:56:02 +02:00
tomas@whalegate.ndb.mysql.com
82976fe018 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-19 12:14:46 +02:00
tomas@whalegate.ndb.mysql.com
79ad6ff22a Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown 2007-06-19 12:14:02 +02:00
df@pippilotta.erinye.com
7621de2374 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-06-19 12:12:42 +02:00
df@pippilotta.erinye.com
71b4000caa Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-06-19 12:11:19 +02:00
df@pippilotta.erinye.com
7eea7fff35 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-19 12:10:48 +02:00
df@pippilotta.erinye.com
26d83baeaf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-06-19 12:05:17 +02:00
df@pippilotta.erinye.com
f927d50509 try again. 2007-06-19 12:03:10 +02:00
tomas@whalegate.ndb.mysql.com
027456393e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-19 11:38:37 +02:00
tomas@whalegate.ndb.mysql.com
b36a87ae91 corrected typo 2007-06-19 11:38:07 +02:00
tomas@whalegate.ndb.mysql.com
9d8fbc462b 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-06-19 11:31:52 +02:00
tomas@whalegate.ndb.mysql.com
955c40dece WL#3303 
- get the ndb flags right, so that the behaviour is as before
 2007-06-19 11:31:25 +02:00
tomas@whalegate.ndb.mysql.com
04f1913789 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-19 11:26:23 +02:00
tomas@whalegate.ndb.mysql.com
a67e755593 turn off binlogging of the updates during wait for not_readonly 2007-06-19 11:25:19 +02:00
mats@kindahl-laptop.dnsalias.net
1447f6318f Fixes to tests and test results. 2007-06-19 11:09:22 +02:00
tomas@whalegate.ndb.mysql.com
6a51e0f8a2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-18 23:55:48 +02:00
tomas@whalegate.ndb.mysql.com
f3a7284521 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-18 23:49:30 +02:00
tomas@whalegate.ndb.mysql.com
55c6e7b142 check for different error message 2007-06-18 17:57:16 +02:00
pekka@clam.ndb.mysql.com/ndb13.mysql.com
405f6a1681 ndb - bug#29176 missing stack pruning in drop_page 2007-06-18 16:03:41 +02:00
tomas@whalegate.ndb.mysql.com
7d4467766f correction 2007-06-18 15:41:02 +02:00
tomas@whalegate.ndb.mysql.com
e5565db7c6 Bug #28989 hpux11 ps_row warnings 
- also remove printout for error 4009
 2007-06-18 15:38:37 +02:00
tomas@whalegate.ndb.mysql.com
1c15d3e1a1 fixes Bug #25305 (and several other similar test tailures with the same symptom) 
- make tests wait until ndb connects properly
 2007-06-18 15:36:10 +02:00
mats@kindahl-laptop.dnsalias.net
07774f97e5 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
 2007-06-18 12:44:21 +02:00
lars/lthalmann@dl145k.mysql.com
431067573d Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-18 12:12:27 +02:00
lars/lthalmann@dl145h.mysql.com
a2d93c53db Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-18 12:10:36 +02:00
lars/lthalmann@dl145j.mysql.com
721c3ea5e5 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-18 12:05:17 +02:00
lars/lthalmann@dl145h.mysql.com
c5c624a752 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-18 12:02:39 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
135a98309c Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-06-18 12:02:03 +02:00
mats@kindahl-laptop.dnsalias.net
5e4137730c Fixes to make team-tree green. 2007-06-18 11:29:32 +02:00
lars/lthalmann@dl145j.mysql.com
ae52876fd0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-18 09:42:22 +02:00
lars/lthalmann@dl145j.mysql.com
519e26e801 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-18 09:33:43 +02:00