mskold/marty@mysql.com/linux.site
93fda180d1
Bug#24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld: Added test case
2006-12-07 15:49:59 +01:00
svoj@mysql.com/april.(none)
e17d7bce00
BUG#23404 - ROW_FORMAT=FIXED option is lost is an index is added to the
...
table
ROW_FORMAT option is lost during CREATE/DROP INDEX.
This fix forces CREATE/DROP INDEX to retain ROW_FORMAT by instructing
mysql_alter_table() that ROW_FORMAT is not used during creating/dropping
indexes.
2006-12-07 18:32:40 +04:00
cbell/Chuck@suse.vabb.com
ab2d6dcd65
Merge suse.vabb.com:/home/Chuck/development/mysql-5.1-new-rpl
...
into suse.vabb.com:/home/Chuck/development/mysql-5.1_WL_3618
2006-12-07 09:19:56 -05:00
cbell/Chuck@suse.vabb.com
9f36c1c286
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
...
Please see worklog for details on files changed.
2006-12-07 09:18:35 -05:00
andrey@example.com
c24381bdaa
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/mysql-5.1-maint
2006-12-07 13:58:56 +01:00
andrey@example.com
12a68db3d3
Additional fix for bug#22369
2006-12-07 13:57:39 +01:00
holyfoot/hf@deer.(none)
883aa8d980
Merge mysql.com:/home/hf/work/pfix/my50-pfix
...
into mysql.com:/home/hf/work/pfix/my51-pfix
2006-12-07 15:23:39 +04:00
holyfoot/hf@mysql.com/deer.(none)
4f0c9c431c
merging fix
2006-12-07 15:22:43 +04:00
holyfoot/hf@mysql.com/deer.(none)
41bd03c370
merging
2006-12-07 13:38:16 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
b66f34bd19
Bug#22645 LC_TIME_NAMES: Statement not replicated
...
Implementing event based replication of LC_TIME_NAMES for 5.0
(as a replacement of previously made ONE_SHOT replication)
2006-12-07 09:31:53 +04:00
holyfoot/hf@deer.(none)
dfff2c27bc
Merge mysql.com:/home/hf/work/22372/my50-22372
...
into mysql.com:/home/hf/work/22372/my51-22372
2006-12-07 09:27:47 +04:00
holyfoot/hf@mysql.com/deer.(none)
9203d43427
merging
2006-12-07 09:11:56 +04:00
msvensson@neptunus.(none)
961275a356
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-06 23:45:09 +01:00
holyfoot/hf@mysql.com/deer.(none)
9e52ef1f9d
Merge mysql.com:/home/hf/work/22372/my41-22372
...
into mysql.com:/home/hf/work/22372/my50-22372
2006-12-06 22:02:39 +04:00
holyfoot/hf@mysql.com/deer.(none)
f404488d29
bug #22372
...
datafile added to be used in gis.test
2006-12-06 21:47:29 +04:00
holyfoot/hf@mysql.com/deer.(none)
e83c682fb7
bug #22372 (LOAD DATA crashes the table with the geometry field)
...
The problem is that the GEOMETRY NOT NULL can't automatically set
any value as a default one. We always tried to complete LOAD DATA
command even if there's not enough data in file. That doesn't work
for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign
and it's checked in mysql_load()
2006-12-06 21:45:57 +04:00
msvensson@neptunus.(none)
8022e9fcce
Adjust replace to mask win paths
2006-12-06 16:44:31 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0b5696b82b
Fix for bug #22533 : Traditional: Too-long bit value not rejected.
...
Problem: storing >=8 byte hexadecimal values we don't check data.
Fix: check if the data fits the {u}longlong range.
2006-12-06 16:32:12 +04:00
holyfoot/hf@deer.(none)
4e3530626f
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/mysql-5.1.20835
2006-12-06 12:56:11 +04:00
msvensson@neptunus.(none)
7cb305ca77
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-05 19:56:49 +01:00
msvensson@neptunus.(none)
be212d3486
Remove hack that removes vardir
2006-12-05 19:13:31 +01:00
msvensson@neptunus.(none)
a507459762
Merge bk-internal:/home/bk/mysql-4.1-build
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-05 19:12:12 +01:00
mskold/marty@mysql.com/linux.site
cade196631
New result
2006-12-05 15:52:31 +01:00
bar@bar.intranet.mysql.r18.ru
293a356277
Merge mysql.com:/usr/home/bar/mysql-5.0.b22645
...
into mysql.com:/usr/home/bar/mysql-5.1.b22645
2006-12-05 16:09:27 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
7c1b675e72
Merging bug#22645 "LC_TIME_NAMES: Statement not replicated" from 4.1.
2006-12-05 16:01:21 +04:00
msvensson@neptunus.(none)
04ae69850f
Update rsult file after merge, error message number increased
2006-12-05 12:18:33 +01:00
msvensson@neptunus.(none)
ea49384d2e
mysql.binlog_index renamed to mysql.ndb_binlog_index
2006-12-05 11:27:51 +01:00
msvensson@neptunus.(none)
58baec3f76
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-05 11:18:00 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
58149eaf61
Merge mysql.com:/usr/home/bar/mysql-4.1.b22645
...
into mysql.com:/usr/home/bar/mysql-5.0.b22645
2006-12-05 14:08:19 +04:00
msvensson@neptunus.(none)
23a059b224
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-05 10:54:17 +01:00
df@kahlann.erinye.com
a5fe05f0f8
fix test cases after change to error messages file
2006-12-05 10:51:30 +01:00
mats@romeo.(none)
033516c571
BUG#24490 (segfault inside unpack_row at Field_bit_as_char::set_default()):
...
Field_bit::set_default() did not check the bit_len, hence used the undefined
bit_ptr, causing a crash. The patch adds a check that bit_len > 0 before
following the bit_ptr.
2006-12-05 10:46:03 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
224660d14a
Bug#22645 LC_TIME_NAMES: Statement not replicated
...
Problem: replication of LC_TIME_NAMES didn't work.
Thus, INSERTS or UPDATES using date_format() always
worked with en_US on the slave side.
Fix: adding ONE_SHOT implementation for LC_TIME_NAMES.
2006-12-05 13:45:21 +04:00
df@kahlann.erinye.com
5c6d74c258
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-12-05 10:07:11 +01:00
df@kahlann.erinye.com
41a2a6080c
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-05 10:05:15 +01:00
df@kahlann.erinye.com
6541302bb2
re-enable multiple test runs in sequence for 4.1 on non-windows
2006-12-05 10:03:24 +01:00
mskold/marty@mysql.com/linux.site
f8bd5d312b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-05 06:38:08 +01:00
andrey@example.com
6fd50a5ff6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug22369-v2/my51
2006-12-05 00:31:23 +01:00
thek@kpdesk.mysql.com
57f78d4ddc
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint
2006-12-04 23:51:54 +01:00
Kristofer.Pettersson@naruto.
9036b003d6
Merge kpettersson@bk-internal:/home/bk/mysql-5.1-new-maint
...
into naruto.:C:/cpp/mysql-5.1-maint
2006-12-04 22:55:44 +01:00
Kristofer.Pettersson@naruto.
6c4c315210
Disabled testcase flush2 until pushbild framework can handle test which
...
disables binlog.
2006-12-04 22:51:52 +01:00
thek@kpdesk.mysql.com
05410c7db8
Disabled flush2 until pushbuild framework can handle test which
...
disables binlog.
2006-12-04 22:46:12 +01:00
andrey@example.com
05f61b2493
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug22369-v2/my51
2006-12-04 22:40:51 +01:00
iggy@rolltop.ignatz42.dyndns.org
e0eed3a34b
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-12-04 15:33:53 -05:00
iggy@rolltop.ignatz42.dyndns.org
f427935804
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-12-04 15:32:16 -05:00
iggy@rolltop.ignatz42.dyndns.org
50222ce9ff
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-12-04 15:30:55 -05:00
istruewing@chilla.local
70e56f06cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-04 20:56:37 +01:00
msvensson@neptunus.(none)
0879aeae0c
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 20:02:48 +01:00
tsmith/tim@siva.hindu.god
17a5c4d177
Apply malff@weblab.(none) fix for bug 24736 directly to
...
mysql-5.1-build tree, in order to get it into mysql-5.1
faster. See comments from Marc's original push for
patch details.
2006-12-04 11:38:40 -07:00
msvensson@neptunus.(none)
128b73fc36
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:28:38 +01:00