Commit graph

12518 commits

Author SHA1 Message Date
unknown
36652d0053 problems with automake version, need to figure out different way to do this 2004-05-28 11:56:35 +00:00
unknown
298fb0f94d 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
unknown
30be36f002 Added missing ;
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-28 11:23:44 +02:00
unknown
6bcb78e700 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1


ndb/src/Makefile_old:
  Auto merged
2004-05-28 11:23:44 +02:00
unknown
57d9bf4c52 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
unknown
915fd0310b added shared mem + sci options for ndb
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-28 09:22:27 +00:00
unknown
be567b5964 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
unknown
1e7fd2f1f4 Fix for compile problem with newtonapi
ndb/src/Makefile:
  Compile newtonapi
ndb/src/newtonapi/dba_schema.cpp:
  Use NdbSchemaCon.hpp from newtonapi
2004-05-28 09:50:17 +02:00
unknown
fc8e3654fe BUg#3910
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  New error insert for ndbrequire
ndb/src/kernel/ndb-main/Main.cpp:
  WEXITSTATUS only contains valid value if WIFEXITED
2004-05-28 09:09:47 +02:00
unknown
36c291181f Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas


configure.in:
  Auto merged
2004-05-28 07:08:15 +02:00
unknown
9bd34fd5b7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


configure.in:
  Auto merged
2004-05-28 07:04:07 +02:00
unknown
128a53d327 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


configure.in:
  Auto merged
2004-05-28 03:24:29 +02:00
unknown
a153d35c05 Portability fix (using 'char' as argument to C functions may give warnings)
mysql-test/r/variables.result:
  update results after merge
strings/int2str.c:
  Portability fix (using 'char' as a parameter may give a warning)
2004-05-28 02:36:43 +03:00
unknown
6645955abf merge with 4.0 to get fix for hpux
configure.in:
  Auto merged
innobase/os/os0file.c:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysql-test/r/variables.result:
  merge fix
2004-05-28 02:04:07 +03:00
unknown
d1306dfa9d Portability fix for HPUX
configure.in:
  Ensure that innodb gets system specific CFLAGS and CXXFLAGS
innobase/os/os0file.c:
  Don't use pread/pwrite on systems where these are not working.
  This fixes a bug on HPUX, where InnoDB didn't create the ibdata1 file correctly.
2004-05-28 02:00:34 +03:00
unknown
b9c825e4a0 Always enable HAVE_COMPRESS on netware
include/config-netware.h:
  Always enable HAVE_COMPRESS on netware
  We can't detect compress in configure on netware because we must use AC_TRY_RUN to detect zlib on other platforms
2004-05-28 01:02:20 +03:00
unknown
5d8b1f0114 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
unknown
b2842c3c07 Portability fix for 32 bit file systems 2004-05-28 00:32:55 +03:00
unknown
935a801a8a Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
netware/BUILD/nwbootstrap:
  Auto merged
2004-05-28 00:27:10 +03:00
unknown
5cacfb327f 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
unknown
b09974a1a0 Remove some code from sql_yacc.cc that doesn't do anything except produce warnings on VC++
mysql-test/t/fulltext.test:
  After merge fix
2004-05-28 00:03:19 +03:00
unknown
32f20312ee merge with 4.0 to get fix to VC++ project files
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
myisam/ft_parser.c:
  Keep old code
mysql-test/r/fulltext.result:
  Remove duplicate test from 4.0
2004-05-27 23:45:22 +03:00
unknown
d5d9f91575 Merged in some patches from Novell.
netware/BUILD/nwbootstrap:
  Patch from Novell, create the libmysqld.imp file.
netware/mysqld_safe.c:
  Patch from Novell, new option --set-variable.
2004-05-27 23:39:50 +03:00
unknown
b4a4bc47b4 removed reference to not existing library lib_release\dbug.lib 2004-05-27 22:53:36 +03:00
unknown
80628b0ebe Fix dependency for mgmsrv 2004-05-27 21:18:45 +02:00
unknown
a4d82ab8fe backport bug#2708 fix from 4.1
myisam/ft_boolean_search.c:
  perlify comment
2004-05-27 21:14:59 +02:00
unknown
166e750f25 Merge
ndb/src/kernel/ndb-main/Makefile.am:
  Auto merged
2004-05-27 21:05:14 +02:00
unknown
d97a303fb1 Use ndbclient more
configure.in:
  Include mgmapi
ndb/config/type_ndbapi.mk.am:
  remove LDADD from type
ndb/config/type_util.mk.am:
  remove LDADD from type
ndb/src/cw/cpcd/Makefile.am:
  LDADD ndbclient
ndb/src/kernel/ndb-main/Makefile.am:
  Fix LDADD
ndb/src/mgmclient/Makefile.am:
  LDADD ndbclient
