df@pippilotta.erinye.com
1b26de73d5
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-05-02 19:25:14 +02:00
df@pippilotta.erinye.com
39e98943f9
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-02 19:21:50 +02:00
df@pippilotta.erinye.com
5d97bc653e
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-05-02 19:21:12 +02:00
df@pippilotta.erinye.com
765b6f5572
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-cmake-map-files
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-02 19:19:46 +02:00
df@pippilotta.erinye.com
45df7b36b2
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-cmake-map-files
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-05-02 19:16:35 +02:00
joerg@trift2.
2df354dcbe
Merge trift2.:/MySQL/M51/spec-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-05-02 17:41:15 +02:00
joerg@trift2.
489da2252c
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-05-02 17:19:30 +02:00
joerg@trift2.
0db7e9c4f1
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-05-02 17:15:48 +02:00
joerg@trift2.
11484e3319
"ndb_size.tmpl" is gone (NDB change 2007-04-24), so remove it from the spec file.
2007-05-02 17:10:41 +02:00
joerg@trift2.
8a08eec81a
Merge trift2.:/MySQL/M50/spec-5.0
...
into trift2.:/MySQL/M51/spec-5.1
2007-05-02 16:57:58 +02:00
joerg@trift2.
fc8b2783f0
Merge trift2.:/MySQL/M41/spec-4.1
...
into trift2.:/MySQL/M50/spec-5.0
2007-05-02 16:53:54 +02:00
joerg@trift2.
f32c261973
RPM spec file error: Trailing '*' to cover '.gz' for a man page was missing.
2007-05-02 16:51:15 +02:00
omer@linux.site
4dac41dcad
Coeection to the bug format to for better search - review comment
2007-05-02 07:50:47 -07:00
df@pippilotta.erinye.com
971992ea9a
generate map files on windows
2007-05-02 15:50:08 +02:00
joerg@trift2.
6ee2fa0ff5
Manual merge: Makefile lines must start with tab, not blank.
2007-05-02 14:16:21 +02:00
joerg@trift2.
f486530d2d
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M51/mysql-5.1
2007-05-02 14:08:43 +02:00
joerg@trift2.
bb2996f487
Format corrections for various "Makefile.am": Leading tab, no trailing blank.
2007-05-02 14:01:49 +02:00
mskold/marty@linux.site
3fa2a53e67
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-05-02 12:48:35 +02:00
mskold/marty@mysql.com/linux.site
c2e71d1804
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-05-02 12:43:17 +02:00
mskold/marty@mysql.com/linux.site
805fabeda6
ha_ndbcluster.cc:
...
Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values
2007-05-02 12:31:53 +02:00
mskold/marty@linux.site
2b938b5700
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-05-02 11:05:48 +02:00
mskold/marty@mysql.com/linux.site
f6e28f2879
ndb_insert.test, ndb_insert.result, ha_ndbcluster.cc:
...
Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values
2007-05-02 10:02:27 +02:00
igor@olga.mysql.com
1a0cf6db7c
Fixed bug #28188 : performance degradation for outer join queries to which
...
'not exists' optimization is applied.
In fact 'not exists' optimization did not work anymore after the patch
introducing the evaluate_join_record function had been applied.
Corrected the evaluate_join_record function to respect the 'not_exists'
optimization.
2007-05-01 23:34:14 -07:00
tsmith@quadxeon.mysql.com
b4b44b0b6b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-01 20:07:37 +02:00
tsmith@quadxeon.mysql.com
fc7fea0cc3
mysql-test-run.pl:
...
Run master init scripts also for --embedded-server
2007-05-01 20:05:09 +02:00
tsmith@quadxeon.mysql.com
b0007916c2
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-01 18:13:29 +02:00
tsmith@quadxeon.mysql.com
90468a7274
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-05-01 18:12:04 +02:00
omer@linux.site
d276ff0cf6
Updates to test/result files of funcs_1 to 5.0.40 level,
...
- validated current result files
- forced order by and removed time stamps
removed a_version files (since do not make sense now when suite is in the main tree)
Note: datadict tests still fail as a result of regression bug 28181 in 5.0.42 (discovered
while performing this update) - tests should run clean once bug is fixed
2007-05-01 06:52:23 -07:00
tomas@whalegate.ndb.mysql.com
2a4a7ffde2
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-01 13:24:30 +02:00
holyfoot/hf@hfmain.(none)
9bdfe876a9
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-01 16:02:53 +05:00
tsmith@quadxeon.mysql.com
1462967aba
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-01 12:42:22 +02:00
tsmith@quadxeon.mysql.com
91a5830729
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-05-01 12:40:43 +02:00
holyfoot/hf@hfmain.(none)
53cdf37af1
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-01 13:38:59 +05:00
tsmith@quadxeon.mysql.com
13cfd9471d
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-01 10:38:19 +02:00
tsmith@quadxeon.mysql.com
9aad848a86
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-01 06:30:48 +02:00
tsmith@quadxeon.mysql.com
6dbfd2156e
Fix braindead bad merge of mysqldump test.
2007-05-01 06:29:34 +02:00
dkatz@damien-katzs-computer.local
73fe16cbfd
Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into damien-katzs-computer.local:/Users/dkatz/mysql50
2007-04-30 17:51:57 -04:00
dkatz@damien-katzs-computer.local
33f8677d88
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/mysql51
2007-04-30 17:47:58 -04:00
tsmith@quadxeon.mysql.com
e267f900a2
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-04-30 23:33:32 +02:00
tsmith@quadxeon.mysql.com
f440e299e1
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-04-30 23:32:13 +02:00
tsmith@quadxeon.mysql.com
44af4144e6
Bug #27653 : Temp table can't be created if lower_case_table_names=1 and
...
tmpdir has uppercase
Fix: don't convert mysql_tmpdir to lower case when building the path to a
temporary table
2007-04-30 23:16:46 +02:00
dkatz@damien-katzs-computer.local
b578abc0c1
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50_frm_files
2007-04-30 17:04:14 -04:00
joerg@trift2.
5ab7eb6a69
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into trift2.:/MySQL/M51/netware-cross-5.1
2007-04-30 20:39:37 +02:00
joerg@trift2.
331902b792
Merge trift2.:/MySQL/M50/netware-cross-5.0
...
into trift2.:/MySQL/M51/netware-cross-5.1
2007-04-30 20:29:57 +02:00
joerg@trift2.
8b0f68331b
Necessary change for cross-builds: Include "mysql_fix_privilege_tables_sql.c" in the source tarball.
2007-04-30 17:01:00 +02:00
holyfoot/hf@hfmain.(none)
d71147a2c5
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/27123/my51-27123
2007-04-30 19:41:27 +05:00
tomas@whalegate.ndb.mysql.com
1e06586c90
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-30 16:31:08 +02:00
tomas@whalegate.ndb.mysql.com
dd58f5a461
shorten filenames
2007-04-30 16:24:13 +02:00
mskold/marty@linux.site
27ac6c19af
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-30 14:21:29 +02:00
mskold/marty@mysql.com/linux.site
da4f6b331e
Bug#27926 wrong month name in cluster error log
2007-04-30 14:17:08 +02:00