Commit graph

784 commits

Author SHA1 Message Date
unknown
21a264cc4c Removed non-used variable
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-17 12:20:01 -03:00
unknown
432e469746 Merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  SCCS merged
2004-08-05 22:32:25 +02:00
unknown
e223c07eb1 Merge joreland@bk-internal.mysql.com:irix
into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/test/ndbapi/testBasic.cpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-08-05 22:19:52 +02:00
unknown
cdca651f6d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2004-08-05 19:20:11 +02:00
unknown
83c9f45fc2 Remove unused config parameters
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-05 18:23:01 +02:00
unknown
c0cc90c2e5 mysqld.cc, mysql_test_run.c:
Changed URL in error message, page has moved


netware/mysql_test_run.c:
  Changed URL in error message, page has moved
sql/mysqld.cc:
  Changed URL in error message, page has moved
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-05 17:05:21 +02:00
unknown
8dc577ef17 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-04 14:07:36 +02:00
unknown
ac8b4881c1 Merge 4.1 with jonas irix clone
BitKeeper/etc/logging_ok:
  auto-union
ndb/include/kernel/NodeState.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/include/util/Bitmask.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CpcClient.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/include/NDBT_Table.hpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoOperations.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
ndb/test/src/NDBT_Tables.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/test/src/NdbRestarter.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-08-03 14:16:16 +02:00
unknown
238b226f26 Added innodb_locks_unsafe_for_binlog option. This option turns off Innodb
next-key locking. Using this option the locks InnoDB sets on index 
  records do not affect the ``gap'' before that index record. Thus, this option
  allows phantom problem.


innobase/include/srv0srv.h:
  Added srv_locks_unsafe_for_binlog for innodb_locks_unsafe_for_binlog option.
innobase/row/row0sel.c:
  If innodb_locks_unsafe_for_binlog option is used, we lock only the record, i.e. 
  next-key locking is not used. Therefore, setting lock to the index record
  do not affect the ``gap'' before that index record. Thus, this option
  allows phantom problem, because concurrent insert operations are allowed inside 
  the select range.
innobase/srv/srv0srv.c:
  Added srv_locks_unsafe_for_binlog for innodb_locks_unsafe_for_binlog option.
sql/ha_innodb.cc:
  Added innobase_locks_unsafe_for_binlog and srv_locks_unsafe_for_binlog for 
  innodb_locks_unsafe_for_binlog option.
sql/ha_innodb.h:
  Added innobase_locks_unsafe_for_binlog for innodb_locks_unsafe_for_binlog option.
sql/mysqld.cc:
  Added OPT_INNODB_LOCKS_UNSAFE_FOR_BINLOG, innobase_locks_unsafe_for_binlog for
  innodb_locks_unsafe_for_binlog option.
sql/set_var.cc:
  Added innodb_locks_unsafe_for_binlog and innobase_locks_unsafe_for_binlog for
  innodb_locks_unsafe_for_binlog option.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-20 14:15:38 +03:00
unknown
01aceaaa15 Irix64 mipspro ndb compile fixes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-09 12:48:32 +02:00
unknown
8da691f38c Bug#4407 - assertion in ha_myisam.cc
Fix assertion failure where ha_myisam::index_next() is called
  without first calling ha_myisam::ha_index_init()


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-06 16:30:50 +01:00
unknown
1042c0e86b BUG#4384
ndb/src/common/util/ConfigValues.cpp:
  BUG#4384
  Compute pointers manually instead of using ptr[-x]
  Changed return type from "*&" to "**"
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-05 07:52:20 +02:00
unknown
f2e036aa5f WL#1564 Intensive test of prepared statements via 'mysqltest'
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-01 16:30:29 +02:00
unknown
c6e23c8549 Merge with 4.0 to get the latest bug patches to 4.1
BitKeeper/etc/ignore:
  added sql/mysql_tzinfo_to_sql
BitKeeper/etc/logging_ok:
  auto-union
acinclude.m4:
  Auto merged
extra/perror.c:
  Auto merged
include/mysql.h:
  Auto merged
innobase/include/mach0data.ic:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
BitKeeper/deleted/.del-4.0.XX-gpl.ipr~f5909a9e9bd8094:
  Auto merged
