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
44754 commits 2793 branches 343 tags 1.7 GiB
Commit graph

13344 commits

Author SHA1 Message Date
lars/lthalmann@dl145j.mysql.com
f6f848b9e7 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-31 00:17:12 +02:00
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
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
istruewing@chilla.local
8ad2472e24 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-30 12:33:44 +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)
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.
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
tomas@whalegate.ndb.mysql.com
d10de8e783 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-29 14:18:22 +02:00
tomas@whalegate.ndb.mysql.com
ca5f4f4642 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-29 14:15:19 +02:00
tomas@whalegate.ndb.mysql.com
3129179178 Bug #27378 update becomes delete on slave 
- quick workaround, better patch is needed later
 - test case
 2007-03-29 14:14:42 +02: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
joerg@trift-lap.fambruehe
4507c6757a Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-03-29 09:41:39 +02:00
istruewing@chilla.local
d0ad6cd45b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-29 08:36:57 +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
kent@kent-amd64.(none)
082de779b3 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-28 22:50:43 +02: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
istruewing@chilla.local
3f0bfd831a Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-28 17:06:09 +02:00
istruewing@chilla.local
20bb4ae8cf Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-28 16:59:09 +02:00
istruewing@chilla.local
350c5da724 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-28 16:57:08 +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
serg@janus.mylan
52ca332600 Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0-build 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-build
 2007-03-28 15:47:48 +02:00
istruewing@chilla.local
9470f149b6 After merge fix 2007-03-28 12:11:44 +02:00
istruewing@chilla.local
a2d7a05f88 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-03-28 10:25:51 +02:00
istruewing@chilla.local
1201f653e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-03-28 10:20:46 +02:00
tomas@whalegate.ndb.mysql.com
5f1abd8c6b Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes 
- test case
 2007-03-28 10:10:27 +02:00
istruewing@chilla.local
fd8ebd5657 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-03-28 08:59:30 +02:00
istruewing@chilla.local
2ce22c3f6f Merge chilla.local:/home/mydev/mysql-4.1-bug26231 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-03-28 08:57:46 +02:00
istruewing@chilla.local
bba96f35c8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug24985
 2007-03-28 08:51:12 +02:00
istruewing@chilla.local
e5f50abcd9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug24985
 2007-03-27 21:19:25 +02: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
tomas@whalegate.ndb.mysql.com
960bfa1768 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-27 18:11:48 +02:00
istruewing@chilla.local
f90c056b5c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug24985
 2007-03-27 17:59:49 +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
istruewing@chilla.local
49884979b4 Merge chilla.local:/home/mydev/mysql-5.0-bug24985 
into  chilla.local:/home/mydev/mysql-5.1-bug24985
 2007-03-27 12:46:54 +02:00
istruewing@chilla.local
01be61e307 Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE 
causes incorrect duplicate entries
After merge fix
 2007-03-27 12:39:31 +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
istruewing@chilla.local
ef1dec00c4 Merge chilla.local:/home/mydev/mysql-4.1-bug24985 
into  chilla.local:/home/mydev/mysql-5.0-bug24985
 2007-03-27 10:54:37 +02:00
istruewing@chilla.local
8934e4f3cc Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE 
causes incorrect duplicate entries

Keys for BTREE indexes on ENUM and SET columns of MEMORY tables
with character set UTF8 were computed incorrectly. Many
different column values got the same key value.

Apart of possible performance problems, it made unique indexes
of this type unusable because it rejected many different
values as duplicates.

The problem was that multibyte character detection was tried
on the internal numeric column value. Many values were not
identified as characters. Their key value became blank filled.

Thanks to Alexander Barkov and Ramil Kalimullin for the patch,
which sets the character set of ENUM and SET key segments to
the pseudo binary character set.
 2007-03-27 10:49:48 +02: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
tomas@whalegate.ndb.mysql.com
2923b52e38 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-26 21:02:14 +02:00