ndb/src/mgmsrv/Makefile.am:
  LDADD ndbclient
ndb/test/run-test/Makefile.am:
  LDADD ndbclient
2004-05-27 21:03:05 +02:00
unknown
420863cfea Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-05-27 20:40:20 +02:00
unknown
5a01aa7d68 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas
2004-05-27 20:16:18 +02:00
unknown
486494b3ec Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-05-27 19:59:38 +02:00
unknown
10f04d1974 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas


configure.in:
  Auto merged
ndb/src/mgmapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
2004-05-27 19:58:19 +02:00
unknown
fb014155b8 Fix for source of libndbclient 2004-05-27 18:41:57 +02:00
unknown
7c33075672 Fix for building libndbclient before entering kernel 2004-05-27 18:41:56 +02:00
unknown
ee2af63f95 oops ndb mistake 2004-05-27 16:41:55 +00:00
unknown
160be94a5d fix ndb make 2004-05-27 16:38:40 +00:00
unknown
29f3f5335d ndb fixes see files
acconfig.h:
  added switched for shm sci in ndb
acinclude.m4:
  added switched for shm sci in ndb
configure.in:
  added dependency for ndblibs to mysql server
ndb/src/common/transporter/Makefile.am:
  small fix
ndb/src/common/transporter/Transporter.hpp:
  ndb_global for sci and shm defines
2004-05-27 16:28:41 +00:00
unknown
4688d39aad changed to ndbclient 2004-05-27 15:47:31 +00:00
unknown
2d1384e442 Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should
produce hex digits in lower case). (fixed version)

Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.


client/mysql.cc:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
client/mysqladmin.c:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
dbug/dbug.c:
   _dig_vec became _dig_vec_upper.
include/m_string.h:
  _dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower.
  my_itoa()/my_ltoa() functions were removed because they were never used in our code.
  int2str() now has one more argument which controls case of digits it will produce.
include/my_global.h:
  my_itoa()/my_ltoa() functions were removed because they were never used in our code.
isam/isamchk.c:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
libmysql/libmysql.def:
  _dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower.
myisam/myisamchk.c:
  Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str()
  call.
mysys/mf_tempfile.c:
  _dig_vec became _dig_vec_upper.
mysys/my_error.c:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
mysys/my_tempnam.c:
  _dig_vec became _dig_vec_upper.
sql-common/client.c:
  Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str()
  call.
sql/item_strfunc.cc:
  _dig_vec became _dig_vec_upper. Also we don't need hex[] array in this file now because we
  have _dig_vec_lower instead.
sql/mysqld.cc:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
sql/password.c:
  _dig_vec became _dig_vec_upper.
sql/sql_bitmap.h:
  _dig_vec became _dig_vec_upper.
strings/int2str.c:
  Replaced _dig_vec by _dig_vec_upper/_dig_vec_lower pair.
  int2str() now has one more argument which controls case of digits it will produce.
  my_itoa()/my_ltoa() functions were removed because they were never used in our code.
strings/longlong2str-x86.s:
  _dig_vec became _dig_vec_upper.
strings/longlong2str.c:
  _dig_vec became _dig_vec_upper.
strings/my_vsnprintf.c:
  If my_snprintf() is printing %x argument it should produce lower case hexadecimal digits
  to be snprintf() compatible.
2004-05-27 17:54:40 +04:00
unknown
a216e205a5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-05-27 13:34:17 +00:00
unknown
95013a3ba3 oops 2004-05-27 13:33:19 +00:00
unknown
6926eeeec0 Add mgmapi
configure.in:
  Added include of mgmapi
ndb/src/common/debugger/signaldata/Makefile.am:
  New files
ndb/src/common/util/Makefile.am:
  Add files
ndb/src/kernel/ndb-main/Makefile.am:
  Use mgmapi
ndb/src/kernel/vm/Makefile.am:
  Use mgmapi
ndb/src/mgmapi/Makefile.am:
  new files
ndb/src/mgmclient/Makefile.am:
  use mgmapi
ndb/src/mgmsrv/Makefile.am:
  use mgmapi
2004-05-27 15:20:38 +02:00
unknown
a1bcf38257 InnoDB cleanup:
Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
Remove (char*) casts of string constants; add const qualifiers
Remove some Hot Backup code unless #ifdef UNIV_HOTBACKUP


innobase/btr/btr0cur.c:
  Cast away constness from dfield_get_data() result
innobase/buf/buf0buf.c:
  Enclose a debug assertion in #ifdef UNIV_SYNC_DEBUG
innobase/buf/buf0rea.c:
  Corrected compile error #ifdef UNIV_DEBUG
innobase/dict/dict0boot.c:
  Remove (char*) casts of string constants
innobase/dict/dict0crea.c:
  Remove (char*) casts of string constants
