mskold/marty@mysql.com/linux.site
deb26a93e5
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
2006-10-25 11:45:47 +02:00
mskold/marty@mysql.com/linux.site
44e55e3b43
Bug #21072 Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings
2006-10-25 11:44:40 +02:00
knielsen@ymer.(none)
df8c9272e8
Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp
...
into ymer.(none):/usr/local/mysql/mysql-4.1-ndb
2006-10-25 10:46:00 +02:00
knielsen@ymer.(none)
6445ae3312
Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp
...
into ymer.(none):/usr/local/mysql/mysql-5.0-ndb
2006-10-25 10:45:11 +02:00
knielsen@ymer.(none)
44aa0f4de1
Fix two small problems in the source, potentially causing user-visible
...
bugs.
2006-10-25 10:37:53 +02:00
stewart@willster.(none)
a4faddc64f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
2006-10-25 17:24:20 +10:00
jonas@perch.ndb.mysql.com
0f74244d86
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-10-25 08:40:34 +02:00
jonas@perch.ndb.mysql.com
61f87f5d3c
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-25 08:31:30 +02:00
jonas@perch.ndb.mysql.com
6e4a0ec042
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-25 08:28:30 +02:00
msvensson@neptunus.(none)
9906a10a27
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 23:40:11 +02:00
msvensson@neptunus.(none)
1f780b77e7
Adapt mysql-test-run.pl to mysqld in 5.1 using "mixed" binlog format by default
2006-10-24 23:39:46 +02:00
tsmith/tim@siva.hindu.god
3af2089b13
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-24 14:42:08 -06:00
msvensson@neptunus.(none)
23700ab32b
Update the reference file for mysql API/ABI for 5.0
2006-10-24 22:00:08 +02:00
msvensson@neptunus.(none)
e0985bef96
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 21:05:35 +02:00
msvensson@neptunus.(none)
ac5b37ef00
Pass --core-file option to mysqld when bootstrapping
2006-10-24 21:02:04 +02:00
pekka@orca.ndb.mysql.com
64c414a004
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
2006-10-24 20:52:09 +02:00
msvensson@neptunus.(none)
e4b65a9947
Merge neptunus.(none):/home/msvensson/mysql/bug23427/my41-bug23427
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-24 20:41:48 +02:00
msvensson@neptunus.(none)
1a7676fa65
WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks
...
BUG#23427 incompatible ABI change in 5.0.26?
- Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file
2006-10-24 20:32:07 +02:00
msvensson@neptunus.(none)
56d2a6fd3c
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 19:22:48 +02:00
msvensson@neptunus.(none)
844369130f
Remove debug printout
2006-10-24 19:22:27 +02:00
msvensson@neptunus.(none)
28ca3dea79
Bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table"
...
- Fix check in mysql_client_test to reflect the change of datatype
for DEFAULT column
2006-10-24 19:16:18 +02:00
msvensson@neptunus.(none)
a45e6ba7e8
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 18:51:07 +02:00
msvensson@neptunus.(none)
a8d1c62e5f
Run mysql_client_test without --silent
...
Flush both stdout and stderr before abort'ing mysql_client_test
2006-10-24 18:49:19 +02:00
msvensson@neptunus.(none)
d02838deb0
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 18:08:38 +02:00
msvensson@neptunus.(none)
80f4c1056f
Fix spelling errors in test files
2006-10-24 17:54:45 +02:00
msvensson@neptunus.(none)
3df77e48af
Add analyze_testcase_failure which is called when mysqltest has failed
...
with error 1 and we are running with --force
The specific "analyze" code is enclosed in a .test file fwich can easily
be modified to be more advanced
2006-10-24 17:36:46 +02:00
stewart@willster.(none)
a8037f478d
fix result file for ndb_multi
2006-10-25 00:41:55 +10:00
msvensson@neptunus.(none)
ccc33b4e53
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 16:00:42 +02:00
stewart@willster.(none)
dc38d0249a
fix ndb_cache_multi2
...
util thread wasn't behaving correctly after 241 error due to get_table_statistics
not properly returning an error code
2006-10-24 23:26:58 +10:00
msvensson@neptunus.(none)
4bd1021a03
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 14:32:31 +02:00
msvensson@neptunus.(none)
26183402d1
Use same type for local variables as arguments, avoid compile error on NetWare
2006-10-24 13:52:50 +02:00
msvensson@neptunus.(none)
c972edc663
Enable the ATTRIBUTE_FORMAT macros to check format of variable arg parameters
2006-10-24 13:34:10 +02:00
msvensson@neptunus.(none)
e5bf79e608
Replace all refernces to .la libraries with direct references
...
to their .libs/*.a library
Add comment describing why mwldnlm is called with "x" flag
2006-10-24 13:12:34 +02:00
joerg@trift2.
3785698d9f
innobase/CMakeLists.txt : Change done by Ignacio Galarza (igalarza@mysql.com)
...
Bug #19424 InnoDB: possibly a memory overrun of the buffer being freed (Windows 64)
Fix is to reduce optimization if the compiler is "Visual Studio 8 2005 Win64".
2006-10-24 12:31:18 +02:00
joerg@trift2.
6e2d52066e
Merge mysqldev@production.mysql.com:my/mysql-5.0-enterprise
...
into trift2.:/MySQL/M50/clone-5.0
2006-10-24 12:04:14 +02:00
joerg@trift2.
d65efaa051
Bump version from 5.0.27 to 28.
2006-10-24 12:01:52 +02:00
msvensson@neptunus.(none)
6b920ebd84
Temporary fixes for building from source dist in pushbuild
2006-10-24 11:16:53 +02:00
joerg@trift2.
837746340e
Bump version number to 5.0.29, as 28 will be based directly on 27.
2006-10-24 10:57:17 +02:00
msvensson@neptunus.(none)
25abce028e
When using yaSSL on NetWare some of the OpenSSL specifix hacks can be skipped
2006-10-24 10:43:15 +02:00
mskold/marty@mysql.com/linux.site
8da80dd39d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-10-24 08:29:37 +02:00
msvensson@shellback.(none)
a3ffd80fc9
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-23 22:14:00 +02:00
msvensson@neptunus.(none)
e4df2aac07
Avoid matching the trailing carriage return when parsing the mysqld.spec file
...
This fixes problem where --replace_result failed in rpl000015 because the MYSQL_TCP_PORT variable was "3306\r"
2006-10-23 20:36:44 +02:00
msvensson@neptunus.(none)
792adb7ce3
The vardir trick can only bge used on platforms with native symlinks - otherwise opt_vardir need to be set to default value.
2006-10-23 16:51:48 +02:00
stewart@willster.(none)
826628c99b
post merge fix
2006-10-24 00:18:57 +10:00
stewart@willster.(none)
3c2eeb2c15
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
2006-10-23 23:57:28 +10:00
stewart@willster.(none)
5926602aa7
Bug #19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
...
fixes for ndb_* tests broken by previous fix
be more careful in ndb about setting errors on failure of info call (especially
in open)
2006-10-23 23:46:35 +10:00
stewart@willster.(none)
fc776db8e7
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
...
into willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
2006-10-23 23:43:48 +10:00
andrey@example.com
6237be99d0
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug23037/my50
2006-10-23 15:21:23 +02:00
msvensson@neptunus.(none)
6b5ec53962
Don't use the "4.1 vardir trick" on OS that does not have native symlink(i.e windows)
2006-10-23 13:32:20 +02:00
msvensson@neptunus.(none)
38c66b638f
Netware uses size_t as socklen_t
2006-10-23 13:26:04 +02:00