Commit graph

12562 commits

Author SHA1 Message Date
unknown
9f7c486044 collapsed ndb start/stop scripts in mysql-test-run + ndb bin name changes
BitKeeper/deleted/.del-stop_ndbcluster.sh~b3b9e9505384aca1:
  Delete: mysql-test/ndb/stop_ndbcluster.sh
mysql-test/mysql-test-run.sh:
  collapsed ndb start/stop scripts
mysql-test/ndb/Makefile.am:
  collapsed ndb start/stop scripts
mysql-test/ndb/ndbcluster.sh:
  collapsed ndb start/stop scripts + ndb bin name changes
ndb/src/kernel/Makefile.am:
  ndb bin name changes
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  ndb bin name changes
ndb/src/mgmclient/Makefile.am:
  ndb bin name changes
ndb/src/mgmsrv/Makefile.am:
  ndb bin name changes
ndb/tools/Makefile.am:
  ndb bin name changes
2004-06-02 10:37:42 +00:00
unknown
fa0df3e336 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-02 08:24:36 +02:00
unknown
b37243f8f0 BUG#3662
Fixed bug introduced with upgrade code
2004-06-02 08:24:35 +02:00
unknown
7729388a96 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-02 08:16:35 +02:00
unknown
aec8ccf27a fil0fil.c:
Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.


innobase/fil/fil0fil.c:
  Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.
2004-06-02 08:44:08 +03:00
unknown
ed8e2efa7f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb


configure.in:
  Auto merged
2004-06-02 00:56:59 +00:00
unknown
cf7719793b several ndb make changes, see respective file
ndb/src/kernel/Main.cpp:
  Rename: ndb/src/kernel/ndb-main/Main.cpp -> ndb/src/kernel/Main.cpp
ndb/src/kernel/SimBlockList.cpp:
  Rename: ndb/src/kernel/ndb-main/SimBlockList.cpp -> ndb/src/kernel/SimBlockList.cpp
BitKeeper/deleted/.del-Makefile.am~dbb6038d7163a54d:
  Delete: ndb/src/kernel/ndb-main/Makefile.am
BitKeeper/deleted/.del-Makefile_old~1f37e763ba5d06d0:
  Delete: ndb/src/kernel/ndb-main/Makefile_old
ndb/old_files/BinDist.sh:
  Rename: ndb/BinDist.sh -> ndb/old_files/BinDist.sh
ndb/old_files/Defs.mk:
  Rename: ndb/Defs.mk -> ndb/old_files/Defs.mk
ndb/old_files/Makefile:
  Rename: ndb/Makefile_old -> ndb/old_files/Makefile
ndb/old_files/SrcDist.sh:
  Rename: ndb/SrcDist.sh -> ndb/old_files/SrcDist.sh
ndb/old_files/configure:
  Rename: ndb/configure_old -> ndb/old_files/configure
ndb/old_files/Epilogue.mk:
  Rename: ndb/Epilogue.mk_old -> ndb/old_files/Epilogue.mk
ndb/config/old_files/Defs.DEBUG.mk:
  Rename: ndb/config/Defs.DEBUG.mk -> ndb/config/old_files/Defs.DEBUG.mk
ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk:
  Rename: ndb/config/Defs.HPUX.HPPA.GCC.mk -> ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk
ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk:
  Rename: ndb/config/Defs.IBMAIX.POWERPC.GCC.mk -> ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk
ndb/config/old_files/Defs.LINUX.x86.GCC.mk:
  Rename: ndb/config/Defs.LINUX.x86.GCC.mk -> ndb/config/old_files/Defs.LINUX.x86.GCC.mk
ndb/config/old_files/Defs.LINUX.x86.ICC.mk:
  Rename: ndb/config/Defs.LINUX.x86.ICC.mk -> ndb/config/old_files/Defs.LINUX.x86.ICC.mk
ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk:
  Rename: ndb/config/Defs.LINUX.x86_64.GCC.mk -> ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk
ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk:
  Rename: ndb/config/Defs.MACOSX.POWERPC.GCC.mk -> ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk
ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk:
  Rename: ndb/config/Defs.OSE.PPC750.DIAB.mk -> ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk
