Commit graph

12604 commits

Author SHA1 Message Date
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
80c662479b Changed --log-warnings to be integer instead of boolean. Given --skip-log-warnings
will disable warnings, --log-warnings will increment warning level by one, or the
level can be given as an optional argument. Default level is 1.

Changed aborted connection warning to be logged only if the level is > 1.


sql/sql_class.h:
  Changed boolean into ulong.
sql/sql_parse.cc:
  Changed aborted connection warning to be logged only if the level is > 1.
2004-06-01 17:29:24 +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
fec8faa06a InnoDB: Do not get a lock for consistent reads (Bug #3894)
sql/ha_innodb.cc:
  start_stmt(): Obtain an exclusive lock for other than plain SELECT
2004-05-31 16:33:45 +03: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
ea21baa5bf Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2004-05-31 13:53:44 +05:00
unknown
09b9182e2e mysql_get_parameter interface fixed
include/mysql.h:
  (void) added to the empty parameter's list
libmysql/libmysql.c:
  (void) added to the empty parameter's list
2004-05-31 13:53:10 +05:00
unknown
0858e15c13 VC++ project for to compile the udf_example.cc on
Windows
2004-05-30 04:11:19 -03:00
unknown
256bada7e2 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-05-29 17:53:01 +02:00
unknown
f1ffa13923 backport wild_compare fix from 4.1 - bug#3924 2004-05-29 17:52:20 +02: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
64e98031b2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3738
2004-05-28 16:38:06 +05: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
0cb0e7f5b9 a fix.
(Bug#3738: SQL_CALC_FOUND_ROWS ignores WHERE if LIMIT used,
 Bug#3845: wrong FOUND_ROWS result)
2004-05-28 15:01:16 +05: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
7aa93578dd InnoDB: Add diagnostics when tmpfile() fails at start (Bug #3919)
innobase/dict/dict0dict.c:
  Replace tmpfile() with os_file_create_tmpfile()
innobase/include/os0file.h:
  Add os_file_create_tmpfile()
innobase/lock/lock0lock.c:
  Replace tmpfile() with os_file_create_tmpfile()
innobase/os/os0file.c:
  Add os_file_create_tmpfile()
  os_file_handle_error(): remove unused first parameter
2004-05-28 11:15:59 +03: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
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