mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47784 commits 2781 branches 343 tags 1.6 GiB
Commit graph

47784 commits

This branch
This branch
All branches
Author SHA1 Message Date
skozlov/ksm@mysql.com/virtop.localdomain
d1ac082527 Bug#29363 2007-06-29 21:09:00 +04:00
tomas@poseidon.mysql.com
5d5b7ac244 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-28 07:08:37 +02:00
tomas@poseidon.mysql.com
644d360b2a check for blackhole 2007-06-28 07:06:25 +02:00
tomas@poseidon.mysql.com
a298b4c147 correct comment as bug is fixed 2007-06-28 00:52:05 +02:00
tomas@poseidon.mysql.com
b525ec4c96 WL#3303 
- wrong results checked in
 2007-06-28 00:49:54 +02:00
tomas@poseidon.mysql.com
30cf641ad8 Bug#29233 rpl_ndb_circular fails randomly 
- enabling test, duplicate bug, other bug fixed
 2007-06-27 23:58:18 +02:00
tomas@poseidon.mysql.com
efbe23a486 Bug #29222 Statement mode replicates both statement and rows when writing to an NDB table 
- only log statements locally (changes will not be logged on other servers)
 2007-06-27 22:33:03 +02:00
tomas@poseidon.mysql.com
f7a1a076c7 WL#3303 
- binlog should always run if opt_bin_log is set
 2007-06-27 22:28:18 +02:00
tomas@poseidon.mysql.com
934e946a0b WL#3303 
- correct includes
 2007-06-27 22:23:44 +02:00
tomas@host-72.homerun.telia.com
5de2bf9fe7 WL#3303 
- undoing disable of ndb tests
 2007-06-27 13:32:25 +02:00
tomas@host-72.homerun.telia.com
ba5b1f9cd6 correct include file 2007-06-27 11:31:07 +02:00
jonas@perch.ndb.mysql.com
c54681a48c Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-06-26 15:42:50 +02:00
jonas@perch.ndb.mysql.com
2411cbeecb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-06-26 15:20:19 +02:00
jonas@perch.ndb.mysql.com
0e753bbb47 ndb - bug#29331 (51) 
Add better handling of GCP Stop
    Only kill "offending" node
 2007-06-26 15:19:42 +02:00
pekka@ndb13.mysql.com
e033bd20a6 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51-gca 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug29176
 2007-06-25 09:16:43 +02:00
jonas@perch.ndb.mysql.com
ef74a65cf1 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-06-25 07:18:00 +02:00
jonas@perch.ndb.mysql.com
dfd8deebd5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-06-25 07:14:21 +02:00
jonas@perch.ndb.mysql.com
259810d458 ndb - post merge 50/51 - bug#29057 bug#29067 and bug#29118 2007-06-25 07:12:27 +02:00
jonas@perch.ndb.mysql.com
3c3b680764 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-06-25 07:09:53 +02:00
jonas@perch.ndb.mysql.com
2609e057eb ndb - bug#29057 bug#29067 and bug#29118 
Fix 3 problems in REDO validation that could(will) lead to "Error while reading REDO log"
 2007-06-25 07:05:25 +02:00
pekka@clam.ndb.mysql.com/ndb13.mysql.com
0946ceeb7d ndb - bug#29176 pgman: another missing stack pruning related to drop table 2007-06-24 22:14:09 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
bbcfb1801a updated for bug#28770 2007-06-22 17:05:14 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
93a82f5db1 After merge fix. 2007-06-22 18:32:06 +05:00
bar@bar.myoffice.izhnet.ru
66093b79a6 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28925 
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
 2007-06-22 17:40:02 +05:00
bar@bar.myoffice.izhnet.ru
3046e8f738 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b28925
 2007-06-22 17:28:26 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
aa0f7eec11 Bug#28925 GROUP_CONCAT inserts wrong separators for a ucs2 column 
Problem: separator was not converted to the result character set,
so the result was a mixture of two different character sets,
which was especially bad for UCS2.
Fix: convert separator to the result character set.
 2007-06-22 17:18:40 +05:00
mats@kindahl-laptop.dnsalias.net
ad065829f2 Fixes to replication team tree. 2007-06-22 07:32:39 +02:00
mats@kindahl-laptop.dnsalias.net
6821e5ca5d BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): 
Removing dead code.
 2007-06-22 02:27:18 +02:00
mats@kindahl-laptop.dnsalias.net
7606b0b962 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b28722-mysql-5.1-rpl
 2007-06-22 01:45:13 +02:00
mats@kindahl-laptop.dnsalias.net
406485ba6b 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-22 01:41:24 +02:00
mats@kindahl-laptop.dnsalias.net
f1ccdda0a0 BUG#28722 (Multi-engine statements on has_own_binlogging engine): 
Test fixes resulting from changed semantics.
 2007-06-22 01:39:23 +02:00
mats@kindahl-laptop.dnsalias.net
7672a81590 BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): 
Minor fixes to get proper detection of transaction isolation level when
inside external_lock().
 2007-06-22 01:08:26 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
cb2c31c54d select_ndb_apply_status.inc: 
new support file that I missed during last check ing, sorry
 2007-06-21 23:29:14 +02:00
jmiller/ndbdev@ndb08.mysql.com
128ac6c55f Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/data2/mysql-5.1-new-ndb
 2007-06-21 22:00:40 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
582047fc29 Many files: 
New test cases for generic apply status table
rpl_ndb_dd_advance.test:
  Updated test case to not run sooo long
show_binlog_using_logname.inc, tpcb_disk_data.inc:
  New support file 
rpl_ndb_dd_advance.result:
  Updated result
tpcb.inc:
  New support file for Updated test case to not run sooo long
 2007-06-21 21:58:59 +02:00
mats@kindahl-laptop.dnsalias.net
8e5d1784c9 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
 2007-06-21 21:35:26 +02:00
lars/lthalmann@dl145k.mysql.com
6e2ef9a6fa 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:23:13 +02:00
lars/lthalmann@dl145k.mysql.com
5c667b6fa5 Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-06-21 17:13:02 +02:00
lars/lthalmann@dl145j.mysql.com
d0e786b8e9 Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
 2007-06-21 17:10:35 +02:00
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
5491df5ae9 BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): 
Moving error generating code from table_flags() to external_lock().
 2007-06-21 14:02:46 +02:00
mats@kindahl-laptop.dnsalias.net
f6d876acf3 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b28722-mysql-5.1-rpl
 2007-06-21 13:52:56 +02:00
mats@kindahl-laptop.dnsalias.net
3975652cbc BUG#28722 (Multi-engine statements on has_own_binlogging engine): 
WL#3931 (Multi-table statement involving self-logging engines):

Adding logic to generate error if more than one engine is involved in
the statement and at least one engine is self-logging (i.e., has the
HA_HAS_OWN_BINLOGGING table flags set).
 2007-06-21 13:34:06 +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