jimw@mysql.com
d33b03abef
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 12:06:20 -08:00
joerg@mysql.com
26ddd4fa45
config/ac-macros/ha_ndbcluster.m4 : Get back the message "Using NDB Cluster".
2006-02-15 21:04:42 +01:00
jimw@mysql.com
9b333dd393
Merge mysql.com:/home/jimw/my/mysql-5.1-16782
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 11:39:54 -08:00
jimw@mysql.com
246a2a7f0c
Merge mysql.com:/home/jimw/my/mysql-5.1-16775
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 11:36:45 -08:00
jimw@mysql.com
28a88a07ce
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 11:22:03 -08:00
jimw@mysql.com
e145908eb3
Bug #16782 : Partitions: crash, REPLACE .. on table with PK, DUPLICATE
...
KEY event. Partitioning wrongly claimed to be able to handle HA_DUPP_POS
when it was supported by the underlying storage engine, which resulted
in a crash when handling REPLACE statements.
2006-02-15 11:20:57 -08:00
msvensson@neptunus.(none)
12b23630db
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 20:16:33 +01:00
konstantin@mysql.com
99030e3f43
Fix the coding style in a few new files.
2006-02-15 21:08:44 +03:00
andrey@lmy004.
dbb1589130
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17289
2006-02-15 18:32:49 +01:00
jimw@mysql.com
469cd9c610
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-02-15 09:29:11 -08:00
jimw@mysql.com
ce766cfc30
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-02-15 09:13:56 -08:00
serg@serg.mylan
94e3b91d4e
fix 'make dist'
2006-02-15 17:26:22 +01:00
msvensson@devsrv-b.mysql.com
808ad6c738
Merge bk-internal:/home/bk/mysql-5.1-new
...
into devsrv-b.mysql.com:/space/magnus/my51-bug17386
2006-02-15 17:21:26 +01:00
msvensson@devsrv-b.mysql.com
65b455b593
Bug#17386 binlog interchangably contains engine= and type=
...
- Update result file and enable test
2006-02-15 17:19:40 +01:00
andrey@lmy004.
a0fc7b89d6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16410
2006-02-15 17:14:43 +01:00
andrey@lmy004.
32ae54bdbc
fix for bug#16410 (Events: CREATE EVENT is legal in a CREATE TRIGGER statement)
...
WL#1034 (Internal CRON)
(post-post-review updates)
2006-02-15 17:12:27 +01:00
jimw@mysql.com
e75a62aeae
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2006-02-15 07:36:33 -08:00
ingo@mysql.com
0248dea334
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 16:34:11 +01:00
serg@serg.mylan
c56d1c248e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-15 16:05:35 +01:00
ingo@mysql.com
c75e407905
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 15:16:11 +01:00
brian@zim.tangent.org
3195aef714
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/archive-5.1
2006-02-15 06:16:10 -08:00
ingo@mysql.com
5fa7f6b79d
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 14:40:39 +01:00
andrey@lmy004.
3bd895745c
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17289
2006-02-15 14:35:19 +01:00
msvensson@devsrv-b.mysql.com
4b18b5e786
Bug#17360 sp-code test case broken
...
- Change 94 to 95 according to Pem's instructions in bug report.
2006-02-15 14:12:36 +01:00
serg@serg.mylan
d5294e86bf
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-15 14:04:56 +01:00
msvensson@devsrv-b.mysql.com
eb97818627
Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000'
...
- Init sql_state in mysql_stmt_init
2006-02-15 13:45:03 +01:00
ndbdev@ndbmaster.mysql.com
c71c156c19
ndb dd - Fix includes
2006-02-15 13:20:17 +01:00
jonas@perch.ndb.mysql.com
e9d9261d63
ndb dd -
...
Fix bug in tsman undo
2006-02-15 13:20:15 +01:00
ingo@mysql.com
aa10c18a6e
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 13:02:24 +01:00
mskold@mysql.com
5e4df23c96
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
2006-02-15 12:52:30 +01:00
andrey@lmy004.
a01ed15419
cosmetic changes of the fix for bug#17289 (no privileges checks in EVENTS), before push
2006-02-15 12:14:23 +01:00
msvensson@neptunus.(none)
6a43d635c8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-15 12:03:36 +01:00
msvensson@neptunus.(none)
56ef2e28e4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 12:02:20 +01:00
gluh@eagle.intranet.mysql.r18.ru
544a1a98a5
Fix for bug#16907 Partitions: crash, SELECT goes into last partition, UNIQUE INDEX
...
In presense of subpartitioning use get_part_partition_id() to calculate part_id
2006-02-15 14:34:51 +04:00
mskold@mysql.com
64aa3861a4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
2006-02-15 11:19:45 +01:00
ingo@mysql.com
aa12184eda
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 10:56:13 +01:00
msvensson@neptunus.(none)
aacf783e86
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 10:53:25 +01:00
gluh@eagle.intranet.mysql.r18.ru
00fc4cabe5
Fix for bug#16901 Partitions: crash, SELECT, column of part. function=first column of primary key
...
use part_info->no_subparts to calculate partition range in case of subpartitions
2006-02-15 13:42:43 +04:00
brian@zim.tangent.org
d56430423a
This patch adds a new field to the meta file for tracking flushes (this is being kept to later do stats and determine how often the compression buffer is being foiled). This should keep things all nice an compatible between versions.
...
Also added a flush table test as well. Found one possible bug in OPTIMIZE TABLE which has never been reported, but I think it would be possible on a file system that ran out of disk.
2006-02-15 00:59:24 -08:00
ingo@mysql.com
4c1735186b
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 07:43:43 +01:00
stewart@mysql.com
e50298980c
BUG#17411 cannot have path longer than 128 characters
...
Use the POSIX limits.h define of PATH_MAX for maximum path length.
This has been being hit in pushbuild
2006-02-15 16:37:09 +11:00
jimw@mysql.com
a58c542e61
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-02-14 18:14:04 -08:00
jimw@mysql.com
d70c47b2a9
Merge mysql.com:/home/jimw/my/mysql-4.1-16389
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2006-02-14 18:12:30 -08:00
aelkin@mysql.com
e7c73bb754
Merge mysql.com:/home/elkin/MySQL/BARE/5.1-new
...
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new
2006-02-15 03:24:07 +02:00
brian@zim.tangent.org
1d3775a371
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-14 16:20:06 -08:00
aelkin@mysql.com
cb24989122
BUG#16217 merge
2006-02-15 02:19:42 +02:00
serg@serg.mylan
4e68f1ba3a
post-merge fixes for dbug
2006-02-15 00:14:37 +01:00
aelkin@mysql.com
3737486d56
Merge elkin@koti:MySQL/Merge/5.1-new/
...
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new
2006-02-15 01:08:02 +02:00
serg@serg.mylan
48b8e842ca
Automerge
2006-02-15 00:01:46 +01:00
andrey@lmy004.
9db6d13cc4
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17289
2006-02-14 23:35:13 +01:00