ndb/config/old_files/Defs.RELEASE.mk:
  Rename: ndb/config/Defs.RELEASE.mk -> ndb/config/old_files/Defs.RELEASE.mk
ndb/config/old_files/Defs.RELEASE_TRACE.mk:
  Rename: ndb/config/Defs.RELEASE_TRACE.mk -> ndb/config/old_files/Defs.RELEASE_TRACE.mk
ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk:
  Rename: ndb/config/Defs.SIMCELLO.SOFTOSE.GCC.mk -> ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk
ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk:
  Rename: ndb/config/Defs.SOFTOSE.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk
ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk:
  Rename: ndb/config/Defs.SOLARIS.SPARC.FORTE6.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk
ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk:
  Rename: ndb/config/Defs.SOLARIS.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk
ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk:
  Rename: ndb/config/Defs.SOLARIS.SPARC_64.GCC.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk
ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk:
  Rename: ndb/config/Defs.SOLARIS6.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk
ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk:
  Rename: ndb/config/Defs.TRU64X.ALPHA.GCC.mk -> ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk
ndb/config/old_files/Defs.WIN32.x86.VC7.mk:
  Rename: ndb/config/Defs.WIN32.x86.VC7.mk -> ndb/config/old_files/Defs.WIN32.x86.VC7.mk
ndb/config/old_files/acinclude.m4:
  Rename: ndb/config/acinclude.m4 -> ndb/config/old_files/acinclude.m4
ndb/config/old_files/Makefile.am:
  Rename: ndb/config/Makefile.am_old -> ndb/config/old_files/Makefile.am
ndb/config/old_files/GuessConfig.sh:
  Rename: ndb/config/GuessConfig.sh_old -> ndb/config/old_files/GuessConfig.sh
ndb/config/old_files/configure.in:
  Rename: ndb/config/configure.in -> ndb/config/old_files/configure.in
ndb/config/old_files/config.h.in:
  Rename: ndb/config/config.h.in -> ndb/config/old_files/config.h.in
ndb/old_files/README:
  Rename: ndb/README -> ndb/old_files/README
ndb/old_files/mysqlclusterenv.sh:
  Rename: ndb/mysqlclusterenv.sh -> ndb/old_files/mysqlclusterenv.sh
ndb/old_files/env.sh:
  Rename: ndb/env.sh -> ndb/old_files/env.sh
BitKeeper/deleted/.del-Makefile~650473b0dabb331b:
  Delete: ndb/src/scripts/Makefile
ndb/src/old_files/ndbbaseclient/Makefile:
  mvdir
ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp:
  mvdir
ndb/src/old_files/ndbclient/Makefile:
  mvdir
ndb/src/old_files/ndbclient/ndbclient_dummy.cpp:
  mvdir
ndb/src/old_files/Makefile:
  Rename: ndb/src/Makefile_old -> ndb/src/old_files/Makefile
acinclude.m4:
  added ndb configure options
configure.in:
  moved lots of stuff for ndb over to Makefile.ams and added some config opt for ndb
mysql-test/ndb/install_ndbcluster.sh:
  adopt to new ndb install
mysql-test/ndb/stop_ndbcluster.sh:
  adopt to new ndb install
ndb/Makefile.am:
  moved some things to include/Makefile.am
ndb/config/common.mk.am:
  moved some things from configure.in
ndb/config/type_kernel.mk.am:
  moved some things from configure.in
ndb/config/type_mgmapiclient.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapi.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapiclient.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapitest.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapitools.mk.am:
  moved some things from configure.in
ndb/config/type_util.mk.am:
  moved some things from configure.in
ndb/src/Makefile.am:
  .
ndb/src/common/portlib/Makefile.am:
  fix for make distdir
ndb/src/cw/cpcd/Makefile.am:
  added configurable ldflags
ndb/src/kernel/Makefile.am:
  moved up ndb-main one level
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  added configurable ldflags
ndb/src/kernel/blocks/suma/Makefile.am:
  fixed error
ndb/src/kernel/error/Makefile.am:
  fix error
