mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47783 commits 2785 branches 343 tags 1.6 GiB
Commit graph

14489 commits

Author SHA1 Message Date
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
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
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
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
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@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
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@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
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
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
kostja@bodhi.(none)
9ff8e6d7b5 Fix a typo. 2007-06-20 14:04:53 +04: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
mats@kindahl-laptop.dnsalias.net
5dd26788cc Some test case fixes. 2007-06-19 22:18:16 +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
mats@kindahl-laptop.dnsalias.net
1447f6318f Fixes to tests and test results. 2007-06-19 11:09:22 +02:00
thek@adventure.(none)
a0b8394c23 Merge adventure.(none):/home/thek/Development/cpp/bug28211/my51-bug28211 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-06-19 09:13:17 +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
thek@adventure.(none)
2da91b2316 Bug#28211 RENAME DATABASE and query cache don't play nicely together 
When all table blocks were removed from the query cache the client session
hung in a tight loop waiting on an impossible condition while consuming a lot
of CPU.

This patch also corrects an error which caused valid tables to sometimes be
removed from the query cache.
 2007-06-18 17:46:29 +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@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@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
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
tomas@whalegate.ndb.mysql.com
4547957450 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 22:06:34 +02:00
tomas@whalegate.ndb.mysql.com
8a08ac40fb correct test and result 2007-06-17 22:04:01 +02:00
tomas@whalegate.ndb.mysql.com
8eb940de27 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 19:52:01 +02:00
tomas@whalegate.ndb.mysql.com
b5f30a99f9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-06-17 19:50:07 +02:00
tomas@whalegate.ndb.mysql.com
9c5183ace9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 19:28:01 +02:00
tomas@whalegate.ndb.mysql.com
9e3c14fae3 BUG#27640 
- correct test and result file
 2007-06-17 19:27:20 +02:00
tomas@whalegate.ndb.mysql.com
830be6deac Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 17:21:27 +02:00
tomas@whalegate.ndb.mysql.com
95ed412809 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 16:26:35 +02:00