tomas@poseidon.ndb.mysql.com
9a3b27dae9
manual merge
2006-02-13 14:25:31 +01:00
tomas@poseidon.ndb.mysql.com
4f449e4f22
ndb:
...
add optional reporting of of a "name" tied to a nodeid in the cluster log
reporting added for mysql server and ndb_restore
2006-02-13 12:58:12 +01:00
bar@mysql.com
53a0372d87
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.fscs
2006-02-13 11:53:56 +04:00
bar@mysql.com
611cbc2f4d
renamedb.test, renamedb.result:
...
new file
Many files:
WL#757 RENAME DATABASE
2006-02-13 11:49:28 +04:00
brian@zim.tangent.org
fd2b90d174
Removing unused variable (old have_isam).
2006-02-12 22:43:59 -08:00
brian@zim.tangent.org
0c487a79c9
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/dep-5.1
2006-02-12 13:27:56 -08:00
brian@zim.tangent.org
0a5a30bef3
This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work.
2006-02-12 13:26:30 -08:00
kent@mysql.com
eb9683442d
Merge
2006-02-12 20:45:03 +01:00
kent@mysql.com
38108ee634
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-02-12 20:19:33 +01:00
kent@mysql.com
4294f877fd
disabled.def:
...
Reenabled tests 'innodb_concurrent', 'innodb_unsafe_binlog', 'rpl_ndb_log' as bugs 3300 15650 17081 are solved
2006-02-12 20:17:11 +01:00
kent@mysql.com
edbbfee4f5
Merge
2006-02-12 20:07:19 +01:00
kent@mysql.com
633cd03468
disabled.def:
...
Disabled 'rpl_until' until 15886 is solved
libmysqld.vcproj:
Added "my_user.c"
2006-02-12 19:36:21 +01:00
petr@mysql.com
45ac20b9ef
fix race condition in the log_tables test
2006-02-12 14:47:59 +03:00
kent@mysql.com
73de951abc
Merge
2006-02-12 04:48:52 +01:00
kent@mysql.com
f9a23667b2
Merge
2006-02-12 04:33:50 +01:00
kent@mysql.com
30b8a9c1fb
spatial.cc:
...
Added { ... } around float8get() macro, avoids VC7 error
message "illegal else without matching if"
mtr_report.pl:
Parse error logs to create "warnings" file
mtr_cases.pl:
Added optoion --ignore-disabled-def
Windows build now let TZ pass, removed
work around
mysql-test-run.pl, mtr_process.pl:
Back port of changes from 5.0
2006-02-12 04:13:24 +01:00
brian@zim.tangent.org
eeefb8ba7c
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/raid/mysql-5.1-new
2006-02-11 17:26:32 -08:00
brian@zim.tangent.org
9485856f1a
This patch is to further remove the RAID code. We removed support for people creating tables with RAID. This patch remove most of the source for this.
2006-02-11 17:21:01 -08:00
kent@mysql.com
1fe9126dc2
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-02-12 01:35:30 +01:00
kent@mysql.com
eec5726806
make_binary_distribution.sh:
...
print => echo in shell script
2006-02-12 01:33:43 +01:00
knielsen@mysql.com
5346bf7392
Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-02-12 00:10:43 +01:00
kent@mysql.com
6595c64958
Merge
2006-02-11 23:59:21 +01:00
kent@mysql.com
c94b3638f1
Merge
2006-02-11 23:44:56 +01:00
kent@mysql.com
2619c54bd1
mysql-test-run.{pl,sh}:
...
Give space for second and third slave port
2006-02-11 23:35:23 +01:00
knielsen@mysql.com
cbe5fb2e01
Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-02-11 23:32:51 +01:00
kent@mysql.com
40596fa00d
Merge
2006-02-11 23:23:39 +01:00
knielsen@mysql.com
43189fd8ad
Fix a race on some platforms in mysql-test-run.pl, where it would sometimes
...
errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.
2006-02-11 22:50:59 +01:00
andrey@lmy004.
64818ead73
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-new-clean
2006-02-11 19:23:20 +01:00
andrey@lmy004.
7d0ca81d10
Merge lmy004.:/work/mysql-5.0-clean
...
into lmy004.:/work/mysql-5.1-new-clean
2006-02-11 09:32:46 +01:00
bell@sanja.is.com.ua
af43c2a402
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
2006-02-11 00:29:46 +02:00
ingo@mysql.com
8efa06bd68
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-wl1563-msg
2006-02-10 22:28:59 +01:00
ingo@mysql.com
66883d76dd
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
...
After merge fix.
2006-02-10 22:26:04 +01:00
bell@sanja.is.com.ua
0a50f832ad
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
2006-02-10 22:17:01 +02:00
bell@sanja.is.com.ua
0400b2ef9a
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
2006-02-10 21:02:08 +02:00
ingo@mysql.com
b9bc1e9108
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-wl1563-msg
2006-02-10 20:00:22 +01:00
kent@mysql.com
5fe2e8fd7d
mysql-test-run.pl:
...
Display instance manager port
mysql-test-run.sh:
Give port space for more than one slave
2006-02-10 19:56:34 +01:00
kent@mysql.com
f8e08f38fe
Merge
2006-02-10 19:47:46 +01:00
kent@mysql.com
d23d02be18
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-02-10 19:18:45 +01:00
petr@mysql.com
2e01c8b0d0
Merge mysql.com:/home/cps/mysql/devel/5.0-mike
...
into mysql.com:/home/cps/mysql/devel/5.1-merge
2006-02-10 21:03:49 +03:00
tomas@poseidon.ndb.mysql.com
9663f6cbee
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-10 18:16:34 +01:00
tomas@poseidon.ndb.mysql.com
0ec372ed21
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-10 18:08:04 +01:00
tomas@poseidon.ndb.mysql.com
f0d95d0af3
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-10 18:04:46 +01:00
tomas@poseidon.ndb.mysql.com
5ba3f69f3e
manual merge
2006-02-10 17:59:53 +01:00
tomas@poseidon.ndb.mysql.com
cbac75de91
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2006-02-10 17:53:13 +01:00
tomas@poseidon.ndb.mysql.com
27a14f93eb
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-10 17:50:17 +01:00
tomas@poseidon.ndb.mysql.com
7050a7586e
Bug #17249 ndb, delete statement with join where clause fails when table do not have pk
...
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key
change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
2006-02-10 17:40:22 +01:00
andrey@lmy004.
bdf0f9a2d9
fix test of bug 12744 on OSX
2006-02-10 14:42:08 +01:00
bell@sanja.is.com.ua
074f19622d
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
2006-02-10 15:12:35 +02:00
joerg@mysql.com
6c464815c9
Several Netware specific fixes.
...
Originally, done by Jani and pushed to the general 5.1 tree
as ChangeSet 2006/02/02 16:22:31+02:00 jani@ua141d10.elisa.omakaista.fi
now just copied to the 5.1.6 build clone.
2006-02-10 13:50:22 +01:00
joerg@mysql.com
e252af334c
storage/innobase/include/univ.i : Get rid of "extern inline" (part of innodb-5.0-149/162 snapshots).
2006-02-10 12:39:31 +01:00