Commit graph

14383 commits

Author SHA1 Message Date
unknown
9fd78ea3d3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb


sql/ha_ndbcluster.cc:
  Auto merged
2004-09-03 15:12:34 +00:00
unknown
e8c2e41841 renamed ha_recovery_logging to ha_enable_transaction
added tests to alter table for "large" alter tables and truncates in ndbcluster
added debug printout in restart() in ndbcluster
added flag THD::transaction.on to enable/disable transaction


mysql-test/r/ndb_alter_table.result:
  added tests to alter table for "large" alter tables and truncates
mysql-test/t/ndb_alter_table.test:
  added tests to alter table for "large" alter tables and truncates
ndb/src/ndbapi/NdbConnection.cpp:
  added debug printout in restart()
sql/ha_ndbcluster.cc:
  added support for large alter table and truncate
sql/handler.cc:
  renamed ha_recovery_logging to ha_enable_transaction
sql/handler.h:
  renamed ha_recovery_logging to ha_enable_transaction
sql/sql_class.cc:
  added flag THD::transaction.on to enable/disable transaction
sql/sql_class.h:
  added flag THD::transaction.on to enable/disable transaction
sql/sql_delete.cc:
  added disable transaction for mysql_truncate
sql/sql_table.cc:
  renamed ha_recovery_logging to ha_enable_transaction
2004-09-03 15:11:09 +00:00
unknown
92f58a4b76 Remove usage of row count (as it trashes _all_ explain & table status)
Use order by


mysql-test/r/ndb_index_ordered.result:
  Use order by
mysql-test/t/ndb_index_ordered.test:
  Use order by
sql/ha_ndbcluster.cc:
  Remove usage of row count (as it trashes _all_ explain & table status)
2004-09-03 14:46:39 +02:00
unknown
f54c4a9460 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


sql/ha_ndbcluster.cc:
  Auto merged
2004-09-03 13:56:11 +02:00
unknown
6302d0d0e1 Added support for HA_READ_ORDER +
Added table statistics
2004-09-03 13:55:40 +02:00
unknown
1bef804e77 introduced my_init() in backwards compatible Ndb constructor 2004-09-03 11:24:14 +00:00
unknown
c83d39c90d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-02 15:52:46 +00:00
unknown
0d3ade0bb5 fixed wrong initial auto increment value bug#5369
ndb/tools/waiter.cpp:
  added option to set timeout to ndb_waiter
2004-09-02 15:51:44 +00:00
unknown
4803d9f179 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Users/mikron/mysql-4.1-ndb
2004-09-02 17:02:47 +02:00
unknown
467017139e see resp file
mysql-test/ndb/ndbcluster.sh:
  added better/safer shutdown
2004-09-02 15:02:46 +00:00
unknown
d5bf76c133 Fix for bug overwriting stack when table name larger than 32 bytes.
getWords interprets the length as number of words and previously
number of bytes was sent in.
2004-09-02 15:08:17 +02:00
unknown
8628937ec2 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-blobs


sql/ha_ndbcluster.cc:
  Auto merged
2004-09-02 14:11:47 +02:00
unknown
0a6dda5518 Merge
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbReceiver.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  SCCS merged
2004-09-02 12:11:46 +00:00
unknown
3b124d4fb2 added connect thread to Ndb_cluster_connection +
some other small fixes


ndb/include/mgmcommon/ConfigRetriever.hpp:
  added options to do_connect to contol how connects failures should be treated
ndb/include/mgmcommon/NdbConfig.h:
  method to retrieve datadir path (to user for chdir)
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Added connect thread
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  added options to do_connect to contol how connects failures should be treated
ndb/src/common/mgmcommon/NdbConfig.c:
  method to retrieve datadir path (to user for chdir)
ndb/src/kernel/main.cpp:
  ndbd to do chdir
ndb/src/kernel/vm/WatchDog.cpp:
  added my_thread_init for debug
ndb/src/ndbapi/ClusterMgr.cpp:
  added my_thread_init for debug
ndb/src/ndbapi/TransporterFacade.cpp:
  removed call to atexit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added connect thread
2004-09-02 12:04:50 +00:00
unknown
b186ef5a62 ha_ndbcluster.cc, ndb_blob.test, ndb_blob.result:
bug-5013 fix


mysql-test/r/ndb_blob.result:
  bug-5013 fix
mysql-test/t/ndb_blob.test:
  bug-5013 fix
sql/ha_ndbcluster.cc:
  bug-5013 fix
2004-09-02 12:42:03 +02:00
unknown
59e2b96438 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2004-09-01 14:58:12 +00:00
unknown
a047513299 added class Ndb_cluster_connection to prepare for making order of starting mysqld and ndbd irrelevant
ndb/src/mgmsrv/Makefile.am:
  changed so that datadir is "." by default so that behaviour is the same as before
2004-09-01 14:56:53 +00:00
unknown
b7ffde86a0 Piggy back close scan req 2004-09-01 13:42:58 +02:00
unknown
e7a950a61d Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025
2004-09-01 04:56:45 +02:00
unknown
069c47d260 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


acinclude.m4:
  Auto merged