innobase/dict/dict0dict.c:
  Enclosed a debug assertion in #ifdef UNIV_SYNC_DEBUG
  Replaced some debug assertions with preprocessor tests
  Add const qualifiers to string constants
innobase/dict/dict0load.c:
  Remove (char*) casts of string constants
innobase/fil/fil0fil.c:
  Remove (char*) casts of string constants
  Enclose debug assertions in #ifdef UNIV_SYNC_DEBUG
innobase/ha/ha0ha.c:
  Enclose debug assertion in #ifdef UNIV_SYNC_DEBUG
innobase/ibuf/ibuf0ibuf.c:
  Remove (char*) casts of string constants
innobase/include/buf0buf.ic:
  Add const qualifier to string parameter
innobase/include/fil0fil.h:
  Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
innobase/include/log0recv.h:
  Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
  Enclose ibbackup specific code in #ifdef UNIV_HOTBACKUP
innobase/include/mem0dbg.ic:
  Add const qualifiers to string parameters
innobase/include/srv0srv.h:
  Add const qualifiers to string constants
  Enclose srv_arch_dir and srv_log_archive_on #ifdef UNIV_LOG_ARCHIVE
innobase/include/sync0rw.ic:
  Add const qualifier to string parameter
innobase/include/sync0sync.ic:
  Add const qualifier to string parameter
innobase/log/log0log.c:
  Enclose log archiving code in #ifdef UNIV_LOG_ARCHIVE
  Do not cast string constants to (char*)
innobase/log/log0recv.c:
  Enclose ibbackup specific code in #ifdef UNIV_HOTBACKUP
  Enclose disabled log code in #ifdef UNIV_LOG_REPLICATE or UNIV_LOG_ARCHIVE
innobase/mem/mem0dbg.c:
  Add const qualifiers to string parameters
innobase/page/page0page.c:
  Remove (char*) casts of string constants
innobase/pars/pars0pars.c:
  Add const qualifier to string variable
innobase/row/row0ins.c:
  Remove (char*) casts of string constants
  Add const qualifiers to string parameters
  row_ins_foreign_check_on_constraint(): Allocate table_name dynamically
innobase/row/row0mysql.c:
  Remove (char*) casts of string constants
innobase/row/row0sel.c:
  Remove (char*) casts of string constants
innobase/srv/srv0srv.c:
  Remove (char*) casts of string constants
  Disable log archiving variables unless #ifdef UNIV_LOG_ARCHIVE
innobase/srv/srv0start.c:
  Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
  Remove (char*) casts of string constants
innobase/sync/sync0rw.c:
  Remove (char*) casts of string constants
  Add const qualifier to string parameter
innobase/sync/sync0sync.c:
  Remove (char*) cast of string constant
  Add const qualifier to string parameter
innobase/trx/trx0roll.c:
  Remove (char*) cast of string constants
innobase/trx/trx0sys.c:
  Remove (char*) cast of string constants
innobase/trx/trx0trx.c:
  Remove (char*) cast of string constant
sql/ha_innodb.cc:
  Enclose log archiving code in #ifdef UNIV_LOG_ARCHIVE
2004-05-27 15:27:43 +03:00
unknown
d366a2e4c9 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.spa
2004-05-27 17:27:42 +05:00
unknown
b2043ef8da see resp file
configure.in:
  added NDB_EXTRA_FLAGS
ndb/src/common/transporter/Makefile.am:
  removed SHM in ndb
2004-05-27 12:14:19 +00:00
unknown
7f49646cf3 Merging
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/rt_test.c:
  Auto merged
myisam/sp_test.c:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/spatial.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
myisam/mi_range.c:
  merging
myisam/mi_rnext.c:
  merging
2004-05-27 16:32:49 +05:00
unknown
a00152e952 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc05.(none):/space2/tomas/mysql-4.1
2004-05-27 13:19:55 +02:00
unknown
f9e8b64e1f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-05-27 11:19:54 +00:00
unknown
cc55f6934b fix for gcc version 3 bug 2004-05-27 11:16:14 +00:00
unknown
0aee1b0ad6 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/Epilogue.mk_old:
  Auto merged
ndb/src/common/debugger/signaldata/Makefile_old:
  Auto merged
ndb/src/common/mgmcommon/Makefile_old:
  Auto merged
ndb/src/common/util/Makefile_old:
  Auto merged
ndb/src/kernel/Makefile_old:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Makefile_old:
  Auto merged
ndb/src/kernel/vm/Makefile_old:
  Auto merged
ndb/src/mgmapi/Makefile_old:
  Auto merged
ndb/src/mgmclient/Makefile_old:
  Auto merged
ndb/src/mgmsrv/Makefile_old:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/Makefile_old:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/test/ndbapi/testDict.cpp:
  Auto merged
ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
ndb/test/src/Makefile_old:
  Auto merged
2004-05-27 11:36:09 +02:00