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

16992 commits

Author SHA1 Message Date
mleich@four.local.lan
5533e6e533 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddlx
 2007-03-30 20:50:14 +02:00
cbell/Chuck@mysql_cab_desk.
cc1fd3db10 This patch adds IF EXISTS to the drop of start_n_end to avoid a problem on 
some build machines during testing.
 2007-03-30 12:25:39 -04:00
cbell/Chuck@mysql_cab_desk.
5eb8096700 This patch includes modification to the rpl_events test to limit 
the SELECT in the test to only the expected rows. This helps
eliminate the possibility of spurious rows causing the test to
fail.
 2007-03-30 12:16:48 -04:00
cbell/Chuck@mysql_cab_desk.
c86d40617e Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_kostja
 2007-03-30 11:39:45 -04:00
cbell/Chuck@mysql_cab_desk.
73ded84c0a WL#3629 - Replication of Invocation and Invoked Features 
This patch removes the SLAVESIDE_DISABLED token from the event status clause
and adds the ability to mark an event as status = SLAVESIDE_DISABLED by using
the syntax DISABLE ON SLAVE instead.

The patch also adds tests to rpl_events to check the new syntax.
 2007-03-30 11:08:19 -04:00
mleich@four.local.lan
12ca4150df Merge four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddl 
into  four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddlx
 2007-03-30 15:48:52 +02:00
mats@romeo.(none)
4710d3df33 WL#3464 (Add replication event to denote gap in replication): 
Fixing automerge problem and updating comments referring to exec_event().
 2007-03-30 15:29:30 +02:00
mats@romeo.(none)
121f29a541 Patching tests to make them pass on all platforms. 2007-03-30 14:05:34 +02:00
mats@romeo.(none)
083deb4382 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
 2007-03-30 10:35:37 +02:00
mats@romeo.(none)
82c71a60f7 - Fixing binary log positions 
- Eliminating some compiler warnings
 2007-03-30 10:27:08 +02:00
bar@bar.myoffice.izhnet.ru
0a3a898c9d Merge mysql.com:/home/bar/mysql-5.0.b22638 
into  mysql.com:/home/bar/mysql-5.1.test
 2007-03-30 12:11:21 +05:00
bar@mysql.com
f685ae0758 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b22638
 2007-03-30 11:36:09 +05:00
mats@romeo.(none)
1694f98859 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  romeo.(none):/home/bkroot/mysql-5.1-rpl
 2007-03-30 04:49:06 +02:00
mats@romeo.(none)
55dd7f8bd8 Post merge fixes of result files. 2007-03-30 04:44:49 +02:00
cbell/Chuck@mysql_cab_desk.
b41603e6b9 Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_test
 2007-03-29 16:54:16 -04:00
cbell/Chuck@mysql_cab_desk.
c7c1b341f7 WL#3629 - Replication of Invocation and Invoked Features 
This patch changes test to remove Windows-specific limitations and potential
rounding errors in the calculation of a UDF.

Also corrects a minor merge conflict.
 2007-03-29 16:43:00 -04:00
mats@romeo.(none)
b463c78218 Post-merge patch. 2007-03-29 22:32:28 +02:00
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
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
cbell/Chuck@mysql_cab_desk.
0322284f92 WL#3629 - Replication of Invocation and Invoked Features 
This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command
for a series of tests.

The only code change is to correct references to the classname in
enums.
 2007-03-29 11:11:28 -04: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
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
lars/lthalmann@mysql.com/dl145k.mysql.com
f02726e72a post-merge test fixes 2007-03-29 14:21:44 +02:00
cbell/Chuck@mysql_cab_desk.
89838e1008 WL#3629 - Replication of Invocation and Invoked Features 
This patch corrects errors that occurred in a local manual merge as a result
of updating the local repository and includes changes necessary to correct 
problems found during the recalculation of next execution of events in RBR.
 2007-03-29 08:17:19 -04: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
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
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
bar@mysql.com
6d290278cc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b27079
 2007-03-29 10:19:45 +05:00
