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
tsmith@maint1.mysql.com
8f75d0913b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into maint1.mysql.com:/data/localhome/tsmith/bk/51
2006-10-24 20:01:01 +02:00
msvensson@neptunus.(none)
2ed61076d4
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 19:23:26 +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)
00c2535bbd
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 19:16:45 +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
mmj@tiger.local[mmj]
da721fe7aa
Bug #23427 : incompatible ABI change in 5.0.26?
...
Revert 1 June change enough to restore ABI compatibility with previous
versions.
2006-10-24 19:05:11 +02:00
msvensson@neptunus.(none)
52aaf251bd
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 18:52:01 +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)
71adcc04fb
Test "rpl_ndb_auto_inc" need ndb - add "include/have_ndb.inc"
2006-10-24 18:21:23 +02:00
msvensson@neptunus.(none)
8f5c95230b
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 18:09:38 +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)
3ab216e033
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 17:55:39 +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
anozdrin/alik@alik.
80649572e3
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-bug17486
2006-10-24 18:32:36 +04:00
anozdrin/alik@alik.
c47c87ab88
IM polishing: log more information in log.
2006-10-24 18:31:10 +04:00
anozdrin/alik@alik.
d809679967
Enable im_daemon_life_cycle.imtest, since BUG#22379 is closed.
2006-10-24 18:25:24 +04:00
anozdrin/alik@alik.
f40a9d2ece
Fix for BUG#17486: IM: race condition on exit.
...
The problem was that IM stoped guarded instances on shutdown,
but didn't wait for them to stop.
The fix is to wait for guarded instances to stop before exitting
from the main thread.
The idea is that Instance-monitoring thread should add itself
to Thread_registry so that it will be taken into account on shutdown.
However, Thread_registry should not signal it on shutdown in order to
not interrupt wait()/waitpid().
2006-10-24 18:23:16 +04:00
msvensson@neptunus.(none)
fb01ba8455
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 16:01:19 +02: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
msvensson@neptunus.(none)
e8881843a9
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 15:46:54 +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
petr/cps@owlet.local
eda71e24c3
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/home/cps/mysql/devel/5.1-rename-bug
2006-10-24 17:00:23 +04: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
msvensson@neptunus.(none)
33a200d73d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 12:53:47 +02:00
msvensson@neptunus.(none)
10f8cdef74
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 12:51:10 +02:00
mskold/marty@mysql.com/linux.site
0067cd8a4a
bug#21873 MySQLD Crash on ALTER...ADD..UNIQUE..USING HASH statement for NDB backed table: Use passed key_info to check for nullable fields
2006-10-24 12:24:32 +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
tsmith/tim@siva.hindu.god
aeced431e3
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-10-23 23:41:07 -06: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
kostja@bodhi.local
06d943f137
Post-merge fixes.
2006-10-23 20:08:00 +04: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
fd759850aa
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug23037/my51
2006-10-23 15:27:24 +02:00