BitKeeper/deleted/.del-Clients and Tools.fgl~bf0f776883577f02:
  Auto merged
BitKeeper/deleted/.del-Development.fgl~6392ce285e73f5fc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/innodb_cache.result:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/t/innodb_cache.test:
  Auto merged
mysql-test/t/lowercase_table2.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.cc:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
libmysql/libmysql.c:
  Merge with 4.0
mysql-test/r/bdb.result:
  Merge with 4.0
mysql-test/r/range.result:
  Merge with 4.0
mysql-test/t/bdb.test:
  Merge with 4.0
mysys/hash.c:
  Merge with 4.0
scripts/mysql_install_db.sh:
  Merge with 4.0
sql/field.cc:
  Merge with 4.0
sql/field.h:
  Merge with 4.0
sql/mysql_priv.h:
  Merge with 4.0
sql/sql_handler.cc:
  Merge with 4.0
sql/sql_select.cc:
  Merge with 4.0
sql/sql_table.cc:
  Merge with 4.0
2004-06-25 20:13:05 +03:00
unknown
df1c95e3f4 mysql-copyright:
Cleaned-up trim_the_fat()


Build-tools/mysql-copyright:
  Cleaned-up trim_the_fat()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-23 12:31:10 -05:00
unknown
f5f599b5ea ndb file missing in src dist
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-21 11:24:08 +00:00
unknown
c02eb02cd4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work


BitKeeper/etc/logging_ok:
  auto-union
2004-06-18 15:00:17 -05:00
unknown
00ad281dae my_md5sum:
new file, simulates 'md5sum' as a perl script


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-18 14:57:42 -05:00
unknown
0badf47d5a Fix for bug #4182
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-18 01:42:28 -03:00
unknown
37b5323f0e Randomise time-out to avoid aborting both transactions in deadlock
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-10 20:03:06 +02:00
unknown
5304a03e99 charset.c:
Fix to be ANSI C complient
  ,


mysys/charset.c:
  Fix to be ANSI C complient
  ,
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-09 12:33:30 +05:00
unknown
19480ed616 Added function innobase_store_binlog_offset_and_flush_log requested by Guilhem
to ha_innodb.cc and ha_innodb.h


sql/ha_innodb.cc:
  /***********************************************************************
  This function stores binlog offset and flushes logs */
  
  void
  innobase_store_binlog_offset_and_flush_log(
  /*=============================*/
      char *binlog_name,          /* in: binlog name   */
      longlong offset             /* in: binlog offset */
  );
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-08 15:38:22 +03:00
unknown
895efc07ac Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-06-05 10:43:22 -07:00
unknown
e34db29d2d extern"C" bug
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-03 08:03:37 +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
30be36f002 Added missing ;
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-28 11:23:44 +02: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
1ceef15c40 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-05-25 14:53:55 -07:00
unknown
349062d6f5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


BitKeeper/etc/logging_ok:
  auto-union
2004-05-25 13:07:06 +02:00
unknown
f80e9e042e Merge
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  SCCS merged
2004-05-24 19:06:33 -07:00
unknown
80060d1e3c logging_ok:
Logging to logging@openlogging.org accepted
Do-compile:
  1. Option to ensure that logs are moved and then backed up on each host prior to a build
  2. Option to run build with flag "--without-ndbcluster"


Build-tools/Do-compile:
  1. Option to ensure that logs are moved and then backed up on each host prior to a build
  2. Option to run build with flag "--without-ndbcluster"
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-24 17:20:22 -07:00
unknown
a3d48fc6db see notes for Do-compile
Build-tools/Do-compile:
  Added two options that:
  1. Clear logs on each host prior to build
  2. Turn off ndbcluster
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-24 12:48:18 -07:00
unknown
fc81419d07 Resolving merge issues between archive and most recent changes by Monty/NDB
BitKeeper/etc/logging_ok:
  auto-union
2004-05-21 10:06:49 -07:00
unknown
d4c67b6099 fix for macosx where SIGRTMIN is missing
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-21 10:04:15 +00:00
unknown
31c1f849b1 First commit of archive example. Archive is a simple storage engine that handles inserts and selects.
acconfig.h:
  Adding undef piece for HAVE_ARCHIVE_DB	
