kent@mysql.com
de7e522fda
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-19 14:00:30 +02:00
sergefp@mysql.com
49e23937e4
Merge mysql.com:/home/psergey/tmp_merge
...
into mysql.com:/home/psergey/mysql-5.1-merge
2006-05-19 16:00:29 +04:00
lars@mysql.com
399a1b845b
After merge fixes
2006-05-18 21:40:52 +02:00
kent@mysql.com
35440889d9
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-18 19:55:27 +02:00
lars@mysql.com
87bb4f95ea
Merge mysql.com:/users/lthalmann/bkroot/tmp_5.0_merge
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-05-18 18:38:50 +02:00
knielsen@mysql.com
339afc620f
After-merge fix.
2006-05-18 13:35:15 +02:00
knielsen@mysql.com
a061c90d8a
Merge mysql.com:/usr/local/mysql/tmp_merge
...
into mysql.com:/usr/local/mysql/merge-5.1
2006-05-18 11:56:50 +02:00
igor@rurik.mysql.com
0d069edaa2
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-05-17 17:20:03 -07:00
kent@mysql.com
cd1bc46cf9
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-18 01:10:09 +02:00
kent@mysql.com
4ab4c99eff
type_newdecimal.result, case.result:
...
Adjusted merge
2006-05-18 00:42:07 +02:00
kent@mysql.com
d48e55eefd
Merge
2006-05-17 23:41:56 +02:00
kent@mysql.com
5842dcaa7d
Merge mysql.com:/data0/mysqldev/my/tmp_merge
...
into mysql.com:/tmp/mysql-5.1-new
2006-05-17 23:35:08 +02:00
igor@rurik.mysql.com
62f61f527f
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-05-17 11:46:21 -07:00
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
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
0cb31d7d5f
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
2006-05-17 08:34:48 +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
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
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
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
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
sergefp@mysql.com
b7c52881d1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug19618
2006-05-16 13:46:30 +04:00
tomas@poseidon.ndb.mysql.com
6cb699d208
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 10:37:40 +02:00
knielsen@mysql.com
62e0e90a51
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/knielsen/tmp-5.0
2006-05-16 10:34:12 +02:00
tomas@poseidon.ndb.mysql.com
08438b6054
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 10:21:37 +02:00
lars@mysql.com
a29504cbcb
Test used a charset not available on many platforms
2006-05-16 10:01:07 +02:00
lars@mysql.com
3b8a10dbd7
Fixed result file (rpl_temporary)
2006-05-16 09:26:57 +02:00
tnurnberg@mysql.com
0613889746
Merge mysql.com:/home/tmp_merge
...
into mysql.com:/home/mysql-5.1-18997e
2006-05-16 03:33:43 +02:00
tnurnberg@mysql.com
d1311e1ac7
Bug#18997: DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value
...
if input year for date_add() / date_sub() with INTERVAL is low enough for
calc_daynr() to possibly return incorrect results (calc_daynr() has no information
on whether the year is low because it was a two-digit year ('77) or because it
was a really low four-digit year (0077) and will indiscriminately try to turn the
value into a four-digit year by adding 1900 or 2000 respectively), the functions
will now throw NULL.
2006-05-16 03:32:24 +02:00
cmiller@zippy.(none)
d8330e2858
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-05-15 19:26:49 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
414d5c0983
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-05-16 00:37:34 +03:00
knielsen@mysql.com
70aa60752c
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/knielsen/tmp-5.0
2006-05-15 23:21:37 +02:00
knielsen@mysql.com
2abf957c91
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix2
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-05-15 22:12:17 +02:00
lars@mysql.com
3148efad35
Merge mysql.com:/users/lthalmann/bkroot/andrei-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
2006-05-15 20:49:14 +02:00
tomas@poseidon.ndb.mysql.com
5971c0872b
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-15 20:35:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
1b524d6b5f
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-15 21:33:47 +03:00
aelkin@dl145j.mysql.com
6bdd2bbcc1
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145j.mysql.com:/tmp/andrei/5.0
2006-05-15 19:57:11 +02:00
knielsen@mysql.com
5d1c68ed35
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix2
...
into mysql.com:/usr/local/mysql/tmp-5.0
2006-05-15 19:57:11 +02:00
tomas@poseidon.ndb.mysql.com
747dc71f9f
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-15 18:44:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
3846438a9c
Fix, or a workaround for Bug#19386 "Multiple alter causes crashed table"
...
The problem is that in a MyISAM table the following column
after a varchar field gets corrupted, if varchar field is
extended.
This should be made to work without a copy in the future, but
I'm not sure if this code is ready yet. This fix will force copy
in this case. It will not do any harm to have it here, only makes
alter table a bit slower in this case. If this should work for
MyISAM, then the bug is somewhere else in that code.
Until it works, I propose this as a temporary fix or a workaround.
Test case for the bug has been added.
2006-05-15 19:41:04 +03:00
tomas@poseidon.ndb.mysql.com
271c72aa03
Bug #16875 , correction of previous patch
2006-05-15 17:16:21 +02:00
tomas@poseidon.ndb.mysql.com
fe9934c9fe
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
...
- invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
- add check for correct frm on external lock when table cache is found invalid
2006-05-15 16:23:59 +02:00
knielsen@mysql.com
c16b1f8676
Removed two duplicate/redundant suppressions.
...
Added some suppressions needed for Valgrind on RHAS3 64-bit.
2006-05-15 15:06:46 +02:00
sergefp@mysql.com
e5ae30fdef
BUG#19618: Crash for unsigned_col NOT IN (-1, ... )
...
- When manually constructing a SEL_TREE for "t.key NOT IN(...)", take into account that
get_mm_parts may return a tree with type SEL_TREE::IMPOSSIBLE
- Added missing OOM checks
- Added comments
2006-05-15 14:18:23 +04:00
tomas@poseidon.ndb.mysql.com
2c0955bda0
Bug#16445 ndb, removed workaround in test to see if rewrite of dict cache has worked to remove this bug
2006-05-15 10:50:31 +02:00
konstantin@mysql.com
85c6883146
Merge mysql.com:/opt/local/work/mysql-5.0-root
...
into mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-05-15 00:51:12 +04:00