konstantin@mysql.com
e1f807af26
Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 13:35:59 +03:00
tomas@poseidon.ndb.mysql.com
16edce1e5d
Bug #17235 perror prints wrong prefix for ndb error codes
2006-02-08 17:17:27 +01:00
brian@zim.tangent.org
570bffe8c7
Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
...
my_stat() gettinng the correct parameter list may be next :)
2006-01-25 19:54:42 -08:00
joerg@mysql.com
b2f6d4f574
Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1
2006-01-16 20:21:42 +01:00
joerg@mysql.com
5da306b57e
extra/comp_err.c : Fix a merge error.
2006-01-16 17:23:39 +01:00
joerg@mysql.com
fa91e05bf5
Manual merge of the fix for bug#16106.
...
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
2006-01-16 16:48:05 +01:00
joerg@mysql.com
1155bf20d9
Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1
2006-01-13 17:45:01 +01:00
joerg@mysql.com
9d4562e5fe
extra/comp_err.c + scripts/mysqld_multi.sh :
...
Copyright string fixes (bug#16106)
2006-01-13 16:25:20 +01:00
dlenev@mysql.com
15c86158a7
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges
2005-12-24 20:13:51 +03:00
msvensson@neptunus.(none)
e50c0fdc3b
Bug #15772 Aborted YaSSL connections force threads into busyloops
...
- Report error when there is nothing to read after wait.
2005-12-20 00:47:50 +01:00
hartmut@mysql.com
7244dfd8d2
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-19 08:33:27 +01:00
jonas@perch.ndb.mysql.com
b5b0a3d6ac
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2005-12-14 14:03:50 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
2ed8d82c61
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-12-14 09:42:05 +02:00
knielsen@production.mysql.com
1b846dc2fd
Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/knielsen/mysql-5.0
2005-12-14 08:24:57 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
834940e9be
Patch for Bug#13640
2005-12-14 03:08:59 +02:00
knielsen@mysql.com
bd9b379227
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/mysql-5.0
2005-12-08 21:02:11 +01:00
knielsen@mysql.com
51cd5da314
Fix QNX and IRIX compilation
2005-12-08 15:13:25 +01:00
hartmut@mysql.com
e5b7e447ed
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-08 10:24:30 +01:00
pem@mysql.com
8e0e421943
Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-12-07 15:17:18 +01:00
hartmut@mysql.com
4c20a4da25
fixed "perror --ndb" for 5.1 (bug #15486 )
2005-12-05 14:17:53 +01:00
serg@serg.mylan
3595c81bc8
compatibility fix for yassl
2005-12-02 21:40:50 +01:00
jimw@mysql.com
0538845963
Merge mysql.com:/home/jimw/my/mysql-5.1-release
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-11-30 13:51:23 -08:00
pem@mysql.com
b2a9961abf
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-11-28 20:14:12 +01:00
kent@mysql.com
6430a4901e
Makefile.am:
...
Distribute "handlerton-win.cc"
mysqld.cc:
Corrected word lenght for some innobase
configuration variables
Makefile.am:
Added Visual Studio 7 project file to EXTRA_DIST
ha_partition.cc, sql_partition.cc:
Changed include to use "..." for Windows
handlerton-win.cc:
Handle engine include/exclude with defines for Windows
new file
2005-11-26 05:35:37 +01:00
msvensson@devsrv-b.mysql.com
3879027ade
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-bug15168
...
into devsrv-b.mysql.com:/space/magnus/mysql-5.0
2005-11-25 17:01:59 +01:00
msvensson@devsrv-b.mysql.com
8f457699a8
Bug #15168 yassl failure on amd64
...
- Use libtool to build libraries
2005-11-24 17:17:36 +01:00
anozdrin@mysql.com
1d1fd3d459
Make it buildable with -ansi flag on some platforms.
2005-11-24 18:42:39 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-11-23 14:57:00 +02:00
kent@mysql.com
bcdd552d6e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-19 11:20:52 +01:00
guilhem@mysql.com
2f95fc2701
Merge mysql.com:/home/mysql_src/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
2005-11-18 16:38:01 +01:00
kent@mysql.com
b269caecb1
Additional "make distcheck" changes specific to 5.0
2005-11-09 11:56:04 +02:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f
Make storage engines "pluggable", handlerton work
2005-11-07 16:25:06 +01:00
monty@mysql.com
a6f5375cb0
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
msvensson@neptunus.(none)
b34fbd8629
Bug#13957 yassl: opensrv6c compile failure
...
- Added some ifdefs and turn off auto template instantiation, use explicit template instantiation
2005-11-03 10:37:49 +01:00
msvensson@neptunus.(none)
3c696721f6
Update after merge, include libtaoint-integer.o into libtaocrypt.a
2005-10-28 17:12:30 +02:00
msvensson@neptunus.(none)
68fa03258a
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:45:30 +02:00
msvensson@neptunus.(none)
bb571de368
BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking
...
- Remove yassl_libsfrom CLIENT_LIBS var
- Add yassl_libs to libmysql and libmysqld
2005-10-27 21:48:43 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ea26f5e2ea
Had to revert change, because it breaks compilation for
...
Netware. Hartmut informed about this.
2005-10-14 09:32:30 +03:00
tomas@poseidon.ndb.mysql.com
e72fdf5619
Merge
2005-10-07 01:12:46 +02:00
tomas@poseidon.ndb.mysql.com
99d1d975d0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-10-06 10:59:58 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0
Merge
2005-10-06 10:54:07 +02:00
jimw@mysql.com
83330214e2
Merge mysql.com:/home/jimw/my/mysql-5.0-13071
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-05 10:07:04 -07:00
jimw@mysql.com
6b476cf5cd
Fail when two messages exist for the same language for an error in the
...
server error messages file. (Bug #13071 )
2005-10-05 10:06:31 -07:00
tomas@poseidon.ndb.mysql.com
b5ac7f31e5
added structured ndbd exit codes
2005-10-03 20:04:44 +02:00
hartmut@mysql.com
16cd4bd332
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-09-30 18:16:57 +02:00
hartmut@mysql.com
95525485b2
CygWin build fix (Bug #13640 )
2005-09-30 18:06:38 +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
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
msvensson@neptunus.(none)
69eac2e42d
Bug #13476 yassl: openserv compile failure
2005-09-26 12:25:08 +02:00