knielsen@mysql.com
bf153b66a3
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-05-17 15:09:40 +02:00
joerg@mysql.com
f253fd3096
Merge mysql.com:/M50/tmp_merge into mysql.com:/M51/merge-5.1
2006-05-17 15:07:44 +02:00
rburnett@bk-internal.mysql.com
3f694eaea2
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-17 15:03:17 +02:00
knielsen@mysql.com
f82c39ce4b
After-merge fixes.
2006-05-17 15:01:48 +02:00
holyfoot@mysql.com
54a75ed1d5
Merge mysql.com:/home/hf/work/mysql-4.1.clean
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-17 18:01:05 +05:00
msvensson@neptunus.(none)
63da6af23e
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug18818/my50-bug18818
2006-05-17 14:51:50 +02:00
holyfoot@mysql.com
1d9f66393e
Merge mysql.com:/home/hf/work/mysql-5.1.14573
...
into mysql.com:/home/hf/work/mysql-5.1.mrg
2006-05-17 17:18:02 +05:00
holyfoot@mysql.com
2c6859d2bd
Merge bk@192.168.21.1:mysql-5.1-kt
...
into mysql.com:/home/hf/work/mysql-5.1.mrg
2006-05-17 17:16:05 +05:00
msvensson@neptunus.(none)
28cf106088
Merge bk-internal:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug18818/my41-bug18818
2006-05-17 14:14:54 +02:00
holyfoot@mysql.com
e5f04160d5
Merge bk@192.168.21.1:mysql-5.1-kt
...
into mysql.com:/home/hf/work/mysql-5.1.14573
2006-05-17 17:12:25 +05:00
msvensson@neptunus.(none)
f4567f9f92
BUG#18818 configure: No longer finds OpenSSL on Mac OS X
...
- Implement new switch --with-ssl to configure used for both bundled yaSSL or OpenSSL
2006-05-17 13:59:37 +02:00
pekka@mysql.com
e10998672b
Merge mysql.com:/space/pekka/ndb/version/my50-bug14509
...
into mysql.com:/space/pekka/ndb/version/my51-bug14509
2006-05-17 12:56:59 +02:00
pekka@mysql.com
54963c2e52
ndb - bug#14509 [related] re-do auto-incr error handling
2006-05-17 12:40:10 +02:00
gkodinov@mysql.com
9f9a76eb6e
Merge mysql.com:/home/kgeorge/mysql/5.0/tmp_merge
...
into mysql.com:/home/kgeorge/mysql/5.1/merge
2006-05-17 13:29:20 +03:00
tomas@poseidon.ndb.mysql.com
6fffa7b73a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-17 10:15:35 +02:00
tulin@production.mysql.com
132a631108
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/tulin/mysql-4.1
2006-05-17 09:34:55 +02:00
tomas@poseidon.ndb.mysql.com
0cb31d7d5f
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
2006-05-17 08:34:48 +02:00
igor@rurik.mysql.com
767d25dabd
Fixed bug #19573 .
...
The select statement that specified a view could be
slightly changed when the view was saved in a frm file.
In particular references to an alias name in the HAVING
clause could be substituted for the expression named by
this alias.
This could result in an error message for a query of
the form SELECT * FROM <view>. Yet no such message
appeared when executing the query specifying the view.
2006-05-16 22:19:44 -07:00
cmiller@zippy.(none)
593daae150
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-05-16 18:42:59 -04:00
tomas@poseidon.ndb.mysql.com
87303f2eaa
Merge tulin@production.mysql.com:mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-17 00:33:12 +02:00
tomas@poseidon.ndb.mysql.com
e23ea31b8b
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-17 00:28:33 +02:00
tomas@poseidon.ndb.mysql.com
37df8f14d8
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-17 00:27:19 +02:00
tomas@poseidon.ndb.mysql.com
ee75437891
Merge tulin@production.mysql.com:mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-05-17 00:25:51 +02:00
tomas@poseidon.ndb.mysql.com
4fd4e014aa
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-05-17 00:23:55 +02:00
tomas@poseidon.ndb.mysql.com
23be1988fc
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-17 00:23:40 +02:00
tomas@poseidon.ndb.mysql.com
9432143bee
ndb: added some missing error codes to mgmapi
...
ndb: ndb_waiter disconnect/reconnect on get status error
2006-05-17 00:22:43 +02:00
kent@mysql.com
9fca0d766b
mysql.spec.sh:
...
Removed Berkeley DB
configure.in:
Adjusted Netware support
basic.t.c:
Change for Netware
Makefile.am:
Use thread safe libmysqlclient_r if it was built
valgrind.supp:
Hide report about strlen/_dl_init_paths
ha_tina.cc:
Temporarely disable CSV engine on Netware,
as the engine depends on mmap()
net_serv.cc:
Include <sys/select.h> for Netware
2006-05-16 22:47:22 +02:00
tulin@production.mysql.com
4d0169c6f6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/tulin/mysql-4.1
2006-05-16 21:46:52 +02:00
tulin@production.mysql.com
b3d8b9bbd8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/tulin/mysql-5.0
2006-05-16 21:46:00 +02:00
tomas@poseidon.ndb.mysql.com
86c898febe
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 20:58:19 +02:00
tomas@poseidon.ndb.mysql.com
c5987ab67a
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
...
- adoptions to handle binlog
2006-05-16 20:56:45 +02:00
kent@mysql.com
6cd860a9d9
Merge mysql.com:/data0/mysqldev/my/bk_saved/mysql-4.1.18-release
...
into mysql.com:/data0/mysqldev/my/mysql-4.1
2006-05-16 19:25:10 +02:00
rburnett@bk-internal.mysql.com
d8d222f261
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-16 19:17:18 +02:00
aelkin@mysql.com
8648412531
Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-05-16 19:33:24 +03:00
konstantin@mysql.com
1e6c14d687
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-05-16 18:26:25 +04:00
pekka@mysql.com
8f5467d17e
Merge mysql.com:/space/pekka/ndb/version/my50-bug14509
...
into mysql.com:/space/pekka/ndb/version/my51-bug14509
2006-05-16 16:23:12 +02:00
pekka@mysql.com
fc7320466a
ndb - bug#14509 [related] fix a return value
2006-05-16 16:17:30 +02:00
reggie@big_geek.
e4a9adba0e
Bug #18480 Windows file rename problems in archive storage engine
...
The problem was that the optimize code was not closing both the reader and writer streams before attempting
to rename the file. This will not work on Windows where all file handles have to be closed before the
file can be renamed, moved, or deleted. The fix was to move the close calls before the rename.
We return the error code from my_rename in case of failure but we attempt to reopen the writers and readers
even in the case of failure so that the table can still be usable.
2006-05-16 08:55:08 -05:00
aelkin@mysql.com
713d17d5e7
BUG#14157: utf8 encoding in binlog without set character_set_client: e.g DROP temporary
...
fixing encoding example because of table names can not be in koi8r
on some platforms.
2006-05-16 16:50:05 +03:00
jmiller@mysql.com
44d1f74f99
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-16 15:39:41 +02:00
jmiller@mysql.com
d022cacbc1
Updated to fix bug in AIX
2006-05-16 15:38:21 +02:00
jmiller@mysql.com
46ad615f6e
rpl_log.test:
...
Fix for failure in aix52 failure during push build
2006-05-16 14:59:44 +02:00
knielsen@mysql.com
a729d7fcdd
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-05-16 14:34:35 +02:00
sergefp@mysql.com
c89fc77116
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug19618
2006-05-16 15:34:23 +04:00
pekka@mysql.com
852c0dbf64
Merge mysql.com:/space/pekka/ndb/version/my50-bug14509
...
into mysql.com:/space/pekka/ndb/version/my51-bug14509
2006-05-16 13:13:50 +02:00
pekka@mysql.com
dd58dd51a1
ndb - bug#14509 [related] setAutoIncrement: add error handling
2006-05-16 12:58:41 +02:00
tomas@poseidon.ndb.mysql.com
b467bdfcdb
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-16 12:33:24 +02:00
tomas@poseidon.ndb.mysql.com
a5686c3138
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-05-16 12:32:36 +02:00
andrey@lmy004.
743a57fda1
disable events_logs_tests
2006-05-16 12:05:15 +02:00
tulin@production.mysql.com
d4c739fda3
information_schema.result:
...
corrected merge
2006-05-16 12:00:17 +02:00