configure.in:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-09-01 04:55:16 +02:00
unknown
25086da570 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-09-01 04:52:50 +02:00
unknown
15135482ad Fix bug in trans counter for read 2004-09-01 04:50:17 +02:00
unknown
22f3bcdec7 Also update printer 2004-08-31 22:17:58 +02:00
unknown
540c90e407 Added some more options to TC timers, such as:
1) explicit start/stop timer (instead of perodical reports)
2) scan & range scan reporting
2004-08-31 22:12:08 +02:00
unknown
db210b0919 bug#4591
ndb/src/mgmsrv/MgmtSrvr.cpp:
  bug#4591
  Wait for not started instead of (! no contact)
2004-08-31 21:34:11 +02:00
unknown
f34a7ff423 run in loop 2004-08-31 16:27:31 +02:00
unknown
775c057ef4 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-31 15:53:28 +02:00
unknown
e9c594e6d4 Better easier to call error message format. 2004-08-31 18:53:27 +05:00
unknown
d6493dbefe - bumped up version number in configure.in to "4.1.5-gamma"
- tagged ChangeSet@1.2013 as "mysql-4.1.4"


configure.in:
   - bumped up version number in configure.in to "4.1.5-gamma"
2004-08-31 15:53:26 +02:00
unknown
52df5f5b5a Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


cmd-line-utils/libedit/Makefile.am:
  Auto merged
configure.in:
  Auto merged
2004-08-31 18:53:24 +05:00
unknown
8bf3885883 fixed two compiling bugs for libedit
acinclude.m4:
  added macro to check if dirent.d_namlen is defined
cmd-line-utils/libedit/config.h:
  added define for __attribute__
cmd-line-utils/libedit/readline.c:
  checked STRUCT_DIRENT_HAS_D_NAMLEN instead of
  old enumeration of problem platforms
configure.in:
  added checking if dirent has d_namlen member field
2004-08-31 18:29:01 +05:00
unknown
dfad106cc3 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025


ndb/src/ndbapi/NdbOperationInt.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-08-31 15:07:43 +02:00
unknown
042d620948 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-31 15:00:50 +02:00
unknown
54c1dc12f8 Update test prg
1) merge join
2) lookups
2004-08-31 14:53:59 +02:00
unknown
51fce2d247 fixed compiling bug of libedit on qnx
discarded using of uint in cmd-line-utils/libedit/chared.c
because it's undefined on qnx


cmd-line-utils/libedit/chared.c:
  discarded using of uint because it's undefined on qnx
2004-08-31 17:51:02 +05:00
unknown
7728843c66 fixed compiling bug
(non gcc compilers don't understand '-Dx()=' option)


cmd-line-utils/libedit/Makefile.am:
  discarded '-Dx()=' options for compatibility with non-gcc compilers
cmd-line-utils/libedit/config.h:
  added empty definitions of __RCSID(x), __COPYRIGHT(x), 
                            __RENAME(x), _DIAGASSERT(x)
cmd-line-utils/libedit/np/unvis.c:
  added #include "config.h" to define __RCSID(x)
cmd-line-utils/libedit/np/vis.c:
  reinsert #include "config.h" before using of __RCSID(x)
2004-08-31 17:29:47 +05:00
unknown
d2baf0f12b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames


sql/sql_class.cc:
  Auto merged
2004-08-31 14:12:42 +04:00
unknown
851e3cabb0 Fix for bug#5312 Ndb Cluster returns wrong error code for duplicate key at insert 2004-08-31 12:07:48 +02:00
unknown
c62dd0d409 Change Item_arena::state to enum 2004-08-31 14:07:02 +04:00
unknown
e9a85134c7 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-31 10:20:51 +02:00
unknown
c52a30b5df Enabled HA_NULL_IN_KEY support 2004-08-31 10:19:10 +02:00
unknown
2bad0cee50 Interpreter fix + tets prg
ndb/src/ndbapi/NdbOperationInt.cpp:
  Fix so that interpreter is possible together with index scans
ndb/test/ndbapi/Makefile.am:
  New test prog
2004-08-31 10:14:36 +02:00
unknown
2e86cdb179 Simplified expensive test 2004-08-31 10:00:33 +02:00
unknown
e2f697bec0 Names listed as options should look like options,
not variables.
2004-08-30 11:11:10 -05:00
unknown
6bc2acce00 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/mysqld.cc:
  Auto merged
2004-08-30 16:32:10 +02:00
unknown
7982187476 space-stripping in _mi_prefix_search: BUG#5284 2004-08-30 16:12:53 +02:00
unknown
9ed92fea50 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-tux


ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-08-30 15:31:30 +02:00
unknown
5bafde9ab0 Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES".
configure.in:
  Defining "BIG_TABLES" works around a problem with the Sun Forte 
  compiler for Solaris on x86 platforms: improper handling of "long long".
  Error shows up on the "limit_rows_found" variable in test "union".
  Old "BIG_FILES" was a typing error.
2004-08-30 13:25:22 +02:00
unknown
629768d576 merge
BitKeeper/etc/logging_ok:
  auto-union
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
2004-08-30 12:13:11 +02:00
unknown
89dd83db35 ndb table locks
Removed errornous hupp, which made handler commit same transid several times
(which is checked when running in debug mode)


sql/ha_ndbcluster.cc:
  Removed errornous hupp, which made handler commit same transid several times
  (which is checked when running in debug mode)
2004-08-30 12:13:10 +02:00