baker@bk-internal.mysql.com
1b9c4358a8 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-03-28 22:31:10 +02:00
bar@mysql.com
4b3826ba8c Bug#22638 SOUNDEX broken for international characters 
Problem: SOUNDEX returned an invalid string for international
characters in multi-byte character sets.
For example: for a Chinese/Japanese 3-byte long character
_utf8 0xE99885 it took only the very first byte 0xE9,
put it into the outout string and then appended with three 
DIGIT ZERO characters, so the result was 0xE9303030 - which
is an invalide utf8 string.
Fix: make SOUNDEX() multi-byte aware and - put only complete
characters into result, thus return only valid strings.
This patch also makes SOUNDEX() compatible with UCS2.
 2007-03-28 18:57:30 +05:00
bar@bar.myoffice.izhnet.ru
f418475eec Merge mysql.com:/home/bar/mysql-5.0.b25946 
into  mysql.com:/home/bar/mysql-5.1.b25946
 2007-03-28 15:12:25 +05:00
baker@bk-internal.mysql.com
2bfa1aa3d6 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-03-27 18:44:02 +02:00
tomas@whalegate.ndb.mysql.com
c86293e41e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-27 18:12:33 +02:00
mats@romeo.(none)
c9a7855f7f BUG#22583 (RBR between MyISAM and non-MyISAM tables containing a BIT 
field does not work):

Enabling previously disabled test.
 2007-03-27 17:21:47 +02:00
mats@romeo.(none)
06b5e9bb53 BUG#27441 (There is no COLS bitmap for the after image of an update 
rows event):

Adding a after image COLS bitmap to Update_rows_log_event (for telling
what columns that are present in the after image of each row update).

Also fixing case where Rows_log_event length was not correctly computed
(happened when the number of columns in a table was more than 251).
 2007-03-27 12:17:51 +02:00
joerg@trift-lap.fambruehe
336f03d151 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-03-27 12:06:13 +02:00
bar@mysql.com
5e52cd3650 Bug#25946 Namespace not include for xsi usage within --xml output with null/nil values 
Fix: adding namespace reference into "mysql --xml" output,
to make it work similary to "mysqldump --xml".
 2007-03-27 13:30:43 +05:00
bar@mysql.com
1b426d3c6d Bug#27079 Crash while grouping empty ucs2 strings 
Problem: GROUP BY on empty ucs2 strings crashed server.
Reason: sometimes mi_unique_hash() is executed with
ptr=null and length=0, which means "empty string".
The branch of code handling UCS2 character set
was not safe against ptr=null and fell into and
endless loop even if length=0 because of poiter
arithmetic overflow.
Fix: adding special check for length=0 to avoid pointer arithmetic
overflow.
 2007-03-27 12:20:20 +05:00
tomas@whalegate.ndb.mysql.com
1bae3e5726 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-26 21:13:46 +02:00
cbell/Chuck@mysql_cab_desk.
71c4bd1f0a 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-26 09:57:16 -04:00
brian@zim.(none)
68cdfea52a Merge zim.(none):/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/slap-5.1
 2007-03-26 02:29:09 -07:00
brian@zim.(none)
9a2a7071be Added pre and post option to test run (allows me to adjust an engine once all of the data has been loaded). 
Kinda obvious that this was going to come up ;)
 2007-03-26 02:24:49 -07:00
mats@romeo.(none)
6269e4f216 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b22583-mysql-5.1-new-rpl
 2007-03-26 09:02:38 +02:00
pekka@clam.(none)
5f061a7e5c Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
 2007-03-25 15:06:19 +02:00
tomas@whalegate.ndb.mysql.com
ac0da397db rpl_ndb_sync.result, ndb_partition_key.result: 
test case
 2007-03-23 21:49:49 +01:00
baker@bk-internal.mysql.com
503d7b20cb Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-03-23 20:25:36 +01:00
joerg@trift2.
751531fca7 mysql-test/t/query_cache_sql_prepare.test : Prevent this test from running in "embedded". 2007-03-23 17:31:10 +01:00
tomas@whalegate.ndb.mysql.com
972837350b result file updates, message format changes 2007-03-23 17:22:52 +01:00
tomas@whalegate.ndb.mysql.com
78dce2dd97 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 17:17:44 +01:00
tomas@whalegate.ndb.mysql.com
41dfbb6f2b enabled and extended single user test 2007-03-23 17:14:38 +01:00