ndb/src/kernel/vm/Makefile.am:
  fix error
ndb/src/mgmapi/Makefile.am:
  removed libMGM_API
ndb/src/mgmclient/Makefile.am:
  added configurable ldflags
ndb/src/mgmsrv/Makefile.am:
  added configurable ldflags
ndb/src/ndbapi/Makefile.am:
  removed libNDB_API
ndb/test/Makefile.am:
  added optional build of ndbapi tests
ndb/tools/Makefile.am:
  added configurable ldflags
ndb/include/Makefile.am:
  fixed missing .h files in make distdir
scripts/make_binary_distribution.sh:
  updated for ndb and new make
2004-06-02 00:54:58 +00:00
unknown
eb77b3d479 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-02 00:28:00 +02:00
unknown
39c7065fae cleanup 2004-06-02 00:27:59 +02:00
unknown
869fbff91f check_scramble_323 shuold ensure that the scramble has the correct length
sql/sql_acl.cc:
  cleanup
2004-06-01 23:58:33 +02:00
unknown
215248f73e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


acconfig.h:
  Auto merged
configure.in:
  Auto merged
2004-06-01 22:39:40 +02:00
unknown
ce0d015384 Removed compiler warnings
libmysqld/Makefile.am:
  Removed define that is now defined by configure and my_global.h
mysql-test/r/func_gconcat.result:
  Fixed test result after removing end space
sql/share/romanian/errmsg.txt:
  Fixed wrong error message
sql/sql_insert.cc:
  Removed compiler warning
2004-06-01 23:39:39 +03:00
unknown
ebdc88c4f9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


configure.in:
  Auto merged
2004-06-01 22:30:03 +03:00
unknown
3d6c17865d Update version number
Fixed serbian error messages
Fix for windows regarding changed variable name


configure.in:
  Update version number
  Added serbian error messages
libmysqld/libmysqld.def:
  Fix changed variable names
mysql-test/t/func_gconcat.test:
  remove some \r
sql/share/serbian/errmsg.txt:
  Added missing error messages
2004-06-01 22:29:46 +03:00
unknown
0f3f6f44b6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ftr


sql/mysqld.cc:
  Auto merged
2004-06-01 22:47:28 +05:00
unknown
7787dec672 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ftr


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2004-06-01 22:37:39 +05:00
unknown
5df2acc856 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3412
2004-06-01 21:52:42 +05:00
unknown
c91972c29a 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
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-06-01 18:05:43 +02:00
unknown
cfb496aed8 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
unknown
6ce4897fc6 Explicit use of static libs for selected ndb programs 2004-06-01 16:05:14 +00:00
unknown
e6626bdb2d InnoDB: os0file.c:
Do not lock raw devices or files opened for read only


innobase/os/os0file.c:
  Do not lock raw devices or files opened for read only
2004-06-01 17:30:46 +03:00
unknown
389e8bec49 fil0fil.c:
Add missing newlines in fprintfs


innobase/fil/fil0fil.c:
  Add missing newlines in fprintfs
2004-06-01 16:41:13 +03:00
unknown
bab2231f71 InnoDB cleanup: Fix potential buffer overflows,
allow deletion of tablespaces whose names contain "'"


innobase/dict/dict0load.c:
  dict_check_tablespaces_or_store_max_id():
  Dynamically allocate memory for file name
innobase/fil/fil0fil.c:
  Dynamically allocate memory for file names
innobase/os/os0file.c:
  os_file_dirname(): allocate slightly less memory
  os_file_create_subdirs_if_needed(): compare more efficiently
innobase/row/row0mysql.c:
  Allow tablespaces with "'" in their names to be deleted
  Display identifiers with ut_print_name() or dict_index_name_print()
2004-06-01 15:19:09 +03:00
unknown
c32a2521f0 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
unknown
0bfc8c57ca various ndb make changes, see respective file
BitKeeper/deleted/.del-Makefile.am~d4e228ebd21fc066:
  Delete: ndb/include/Makefile.am
acinclude.m4:
  static linking of ndbclient into mysqld