acinclude.m4:
  Code needed for --with-archive-storage-engine flag for compile.
configure.in:
  Adding tag for Archive
sql/Makefile.am:
  Source updates to compile ha_archive
sql/examples/ha_archive.cc:
  Class file for archive storage engine. First version.
sql/handler.cc:
  Updates needed for adding archive storage engine.
sql/handler.h:
  ENUM for archive storage engine.
sql/mysql_priv.h:
  Archive show options
sql/mysqld.cc:
  Ifdef foor HAVE_ARCHIVE_DB
sql/examples/ha_archive.h:
  Include file for archive storage engine addition.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-20 18:13:11 -07:00
unknown
4194642813 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb


ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-21 00:00:34 +00:00
unknown
0228a47c9e Fix for BUG#3839 , too many signal handlers installed
ndb/src/kernel/ndb-main/Main.cpp:
  Only install signalhandlers up to SIGRTMIN
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-20 21:56:29 +02:00
unknown
d1946959ee Merge mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/mysqldev/tulin/mysql-4.1-ndb


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
2004-05-19 14:39:24 +02:00
unknown
e492e90255 Forte compile fixes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-19 14:38:38 +02:00
unknown
c77f7ab112 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Users/mikron/patch_cluster


BitKeeper/etc/logging_ok:
  auto-union
2004-05-18 16:46:25 +02:00
unknown
d6cf9dd9b7 fix ndb odbc compile
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-18 09:58:30 +02:00
unknown
5ab40f3a7d Snippet from the Internet:
Common Symbols

If you get errors in linking complaining about common symbols
ld: common symbols not allowed with MH_DYLIB format

Then it means that you've got a global variable in the library which has
not been assigned a value.

Got this problem with three globals in NdbDaemon.c


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-13 19:49:10 +02:00
unknown
4ea1e89755 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into ndbmaster.mysql.com:/ndb/clone-4.1-ndb-daily


BitKeeper/etc/logging_ok:
  auto-union
2004-05-11 22:26:10 +02:00
unknown
c8875d5693 Inverted #ifdef on HAVE_MLOCKALL
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-11 22:23:29 +02:00
unknown
b405bdc9f3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2004-05-11 21:25:17 +02:00
unknown
d5c2e2b2d3 logging_ok:
Logging to logging@openlogging.org accepted
item_cmpfunc.cc, ctype_recoding.test, ctype_recoding.result:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() (but #3704)


mysql-test/r/ctype_recoding.result:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec()
mysql-test/t/ctype_recoding.test:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec()
sql/item_cmpfunc.cc:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-10 23:19:50 +02:00
unknown
806a06fdbd merge resolve
extra/perror.c:
  Auto merged
ndb/include/debugger/SignalLoggerManager.hpp:
  Auto merged
ndb/include/ndb_version.h:
  Auto merged
ndb/src/common/portlib/unix/NdbMem.c:
  Auto merged
ndb/src/common/portlib/unix/NdbThread.c:
  Auto merged
ndb/src/common/util/Parser.cpp:
  Auto merged
ndb/src/common/util/getarg.c:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Auto merged
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/mgmapi/test/keso.c:
  Auto merged
ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-10 17:40:57 +02:00
unknown
c6bc3cfb84 Added additional parameter userdata for mysql_set_local_infile_handler
to allow binding of userland functions in PHP.


include/mysql.h:
  added new last parameter (void *) for mysql_set_local_infile_handler
  st_mysql_options:
    added void *local_infile_userdata
    added last parameter (void *) for local_infile_init function pointer
libmysql/libmysql.c:
  added parameter userdata in mysql_set_local_infile_handler
  added parameter (void *userdata __attribute__ ((unused))) in mysql_local_infile_init
  passed additional parameter userdata to init function in handle_local_infile
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-07 14:50:10 +02:00
unknown
146019b593 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug2831


BitKeeper/etc/logging_ok:
  auto-union
2004-05-07 10:42:08 +02:00
unknown
b20399d9d6 Fixed a problem with option --where, which earlier was not dynamic. One was not able
to use long query strings with it.
Bug#3633


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-07 01:02:57 +03:00