Commit graph

34329 commits

Author SHA1 Message Date
msvensson@shellback.(none)
5ad86bf40f Change = to == in ndbrequire 2006-05-22 21:51:28 +02:00
msvensson@shellback.(none)
2f6bc89d53 Merge shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-05-22 21:35:23 +02:00
msvensson@shellback.(none)
4abd9c5673 Add m4.cpp to CMakeLists.txt for taocrypt 2006-05-22 21:30:34 +02:00
msvensson@shellback.(none)
18d5a74a71 Merge bk-internal:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-05-22 20:40:28 +02:00
tomas@poseidon.ndb.mysql.com
16be20d78b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-22 20:40:27 +02:00
msvensson@shellback.(none)
ed44d815e3 Merge bk-internal:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-05-22 18:03:11 +02:00
gkodinov@mysql.com
b2494b8174 Merge mysql.com:/home/kgeorge/mysql/5.0/B18745
into  mysql.com:/home/kgeorge/mysql/5.1/B18745
2006-05-22 18:15:47 +03:00
tomas@poseidon.ndb.mysql.com
2668a3f905 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-22 16:42:48 +02:00
tomas@poseidon.ndb.mysql.com
868f7df757 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-22 16:30:43 +02:00
tomas@poseidon.ndb.mysql.com
6aeebf5c59 ndb: corrected option handeling to give correct help in ndbd 2006-05-22 16:27:37 +02:00
tomas@poseidon.ndb.mysql.com
06845f5385 Merge jonas@perch:src/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-22 16:27:13 +02:00
msvensson@shellback.(none)
5006f87178 Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2006-05-22 15:55:29 +02:00
msvensson@shellback.(none)
a401734c07 Import from yaSSL
Fixes for HPUX etc. 
Don't define exceptions operator new on hpux as the linker will look for the function
2006-05-22 15:49:57 +02:00
stewart@mysql.com
3a20e8c1c7 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
2006-05-22 23:14:58 +10:00
stewart@mysql.com
e7ab063979 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug13987
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2006-05-22 23:12:01 +10:00
gkodinov@mysql.com
b357c232fc Bug#18745: Test case 'func_group' fails if "classic" 5.0 configuration
Moved the InnoDB related test from func_group.test to innodb_mysql.test
2006-05-22 16:10:53 +03:00
pekka@mysql.com
641c92dd62 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my51
2006-05-21 21:58:00 +02:00
kent@mysql.com
bc6bdd8ead Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-21 19:48:50 +02:00
holyfoot@mysql.com
b9cd71e622 Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-21 18:22:13 +05:00
holyfoot@mysql.com
9184321fd6 Merge mysql.com:/home/hf/work/mysql-5.0.mrg
into mysql.com:/home/hf/work/mysql-5.1.mrge
2006-05-21 18:17:50 +05:00
pekka@mysql.com
1a519e2971 ndb - bug#19956 (occurs only in v5.0) 2006-05-21 11:04:57 +02:00
kent@mysql.com
49a8f9ee29 Merge 2006-05-21 10:38:59 +02:00
kent@mysql.com
0a778b4ce0 Merge 2006-05-21 00:47:08 +02:00
kent@mysql.com
c6d14073dd Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-05-20 23:46:44 +02:00
kent@mysql.com
2419732379 Merge 2006-05-20 23:36:17 +02:00
kent@mysql.com
e09910f91f mysql.spec.sh:
Always compile position independent
2006-05-20 22:47:20 +02:00
kent@mysql.com
54e65469ba Makefile.am:
Specify yaSSL .a file, not .la (bug#19966)
  Don't use Mac OS X "__.SYMDEF SORTED" file in archives
2006-05-20 14:12:42 +02:00
kent@mysql.com
14a9b57f00 Many files:
Change mode to -rw-rw-r--
2006-05-20 12:36:58 +02:00
kent@mysql.com
5c69c5b164 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-20 09:49:03 +02:00
jimw@mysql.com
8262c3c38e Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-19 19:07:33 -07:00
jimw@mysql.com
2b13192c2e Merge mysql.com:/home/jimw/my/mysql-5.0-1039
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-05-19 16:17:24 -07:00
kent@mysql.com
d0f40d7d72 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-20 00:09:08 +02:00
tomas@poseidon.ndb.mysql.com
00188154c9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-19 23:20:33 +02:00
tomas@poseidon.ndb.mysql.com
83c095ba5c ha_ndbcluster_binlog.cc:
ndb: fix compile error on solaris
2006-05-19 20:31:02 +02:00
tomas@poseidon.ndb.mysql.com
0a49d5a297 Merge jonas@perch:src/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-19 18:14:36 +02:00
tomas@poseidon.ndb.mysql.com
d76b071efe ndb: moved startup order back for ndb binlog thread from previous push that seems to be causing startup issues 2006-05-19 18:11:47 +02:00
tomas@poseidon.ndb.mysql.com
7dd76c485a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-19 17:40:08 +02:00
tomas@poseidon.ndb.mysql.com
4183ab6d49 Bug #19885 master1 crash in ndb_condition_pushdown test
- record structure wrongly deallocated during online alter on remote mysqld
- change so that ndb handler allocates the buffer itself, so it can be reused after alter
2006-05-19 17:34:50 +02:00
jonas@perch.ndb.mysql.com
ff57aa3465 ndb -
Fix recursive mutex lock in drop index (ndbapi programs only)
2006-05-19 16:17:38 +02:00
tulin@mysql.com
a19fd0ba7d NdbEventOperationImpl.hpp:
corrected compile error
2006-05-19 15:44:47 +02:00
tomas@poseidon.ndb.mysql.com
0ba9208933 ndb: changed to use mem root to allocate table structure for ndb share 2006-05-19 15:44:46 +02:00
kent@mysql.com
de7e522fda Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-19 14:00:30 +02:00
msvensson@neptunus.(none)
b53548fe10 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-19 14:00:30 +02:00
sergefp@mysql.com
49e23937e4 Merge mysql.com:/home/psergey/tmp_merge
into  mysql.com:/home/psergey/mysql-5.1-merge
2006-05-19 16:00:29 +04:00
msvensson@neptunus.(none)
b5f3a2ef2a Change from --wioth-yassl to --with-ssl 2006-05-19 13:20:35 +02:00
msvensson@devsrv-b.mysql.com
49eeb1bb57 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
2006-05-19 13:16:06 +02:00
msvensson@neptunus.(none)
e3a75df3ca Merge bk-internal:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-05-19 13:11:49 +02:00
msvensson@neptunus.(none)
d04113db05 Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-05-19 13:10:52 +02:00
msvensson@neptunus.(none)
f186a3f24e Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-19 13:09:15 +02:00
msvensson@neptunus.(none)
b9a59fa014 Bug#15869 Cannot shutdown the server - it restarts
- A segfault occured when the function 'kill_server' called 
   'my_sigset' with signal number 0. 'my_sigset' is a macro which
   uses 'sigaction' to install the signal handler with an invalid
   signal number will on most platforms return EINVAL but yields
   a segfauilt on IRIX 6.5
 - The server crash was detected by mysqld_safe and it was restarted although
   a shutdown was requested. 
 - Semantics of kill_server(0) is not known, leaving it intact
2006-05-19 13:07:24 +02:00