configure.in:
  removed ndb/include/Makefile.am + fixed conditional compile of ndb shm, sci
ndb/Makefile.am:
  dist-hook for make distdir in ndb
ndb/config/type_ndbapitest.mk.am:
  use of libndbclient.so in testprograms
ndb/config/type_ndbapitools.mk.am:
  static linking to binary distributed ndb tools
ndb/src/Makefile.am:
  enable libndbclient.so
ndb/src/common/transporter/Makefile.am:
  added support for optional inclusion of shared mem and sci in ndb transporter
ndb/tools/Makefile.am:
  new type for tools which should be statically linked with libndbclient
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-01 11:19:40 +00:00
unknown
c4cb7a9b43 Small portability fix for strnlen 2004-06-01 11:51:10 +02:00
unknown
c0b6c9f7e9 BUILD/compile-pentium-maintainer should not ever be needed since there is
no AM_MAINTAINER_MODE macro in configure.in


BitKeeper/deleted/.del-compile-pentium-maintainer~3747d5c8d7ec49df:
  Delete: BUILD/compile-pentium-maintainer
2004-05-31 17:04:41 +04:00
unknown
ba0a7c4694 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
unknown
7f1303329d Fix for Bug#3796 "Prepared statement, select concat(<parameter>,<column>), wrong
result": new Item_param member for use in val_str()


sql/item.cc:
  Fix for Bug#3796:
  - return str_value_ptr from val_str to prevent modifications of parameter 
  value.
sql/item.h:
  Fix for bug#3796:
  - Item::val_str() method semantics documented
  - new member of Item_param
tests/client_test.c:
  Test case for bug #3796 added. A few compile-time warnings removed.
2004-05-31 14:21:48 +04:00
unknown
92c10c681f 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
unknown
42dae97f56 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
unknown
79749435a9 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
unknown
bfaaee5343 if exists should not be used inside test
removed influence of some tests on other tests


mysql-test/r/multi_update.result:
  removed influence on other tests
mysql-test/r/subselect.result:
  if exists should not be used inside test
mysql-test/t/multi_update.test:
  removed influence on other tests
mysql-test/t/subselect.test:
  if exists should not be used inside test
mysql-test/t/system_mysql_db_fix.test:
  removed influence on other tests
2004-05-28 21:31:51 +03:00
unknown
90ac132b56 Restore.cpp:
Added include of ndbout


ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Added include of ndbout
2004-05-28 14:10:27 +02:00
unknown
36652d0053 problems with automake version, need to figure out different way to do this 2004-05-28 11:56:35 +00:00
unknown
431d0e6101 Proposed fix for bug #3412 (embedded server: prepared statement returns
empty recordset where some records should be found)


sql/ha_myisam.cc:
  Code simplified with vio_ok()
sql/mysqld.cc:
  vio_ok used
sql/slave.cc:
  vio_ok used
sql/sql_class.cc:
  Here is the place of the error - we should not examine net.vio in
  embedded library
sql/sql_class.h:
  method added to always return TRUE in embedded library, and to
  sheck thd.net.vio otherwise
sql/sql_show.cc:
  code simplified with vio_ok()
2004-05-28 15:59:29 +05:00
unknown
1f265df25f ha_ndbcluster.cc:
Missing  semicolon


sql/ha_ndbcluster.cc:
  Missing  semicolon
2004-05-28 12:09:12 +02: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
ed8d32f688 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
unknown
72a71135b9 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
Build-tools/Do-compile:
  Auto merged
include/my_global.h:
  Auto merged
2004-05-28 11:03:20 +03:00
unknown
606cb09d86 Added option --config-extra-env to Do-compile
Build-tools/Do-compile:
  Added option --config-extra-env
include/my_global.h:
  Cleaned up comment to follow same indentation style as the rest of the code
2004-05-28 11:02:34 +03: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
9061fbc8e5 New patch to ensure that InnoDB gets values for CFLAGS and CXXFLAGS
sql/handler.h:
  Remove compiler warnings
2004-05-28 10:41:38 +03: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
e356f66412 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


include/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