jonas@perch.ndb.mysql.com
b43d0f0495
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-30 12:25:39 +02:00
jonas@perch.ndb.mysql.com
2722dff13f
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-30 12:24:03 +02:00
jonas@perch.ndb.mysql.com
bb70442366
ndb_config
...
Check returnvalue on load/fetch configuration
2005-09-30 12:22:00 +02:00
jonas@perch.ndb.mysql.com
6cff2db932
ndb
...
Add support/test for using my.cnf [cluster_config]
2005-09-30 12:19:15 +02:00
jonas@perch.ndb.mysql.com
1e6f19074e
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-30 11:42:33 +02:00
jonas@perch.ndb.mysql.com
a30faa3b34
ndb -
...
add support for reading config.ini from ndb_config
(as alternative to contacting ndb_mgmd)
2005-09-30 11:39:49 +02:00
jonas@perch.ndb.mysql.com
035673c32d
wl#1882
...
allow ndb_mgmd to use my.cnf for cluster configuration
2005-09-30 10:02:56 +02:00
jonas@perch.ndb.mysql.com
21153069fb
export forced_defaults_file using global variable defaults_file
...
analog with defaults_extra_file and defaults_grouop_suffix
2005-09-30 09:54:53 +02:00
jonas@perch.ndb.mysql.com
a11dcd74d2
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-28 14:42:01 +02:00
dlenev@mysql.com
dc50fc2403
Merge mysql.com:/home/dlenev/src/mysql-4.1-bg13501
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-09-28 15:59:55 +04:00
jonas@perch.ndb.mysql.com
2dc334ac0f
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-28 13:54:12 +02:00
msvensson@neptunus.(none)
f8bb9a4be3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 13:45:04 +02:00
osku@127.(none)
2e737c782a
Merge 127.(none):/home/osku/mysql/5.0/clean
...
into 127.(none):/home/osku/mysql/5.0/13497
2005-09-28 14:40:02 +03:00
msvensson@neptunus.(none)
60e5493d5d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 13:30:33 +02:00
msvensson@neptunus.(none)
26793f3039
Correct merge error, warning ended up after new tests from 4.1
2005-09-28 13:29:13 +02:00
osku@127.(none)
a2749ca270
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql/5.0/clean
2005-09-28 14:28:00 +03:00
osku@127.(none)
d440270dcd
InnoDB: Remove compiler warnings.
2005-09-28 14:26:33 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
bb57385f54
Added a cast. Fix for Metrowerks compiler.
2005-09-28 14:12:44 +03:00
jonas@perch.ndb.mysql.com
63ebbf217d
ndb - bug#13512
...
core dump on no free node id
2005-09-28 11:58:34 +02:00
msvensson@neptunus.(none)
fbf4a5e079
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 11:34:53 +02:00
msvensson@neptunus.(none)
70b9b5eef3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 10:29:04 +02:00
osku@127.(none)
d98567c49f
InnoDB: Print better error message when log files are missing/corrupt
...
(bug #13497 ).
2005-09-28 11:14:25 +03:00
patg@krsna.patg.net
acdc193a45
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-09-27 15:04:26 -07:00
dlenev@mysql.com
ed1c0cbd07
Fix for bug #13501 "build problem: too many arguments to function my_bool
...
acl_init".
Updated calls to acl_init()/grant_init() in init_embedded_server() - their
signatures were changed recently, now they don't need argument for passing
pointer to THD object (this code was only compiled if one built embedded
server library with --with-embedded-privilege-control switch).
2005-09-27 23:36:02 +04:00
guilhem@mysql.com
f5fc8f315e
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0
2005-09-27 21:19:50 +02:00
patg@krsna.patg.net
12e41de0cc
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-09-27 09:42:27 -07:00
patg@krsna.patg.net
ac924f6b4f
BUG #7815 - Post-review fixes required for push.
2005-09-27 09:40:51 -07:00
msvensson@neptunus.(none)
4d6d30880f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-27 17:42:26 +02:00
igor@rurik.mysql.com
93649b883b
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-09-27 08:24:19 -07:00
msvensson@neptunus.(none)
545e38535b
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
2005-09-27 17:05:12 +02:00
msvensson@neptunus.(none)
eaf4801bfc
Bug #12526 yassl: Crashes in "integer.cpp"
...
- Improve detection of when to disable inlining for integer.cpp
2005-09-27 17:03:43 +02:00
guilhem@mysql.com
ff99183051
Fix for BUG#13527 "mysql-test-run.pl truncates var/log/*.err several times during one testsuit run"
2005-09-27 16:55:23 +02:00
msvensson@neptunus.(none)
1105d4293d
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest
2005-09-27 16:48:41 +02:00
msvensson@neptunus.(none)
39dde505fd
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug13163/my50-bug13163
2005-09-27 16:36:14 +02:00
msvensson@neptunus.(none)
e0b4e273f6
Bug #13163 yassl: aix52 crash with ssl turned on
...
- It seems like malloc(0) returns a null pointer on aix52
2005-09-27 16:34:49 +02:00
osku@127.(none)
8615ef1864
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql/5.0/clean
2005-09-27 16:04:26 +03:00
kaa@polly.local
08f52c949d
Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into polly.local:/home/kaa/src/mysql-5.0
2005-09-27 14:28:47 +04:00
kaa@polly.local
5b92eb3eba
Fix for bug #13367 , post-review changes
2005-09-27 13:37:20 +04:00
msvensson@neptunus.(none)
fa554264ff
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug13476/my50-bug13476
2005-09-27 11:34:11 +02:00
osku@127.(none)
f05759a6c0
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql/5.0/clean
2005-09-27 09:43:46 +03:00
osku@127.(none)
6f89e1cea8
InnoDB: Fix compile warning.
2005-09-27 09:42:41 +03:00
igor@rurik.mysql.com
6e2fb27af6
item.cc:
...
Fixed bug #13410 .
Fixed name resolution for qualified reference to a view column
in the HAVING clause.
view.result, view.test:
Added a test case for bug #13410 .
2005-09-26 23:29:02 -07:00
kent@mysql.com
cef2b507c7
portability.h:
...
Define SHUT_RDWR for OpenServer 5
2005-09-27 08:28:56 +02:00
patg@krsna.patg.net
8864a9b3c4
BUG #7815
...
Changes per serg to http://lists.mysql.com/internals/30281
Re-enabled --delayed-insert
2005-09-26 22:43:09 -07:00
igor@rurik.mysql.com
75c43f9663
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-09-26 20:28:49 -07:00
igor@rurik.mysql.com
a43b341c8a
sql_base.cc, item.cc:
...
Fixed bug #13411 .
Fixed name resolution for non-qualified reference to a view column
in the HAVING clause.
view.result, view.test:
Added a test case for bug #13411 .
2005-09-26 20:18:59 -07:00
patg@krsna.patg.net
6f693ae65b
BUG #13511
...
Fixed SETUP.sh to not overwrite prefix_configs, making 'make install'
install in "/"
2005-09-26 18:51:27 -07:00
pem@mysql.com
6ac4c47f7b
Fixed BUG#6127: Stored procedure handlers within handlers don't work
...
Replaced the dumb in-handler/not-in-handler check with a proper recursion
check of handlers being executed.
(Re-commit in a different tree, to make push possible.)
2005-09-26 18:22:00 +02:00
evgen@moonbone.local
0061782cd0
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/13424-bug-5.0-mysql
2005-09-26 19:45:05 +04:00
kaa@polly.local
f2922d1366
Fix for bug #13367
2005-09-26 19:24:31 +04:00