Commit graph

12553 commits

Author SHA1 Message Date
joreland@mysql.com
612777290d Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl1671
2004-06-01 21:51:34 +02:00
tomas@mc05.(none)
308f40bb98 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-01 18:05:43 +02:00
tomas@poseidon.ndb.mysql.com
0d6d40a0d0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-06-01 16:05:42 +00:00
tomas@poseidon.ndb.mysql.com
252eda1fd1 Explicit use of static libs for selected ndb programs 2004-06-01 16:05:14 +00:00
joreland@mysql.com
a5e0f5f6eb Fix scan error bug
(last known :-))
2004-06-01 16:54:40 +02:00
heikki@hundin.mysql.fi
59e44ff8d8 fil0fil.c:
Add missing newlines in fprintfs
2004-06-01 16:41:13 +03:00
marko@hundin.mysql.fi
2b2e7e4580 InnoDB cleanup: Fix potential buffer overflows,
allow deletion of tablespaces whose names contain "'"
2004-06-01 15:19:09 +03:00
joreland@mysql.com
43a0e76e96 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl1671
2004-06-01 13:34:59 +02:00
joreland@mysql.com
a3b8d42b0b Update error handling of new scan
Still known bugs :-(
2004-06-01 13:28:29 +02:00
mronstrom@mysql.com
00b5e46f98 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Users/mikron/mycluster
2004-06-01 13:19:41 +02:00
tomas@poseidon.ndb.mysql.com
f265403fb7 various ndb make changes, see respective file 2004-06-01 11:19:40 +00:00
mronstrom@mysql.com
5f0913451a Small portability fix for strnlen 2004-06-01 11:51:10 +02:00
konstantin@mysql.com
d01c7b18d8 BUILD/compile-pentium-maintainer should not ever be needed since there is
no AM_MAINTAINER_MODE macro in configure.in
2004-05-31 17:04:41 +04:00
konstantin@mysql.com
0dde8d4ae7 AC_MAINTAINER_MODE removed: now MySQL is always configured in maintainer
mode and one should expect better dependencies tracking.
2004-05-31 17:02:18 +04:00
konstantin@mysql.com
eaa4d106e6 Fix for Bug#3796 "Prepared statement, select concat(<parameter>,<column>), wrong
result": new Item_param member for use in val_str()
2004-05-31 14:21:48 +04:00
bell@sanja.is.com.ua
c942a7ecd2 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-05-28 22:33:49 +03:00
monty@mysql.com
f0f76efaa6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-28 21:58:57 +03:00
bell@sanja.is.com.ua
9f51e30054 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-05-28 21:34:09 +03:00
bell@sanja.is.com.ua
266dd53da2 if exists should not be used inside test
removed influence of some tests on other tests
2004-05-28 21:31:51 +03:00
msvensson@build.mysql.com
1352493e3c Restore.cpp:
Added include of ndbout
2004-05-28 14:10:27 +02:00
tomas@poseidon.bredbandsbolaget.se
e8bd062fff problems with automake version, need to figure out different way to do this 2004-05-28 11:56:35 +00:00
msvensson@build.mysql.com
c98a895462 ha_ndbcluster.cc:
Missing  semicolon
2004-05-28 12:09:12 +02:00
mskold@mysql.com
c54d098c6c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb
2004-05-28 11:23:45 +02:00
mskold@mysql.com
bc0cf2ccff Added missing ; 2004-05-28 11:23:44 +02:00
tomas@mc05.(none)
e75ec54381 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1
2004-05-28 11:23:44 +02:00
tomas@poseidon.bredbandsbolaget.se
74a4b8b0a3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-05-28 09:23:43 +00:00
tomas@poseidon.bredbandsbolaget.se
26df6c6fc1 added shared mem + sci options for ndb 2004-05-28 09:22:27 +00:00
monty@mysql.com
04e96ca860 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-28 11:15:50 +03:00
monty@mysql.com
4b6a057cae Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-05-28 11:03:20 +03:00
monty@mysql.com
cb5c3f6e2e Added option --config-extra-env to Do-compile 2004-05-28 11:02:34 +03:00
magnus@neptunus.(none)
54be4cfefd Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-28 09:51:27 +02:00
magnus@neptunus.(none)
60fb66f033 Fix for compile problem with newtonapi 2004-05-28 09:50:17 +02:00
monty@mysql.com
aabbacba8f New patch to ensure that InnoDB gets values for CFLAGS and CXXFLAGS 2004-05-28 10:41:38 +03:00
joreland@mysql.com
5e4af7e573 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl1671
2004-05-28 09:34:28 +02:00
joreland@mysql.com
f254d9f121 BUg#3910 2004-05-28 09:09:47 +02:00
heikki@hundin.mysql.fi
e734cde6a6 my_global.h:
Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater
2004-05-28 09:06:19 +03:00
joreland@mysql.com
58240397a5 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas
2004-05-28 07:08:15 +02:00
joreland@mysql.com
7a5024b613 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-05-28 07:04:07 +02:00
tomas@mc05.(none)
d1467d7a42 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-05-28 03:24:29 +02:00
monty@mysql.com
ccc4171276 Portability fix (using 'char' as argument to C functions may give warnings) 2004-05-28 02:36:43 +03:00
monty@mysql.com
be7f1a3570 merge with 4.0 to get fix for hpux 2004-05-28 02:04:07 +03:00
monty@mysql.com
33dcccb5bf Portability fix for HPUX 2004-05-28 02:00:34 +03:00
monty@mysql.com
47cc3af0e9 Always enable HAVE_COMPRESS on netware 2004-05-28 01:02:20 +03:00
joreland@mysql.com
79c4dcf3ee Merge joreland@bk-internal.mysql.com:mysql-4.1-ndb-jonas
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas
2004-05-27 23:42:32 +02:00
joreland@mysql.com
aa599d174a Merge joreland@bk-internal.mysql.com:wl1671
into mysql.com:/home/jonas/src/wl1671
2004-05-27 23:39:50 +02:00
monty@mysql.com
a7c17eee46 Portability fix for 32 bit file systems 2004-05-28 00:32:55 +03:00
monty@mysql.com
297be71078 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-05-28 00:27:10 +03:00
monty@mysql.com
b32fd18630 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-28 00:06:19 +03:00
monty@mysql.com
518019f511 Remove some code from sql_yacc.cc that doesn't do anything except produce warnings on VC++ 2004-05-28 00:03:19 +03:00
monty@mysql.com
e9b7e3baa8 merge with 4.0 to get fix to VC++ project files 2004-05-27 23:45:22 +03:00