ian@zim.(none)
34b54fa83c
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/ian/workspace/mysql-5.0
2006-03-27 18:27:57 -08:00
ian@zim.(none)
8607f1df65
Disable udf test
2006-03-27 18:25:35 -08:00
brian@zim.(none)
1ec1587cd3
Removing deleted file (this fixes the pushbuild failure from Reggie's push).
...
There still may be issues on the Window's side from what I can see from doing a grep.
2006-03-27 18:20:43 -08:00
brian@zim.(none)
eee6a51caf
Disabling test for rpl_ndb_sp007
2006-03-27 18:08:31 -08:00
ian@zim.(none)
a66aace3e9
Fix for bug #16855
2006-03-27 17:45:06 -08:00
kent@mysql.com
1da875b233
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-28 01:56:24 +02:00
reggie@big_geek.
7f674749b8
removed handlerton-win.cc
...
now using CONFIGURE_FILE and INCLUDE to generate handlerton.cc and to set the definitions based on
the storage engines given on the command line
2006-03-27 15:19:56 -06:00
kent@mysql.com
6b51a2c69f
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-27 23:08:25 +02:00
kent@mysql.com
04f059c5bf
mysql_config.sh:
...
Remove Solaris -xc99=none C option as C++ compiler can't handle it
2006-03-27 23:04:44 +02:00
anozdrin@mysql.com
cc1ee7e48b
Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created
...
in older version.
The problem is that TRN-files created in "old" versions contain
junk in trigger_table field, which is not acceptable in "new" versions.
2006-03-28 01:01:51 +04:00
knielsen@mysql.com
e4f6fd3dcb
Merge mysqldev@win2003-x86:my/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-win-src
2006-03-27 21:45:48 +02:00
knielsen@mysql.com
459050636c
mysql_fix_privilege_tables is not available (nor needed) in a Windows CMake
...
build, so do not require it to be present in mysql-test-run.pl.
2006-03-27 21:44:29 +02:00
tomas@poseidon.ndb.mysql.com
3fbcdb5dcc
removed rpl_ndb_sp007 test as it uses savepoints which is only supported by innodb
...
compile error fixes
2006-03-27 19:41:37 +02:00
kent@mysql.com
898db8b053
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-27 19:37:29 +02:00
kent@mysql.com
35ae639477
mysql_config.sh:
...
We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
2006-03-27 19:25:25 +02:00
bpontz@shasta.mysql.com
2d14a5e560
netware doesnt use fork
2006-03-27 12:25:01 -05:00
tomas@poseidon.ndb.mysql.com
6ad5038423
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-27 19:03:22 +02:00
tomas@poseidon.ndb.mysql.com
e8423ff093
Bug #18491 cluster: node restart with pending dropeed events causes failed restart
2006-03-27 18:53:23 +02:00
skozlov@mysql.com
ef12f5c468
Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/skozlov/mysql-5.1-new
2006-03-27 18:03:30 +04:00
monty@mysql.com
25adcb6500
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-03-27 15:23:16 +03:00
pekka@mysql.com
5903a839c9
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2006-03-27 13:31:33 +02:00
pekka@mysql.com
f77af29bea
Merge mysql.com:/space/pekka/ndb/version/my50
...
into mysql.com:/space/pekka/ndb/version/my51
2006-03-27 13:24:50 +02:00
pekka@mysql.com
825f97c7b5
ndb - bug#17380: Missing charset causes NDB Client to crash
2006-03-27 13:16:53 +02:00
skozlov@mysql.com
8cf57c5520
ATRT documentation
2006-03-27 14:59:19 +04:00
monty@mysql.com
aecd1502b1
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-03-27 13:47:13 +03:00
jonas@perch.ndb.mysql.com
72aaf98396
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-27 11:52:54 +02:00
gkodinov@mysql.com
ddcfa13d27
Merge mysql.com:/home/kgeorge/mysql/5.0/B15102
...
into mysql.com:/home/kgeorge/mysql/5.1/B15102
2006-03-27 12:35:16 +03:00
knielsen@mysql.com
f72eeb1a49
Merge mysqldev@win2003-x86:my/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-win-src
2006-03-27 11:23:51 +02:00
knielsen@mysql.com
cfb43e683b
Add missing files for CMake build.
2006-03-27 11:23:50 +02:00
gkodinov@mysql.com
b35d97d02a
Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
...
Reproduced in 5.0.16-nt. Tested to work in 5.0.20
2006-03-27 12:20:25 +03:00
monty@mysql.com
4ab6bc4b43
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-03-27 12:07:59 +03:00
monty@mysql.com
3dcbbb7c4d
Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"
...
This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared
library
2006-03-27 12:02:23 +03:00
jonas@perch.ndb.mysql.com
db7a9b760f
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-27 10:43:37 +02:00
jonas@perch.ndb.mysql.com
1c019888c3
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-03-27 10:34:21 +02:00
jonas@perch.ndb.mysql.com
49df84ad78
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-27 10:31:25 +02:00
jonas@perch.ndb.mysql.com
582d3fed7a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-27 10:29:36 +02:00
jonas@perch.ndb.mysql.com
cb6b9ee73e
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-27 10:26:37 +02:00
jonas@perch.ndb.mysql.com
7f71a8ebab
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-03-27 10:21:52 +02:00
jonas@perch.ndb.mysql.com
a3b51fda9f
ndb - autotest
...
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert()
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
2006-03-27 10:18:48 +02:00
bpontz@shasta.mysql.com
edb9e3c9fb
added option for netware build
2006-03-26 21:23:15 -05:00
bpontz@shasta.mysql.com
e4f9d23598
added option for netware build
2006-03-26 21:19:43 -05:00
brian@zim.(none)
cafbe1ec29
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-03-26 01:35:45 -08:00
brian@zim.(none)
f940472d5a
Fix to remove engine dependency from handler.cc file, the last one for functions.
2006-03-26 01:32:52 -08:00
dlenev@mysql.com
e7d2b09e14
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/dlenev/mysql-5.1-merges
2006-03-25 19:03:09 +03:00
dlenev@mysql.com
56e415a512
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into mysql.com:/home/dlenev/mysql-5.1-merges
2006-03-25 18:55:02 +03:00
kent@mysql.com
625ab8a064
configure.in:
...
AC_ARG_WITH inside "if" sometimes gives unexpected result,
--with-fast-mutexes was not ignored when --with-debug given
2006-03-25 13:38:37 +01:00
andrey@lmy004.
d770c77504
update
2006-03-25 13:14:52 +01:00
andrey@lmy004.
fd35e81b75
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16415
2006-03-25 13:05:34 +01:00
dlenev@mysql.com
85c1e4d25f
Updated test case. SHOW CREATE TABLE uses uppercase DEFAULT clause in 5.1.
2006-03-25 12:07:45 +03:00
andrey@lmy004.
288fe2f139
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16415
2006-03-25 01:12:06 +01:00