df@kahlann.erinye.com
75c7114124
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-07 16:07:14 +01:00
df@kahlann.erinye.com
19ec379b15
do not autorelease build ids when a child of mysql-test-run.pl dies
2006-12-07 16:06:29 +01:00
mskold/marty@mysql.com/linux.site
072133459f
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
2006-12-07 15:59:15 +01:00
mskold/marty@mysql.com/linux.site
84a8d1759b
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-07 15:54:43 +01:00
mskold/marty@mysql.com/linux.site
8fa5f366f7
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-12-07 15:51:16 +01:00
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
holyfoot/hf@mysql.com/deer.(none)
4f0c9c431c
merging fix
2006-12-07 15:22:43 +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@mysql.com/deer.(none)
9203d43427
merging
2006-12-07 09:11:56 +04: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
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
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)
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
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
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
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
thek@kpdesk.mysql.com
05410c7db8
Disabled flush2 until pushbuild framework can handle test which
...
disables binlog.
2006-12-04 22:46:12 +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
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
msvensson@neptunus.(none)
877c037ac6
mysql-test-run.pl: Append .nlm to the binary name on NetWare
2006-12-04 19:15:09 +01:00
msvensson@neptunus.(none)
db3a21e75b
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:08:52 +01:00
msvensson@neptunus.(none)
33c248eee5
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:06:42 +01:00
istruewing@chilla.local
098abfadd0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-04 19:03:01 +01:00
msvensson@neptunus.(none)
a9f4f4ed11
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:01:31 +01:00
gkodinov@dl145s.mysql.com
d253588c69
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0
2006-12-04 18:05:42 +01:00
mskold/marty@mysql.com/linux.site
6e8f99d29b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-04 15:09:47 +01:00
Kristofer.Pettersson@naruto.
f91e48c762
Merge naruto.:C:/cpp/bug17733/my50-bug17733
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-12-04 14:43:34 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c99556d5d4
fix for bug #23938 : ISNULL on DATE AND CAST AS DATE returns false for null values
...
Set null_value in case of wrong data.
2006-12-04 17:06:25 +04:00
gkodinov/kgeorge@macbook.gmz
2a9edce6f6
type_varchar.result:
...
fixed a valgrind problem
2006-12-04 14:29:51 +02:00
gkodinov/kgeorge@macbook.gmz
063fe51c69
item_func.cc:
...
fixed a valgrind warning
type_varchar.test:
fixed a valgrind warning
2006-12-04 14:26:05 +02:00
anozdrin/alik@booka.
a9e1563fa4
Use standard shell instead of BASH.
2006-12-04 14:05:27 +03:00
andrey@example.com
b5e44560f6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug24395-v2/my50
2006-12-02 00:30:10 +01:00
andrey@example.com
b275089b66
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into example.com:/work/bug24395-v2/my41
2006-12-01 23:11:44 +01:00
istruewing@chilla.local
763fdea487
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-01 18:49:20 +01:00
istruewing@chilla.local
341bd06408
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-01 18:38:08 +01:00
thek@kpdesk.mysql.com
94b48caf2e
Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-12-01 18:00:45 +01:00
df@kahlann.erinye.com
da7820c37d
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-01 13:02:54 +01:00
thek@kpdesk.mysql.com
b201d4ef93
Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS"
...
- Refactoring of duplicate code
- Modified bad test cases
- Changed expected error when operating on information_schema.
2006-12-01 12:50:57 +01:00
df@kahlann.erinye.com
e6a2d18421
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2006-12-01 10:36:42 +01:00