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

47761 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
kostja@bodhi.(none)
7758a5de33 Enable the disabled test case for Bug#28075 (pushbuild by now 
should be fixed).
 2007-06-20 19:14:59 +04:00
kostja@bodhi.(none)
72ff5488be Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-06-20 19:05:38 +04: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
kostja@bodhi.(none)
a1fefd4e8d Disable randomly failing tests: 
rpl_udf -- Bug#28993 rpl_udf test causes server crash and valgrind
warning in pushbuild
rpl_ndb_circular -- Bug#29233 rpl_ndb_circular fails randomly
ndb_dd_sql_features -- Bug#29102 ndb_dd_sql_features fails in
pushbuild
 2007-06-20 16:05:57 +04: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
kostja@bodhi.(none)
9ff8e6d7b5 Fix a typo. 2007-06-20 14:04:53 +04: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
kostja@bodhi.(none)
4fd8158456 Fix a merge mistake. 2007-06-19 18:04:42 +04: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
kostja@bodhi.(none)
68632318dc Manual merge. 2007-06-19 15:02:08 +04:00
kostja@bodhi.(none)
325b8835c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-06-19 14:53:13 +04: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