Commit graph

2320 commits

Author SHA1 Message Date
unknown
fa22e38982 merge 2005-07-20 16:09:22 +02:00
unknown
7f984b9288 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-07-20 14:27:44 +02:00
unknown
46c627f34c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-20 14:25:46 +02:00
unknown
5aac38c084 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-20 13:32:20 +02:00
unknown
fcb4823641 Merge mysql.com:/home/jonas/src/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push


sql/ha_ndbcluster.cc:
  Auto merged
2005-07-20 13:29:45 +02:00
unknown
6708dbdbf2 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-5.0


ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.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/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/test/ndbapi/testBackup.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/tools/drop_index.cpp:
  Auto merged
ndb/tools/listTables.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  merge
ndb/src/ndbapi/ndberror.c:
  merge
ndb/test/include/HugoOperations.hpp:
  merge
ndb/test/src/HugoOperations.cpp:
  merge
2005-07-20 13:25:52 +02:00
unknown
fe07364726 bug#11942 - ndb backup
fix error code to avoid clash with 5.0/5.1


ndb/include/kernel/signaldata/AlterTable.hpp:
  Change error codes to remove clash from 5.0
ndb/include/kernel/signaldata/DropTable.hpp:
  Change error codes to remove clash from 5.0
ndb/src/ndbapi/ndberror.c:
  Change error codes to remove clash from 5.0
2005-07-20 13:21:49 +02:00
unknown
e071abacf6 bug#11942 - ndb backup with parallell DDL
add testcase to autotest


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  remove ;
ndb/test/run-test/daily-basic-tests.txt:
  add test case
2005-07-20 12:39:45 +02:00
unknown
783dbfc3a8 bug#11942
ndb/include/kernel/signaldata/AlterTable.hpp:
  Add error code for backup in progress
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Add backup state
ndb/include/kernel/signaldata/DropTable.hpp:
  Add error code for backup in progress
ndb/include/ndbapi/NdbDictionary.hpp:
  Add backup state
ndb/src/kernel/blocks/backup/Backup.cpp:
  1) remove invalid require (util_sequence_ref) crash
  2) Don't backup objects dropping/creating
  3) set correct error code on backup fragment ref (crash)
  4) save TrigAttrInfo header when getting log full (crash)
  5) lock/unlock tables during backup
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  1) add mutex lock/unlock as part of drop/alter table
  2) add lock/unlock for backup
  3) remove TC from backup trigger loop
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Add BACKUP_ONGOING state
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add backup state
ndb/src/ndbapi/ndberror.c:
  Add error code for backup in progress
ndb/test/ndbapi/testBackup.cpp:
  Add testcase for testBackup -n BackupDDL
ndb/tools/drop_index.cpp:
  Fix ndb_drop_index
ndb/tools/listTables.cpp:
  Print of backup state
2005-07-20 11:48:48 +02:00
unknown
ee3677d20f Merge mysql.com:/space/pekka/ndb/version/my50
into  mysql.com:/space/pekka/ndb/version/my50-ndb
2005-07-20 10:37:17 +02:00
unknown
e9c64ae296 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean


extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/select.test:
  Resolve conflicts
scripts/mysqld_safe.sh:
  Resolve conflict
sql/item.cc:
  Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR
  can be longer in 5.0 than 4.1.
sql/log_event.cc:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Remove incorrect fix (merge from 4.1)
sql/sql_show.cc:
  Resolve conflict
2005-07-19 11:05:49 -07:00
unknown
43a550aede printout of cluster config to use same tokens as documentation 2005-07-19 16:34:56 +02:00
unknown
ac2209a1f9 ConfigInfo.cpp:
BUG#12028, cannot use default section for hostname in cluster config
  made clearer error message


ndb/src/mgmsrv/ConfigInfo.cpp:
  BUG#12028, cannot use default section for hostname in cluster config
  made clearer error message
2005-07-19 15:25:55 +02:00
unknown
09f19d3bc0 BUG#12028, cannot use default value for HostName in cluster config
+ added switch --print-full-config
+ removed unused REP configuration
2005-07-19 14:33:38 +02:00
unknown
2aa822b10d ndb - DICT minor
ndb/src/kernel/blocks/ERROR_codes.txt:
  downgrade some require to assert
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  downgrade some require to assert
2005-07-19 10:49:45 +02:00
unknown
cd004bd00c ndb - bug#11355 some fixes to index drop etc
ndb/src/kernel/blocks/ERROR_codes.txt:
  fix some bugs in protocols drop index etc
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix some bugs in protocols drop index etc
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  fix some bugs in protocols drop index etc
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  fix some bugs in protocols drop index etc
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  fix some bugs in protocols drop index etc
2005-07-19 04:01:46 +02:00
unknown
0c6b3335c5 Merge mysql.com:/space/pekka/ndb/version/my50
into  mysql.com:/space/pekka/ndb/version/my50-ndb
2005-07-17 11:49:35 +02:00
unknown
c5d4befbde Made .c files compile with a C compiler.
ndb/src/common/portlib/NdbMutex.c:
  Turned into C code.
ndb/src/common/portlib/NdbThread.c:
  Turned into C code.
2005-07-15 17:19:25 +02:00
unknown
51229d4ba2 Merge
mysql-test/t/ctype_utf8.test:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/transporter/Transporter.hpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
  SCCS merged
ndb/src/common/transporter/Transporter.cpp:
  SCCS merged
2005-07-15 14:13:23 +02:00
unknown
dbbd54e5a8 minor type fixes to prev patch 2005-07-15 13:57:21 +02:00
unknown
2a48132e01 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new


mysql-test/t/ctype_utf8.test:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
2005-07-15 13:32:08 +02:00
unknown
d467999295 BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener
+ added close of some fd's
      + debug prints
2005-07-15 12:40:20 +02:00
unknown
9622c4733d Bug #11132, reverted bug-fix, it introduces another bug. Ndbd's may get the same nodeid
In 4.1 the connection to the management server _must_ stay, that is how we
ensure that the nodeids are reserved correctly
2005-07-15 12:35:26 +02:00
unknown
22b6dec5ec BUG#11596 (partial fix), IP addresses not shown in ndb_mgm SHOW command on second ndb_mgmd (or on ndb_mgmd restart) 2005-07-15 10:44:54 +02:00
unknown
293539ca61 merge, adopted structured event interface to filter out "PING" events c.f. BUG#11898, ndb_mgmd does not release resources 2005-07-15 02:31:13 +02:00
unknown
fd152f682f Merge
ndb/include/util/SocketServer.hpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/util/SocketClient.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/mgmclient/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
ndb/include/util/ndb_opts.h:
  merge
ndb/src/common/mgmcommon/IPCConfig.cpp:
  merge
ndb/src/common/transporter/TransporterRegistry.cpp:
  merge
ndb/src/mgmapi/mgmapi.cpp:
  merge
ndb/src/mgmclient/CommandInterpreter.cpp:
  merge
ndb/src/mgmsrv/MgmtSrvr.cpp:
  merge
ndb/src/mgmsrv/Services.cpp:
  merge
ndb/src/mgmsrv/main.cpp:
  merge
ndb/src/ndbapi/TransporterFacade.cpp:
  merge
2005-07-15 01:41:59 +02:00
unknown
638fe9ec3f misc (memleak) fixes:
added using ndb_end and showing mem allocation stat at exit
    added init of variable
    added destruction of LocalConfig to still memleak
    added delete of theFacade on exit
    stopSessions(true) on socket server to ensure destuction of threads
    added destruction of arbit manager thread
    added true option to stopSessions in transporter facade to ensure destructions of threads


ndb/include/util/ndb_opts.h:
  added using ndb_end and showing mem allocation stat at exit
ndb/src/common/logger/LogHandler.cpp:
  added init of variable
ndb/src/mgmapi/mgmapi.cpp:
  added destruction of LocalConfig to still memleak
  debug printouts
ndb/src/mgmclient/main.cpp:
  added using ndb_end and showing mem allocation stat at exit
ndb/src/mgmsrv/MgmtSrvr.cpp:
  added delete of theFacade on exit
  removed area51
  added debug prints
ndb/src/mgmsrv/main.cpp:
  added using ndb_end and showing mem allocation stat at exit
  moved glob struct to heap to enable ndb_end usage
  moved options out of glob struct
  stopSessions(true) on socket server to ensure destuction of threads
ndb/src/ndbapi/ClusterMgr.cpp:
  added destruction of arbit manager thread
  debug printouts
ndb/src/ndbapi/TransporterFacade.cpp:
  added true option to stopSessions in transporter facade to ensure destructions of threads
  + debug prints
2005-07-14 18:08:01 +02:00
unknown
2fdc89da90 BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener
+ added close of some fd's
    + debug prints


ndb/src/mgmclient/CommandInterpreter.cpp:
   BUG#11898 ndb_mgmd not releasing resources, added "ping"
  + debug prints
ndb/src/mgmsrv/MgmtSrvr.hpp:
   BUG#11898 ndb_mgmd not releasing resources, added "ping"
  + debug prints
ndb/src/mgmsrv/Services.cpp:
   BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener
  + added close of some fd's
  + debug prints
2005-07-14 18:04:44 +02:00
unknown
f7c3e51016 stilled mem leak in usage on getVersionString
added __LINE__ so systemErrorLab for better error printout


ndb/include/ndb_version.h.in:
  stilled mem leak in usage on getVersionString
ndb/include/util/version.h:
  stilled mem leak in usage on getVersionString
ndb/src/common/util/version.c:
  stilled mem leak in usage on getVersionString
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  added __LINE__ so systemErrorLab for better error printout
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  stilled mem leak in usage on getVersionString
  added __LINE__ so systemErrorLab for better error printout
ndb/tools/restore/restore_main.cpp:
  stilled mem leak in usage on getVersionString
2005-07-14 18:02:33 +02:00
unknown
66fccd8261 added debug prints
ndb/include/portlib/NdbTCP.h:
  added debug prints
ndb/include/util/SocketServer.hpp:
  added debug prints
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  debug prints
ndb/src/common/mgmcommon/IPCConfig.cpp:
  debug prints
ndb/src/common/portlib/NdbMutex.c:
  debug prints
ndb/src/common/portlib/NdbTCP.cpp:
  debug printout
ndb/src/common/portlib/NdbThread.c:
  debug printout
ndb/src/common/transporter/TransporterRegistry.cpp:
  debug printout
ndb/src/common/util/Parser.cpp:
  debug printout
ndb/src/common/util/SocketClient.cpp:
  debug printout
ndb/src/common/util/SocketServer.cpp:
  debug printout
2005-07-14 18:02:32 +02:00
unknown
2eb5c010ab bug#9961 more printouts 2005-07-12 16:34:09 +02:00
unknown
67e2a8642a ndb - gcp stop bug#9961 more printouts
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  bug#9961 more printouts
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  bug#9961 more printouts
2005-07-12 16:31:15 +02:00
unknown
19593da70c ndb - move sp to >5.0
ndb/src/kernel/vm/Makefile.am:
  move sp to >5.0
2005-07-11 13:19:53 +02:00
unknown
7d17ed430e bug#9961 - ndb - gcp stop
even more printouts...
2005-07-07 10:33:17 +02:00
unknown
ab0e8f2e12 BUG#11516 ndb_mgmd debug core on cluster shutdown with failed data nodes
Fix closing of sessions on mgm server shutdown.


ndb/include/mgmcommon/ConfigRetriever.hpp:
  Add disconnect();
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Add disconnect() call so we can disconnect from the mgm server before it shuts down
  (if we are a mgm server).
ndb/src/mgmsrv/main.cpp:
  Close our ConfigRetriever connection first.
  
  Stop sessions, and wait for them to stop. (previously we didn't wait, this was
  causing core dumps on shutdown with failed nodes).
2005-07-07 15:19:56 +10:00
unknown
217e7f2253 bug#9961 - ndb gcp stop
add lots of printouts when stop is detected


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  If waiting for GCP_SAVE_REQ
    just kill nodes we're waiting for
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add lots of printouts when crashing due to GCP stop
2005-07-06 11:16:36 +02:00
unknown
6913d8058e ndb -
fix bug in MemoryChannel


ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Don't signal when reporting to NDBFS
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  1) add new method which don't signal
  2) remove wait(0) from tryReadChannel
2005-07-04 10:18:36 +02:00
unknown
5285b53042 bug#11133 - ndb write handling
fix handling of write's in lock queue
  add test case
  add support for pkWrite+async exec in HugoOperations


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Handle operation type wrt ZWRITE when restarting operations
ndb/test/include/HugoOperations.hpp:
  Add support for 
  1) pkWriteRecord 
  2) async execute
ndb/test/ndbapi/testNdbApi.cpp:
  Extend test case for bug#11133 with multi transaction tests aswell...
ndb/test/src/HugoOperations.cpp:
  Add support for 
  1) pkWriteRecord 
  2) async execute
2005-07-01 09:57:48 +02:00
unknown
c503881915 BUG#10950 Occational 'Error in mgm protocol parser' error on mysqld startup
Display the (more commonly accurate) message that the mgm server closed our connection
and that we'll retry connecting to it.


ndb/src/common/transporter/TransporterRegistry.cpp:
  Fix error message in case of mgm disconnecting before we finished asking it for dynamic ports
ndb/src/mgmapi/mgmapi.cpp:
  Only display a mgm protocol error in the case of the mgm server having disconnected.
  
  Change ndb_mgm_is_connected to actually poll the socket to see if it's still open.
2005-06-30 23:22:58 +10:00
unknown
7a5ec7606d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  linux.site:/home/marty/MySQL/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/default.c:
  Auto merged
ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
2005-06-30 12:20:52 +02:00
unknown
8cf4e0c86b ndb autotest - merge jebs fixes
ndb/test/run-test/ndb-autotest.sh:
  fix eval
  merge jeb's fix
2005-06-30 10:10:12 +02:00
unknown
6a8945e332 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/sql_base.cc:
  Auto merged
2005-06-22 20:59:34 +02:00
unknown
0392ab9c69 Made upgrade compatibility in 5.0 range to latest build version 2005-06-22 11:34:04 +02:00
unknown
eb7e1d7257 Made upgrade compatibility in 4.1 range to latest build version
ndb/src/common/util/version.c:
  Maybe upgrade compatibility in 4.1 range to latest build version
2005-06-22 11:18:40 +02:00
unknown
2af65b1d71 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-06-21 14:24:13 +02:00
unknown
29397de1e0 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug10365


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-06-20 13:08:45 +02:00
unknown
8d87d9bf29 BUG#11377 Building cluster in 4.1 BK tree fails with GCC4.0
ndb/src/kernel/SimBlockList.cpp:
  GCC 4.0 build fix
2005-06-20 15:18:53 +10:00
unknown
3d7535f0ad Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
2005-06-16 15:33:48 +02:00
unknown
536a1cd14b merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  ul
2005-06-16 14:35:15 +02:00
unknown
5e75abdb24 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into mysql.com:/home/stewart/Documents/MySQL/4.1/bug11132
2005-06-16 21:19:40 +10:00
unknown
4de0989ed0 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132
2005-06-16 21:11:08 +10:00
unknown
82297c1c90 BUG#11132 Connections stuck in CLOSE_WAIT
This fixes the problem in 5.0 in the correct way.

The previous patch (for 4.1) is only valid for 4.1 and is done at the right time
for 4.1.


ndb/src/kernel/main.cpp:
  The ndbd angel process keeps the mgm connection open as it retains a reference
  to the socket.
  
  this means that when the mgm server is killed, the socket stays in CLOSE_WAIT 
  (the ndb process will close() it okay in 5.0, as we reused it for a transporter
  but this isn't enough as the angel process still has a reference to that socket).
  
  so, by adding in a theConfig->closeConfiguration(); in the angel process, the ndb
  process is left with the only reference to the socket - which it can close whenever
  it likes (namely when the connection is terminated).
2005-06-16 18:17:44 +10:00
unknown
d27132953d fix debug string in TR::report_disconnect
ndb/src/common/transporter/TransporterRegistry.cpp:
  fix debug string for TR::report_disconnect
2005-06-16 14:21:48 +10:00
unknown
7748d388a1 BUG#11132 Connections stuck in CLOSE_WAIT
The 4.1 fix is not valid for 5.0. Remove it.


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  This fix is not valid for 5.0 as we use the mgm server connection for more than
  just fetching the initial configuration
2005-06-16 12:52:07 +10:00
unknown
37b02e7ce8 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11132
into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
2005-06-16 12:47:04 +10:00
unknown
c658b990b8 Bug #11221 Mysqld does not automatically reconnecting to cluster with cluster restart 2005-06-15 12:29:55 +02:00
unknown
b78072633d BUG#11132 Connections stuck in CLOSE_WAIT
In 4.1 (it is different in 5.0), we do not use the mgm connection after fetching the
configuration (and if we did, we would have to have calls to check the connection and
reconnect if needed - in case the mgm server had restarted) so we can disconnect after
first use.

This means we won't have connections stuck in CLOSE_WAIT when the mgm server shuts down.


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Disconnect from management server after configuration is fetched.
2005-06-15 14:58:53 +10:00
unknown
c7a681ff94 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/export/space/pekka/ndb/version/my41
2005-06-14 04:00:37 +02:00
unknown
7bb5fe9411 merge
BitKeeper/etc/logging_ok:
  auto-union
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
2005-06-14 00:05:27 +02:00
unknown
61962795f1 logging_ok:
Logging to logging@openlogging.org accepted
DbtcMain.cpp, testTimeout.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout


ndb/test/ndbapi/testTimeout.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-06-13 19:45:15 +02:00
unknown
a2c00c6b42 ndb - valgrind fixes
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  valgrind fixes
ndb/test/ndbapi/testBlobs.cpp:
  valgrind fixes
2005-06-13 16:19:20 +02:00
unknown
332792e298 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-06-13 11:52:42 +02:00
unknown
828c463361 merge
ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
2005-06-13 10:42:12 +02:00
unknown
a2037c6717 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/tools/restore/consumer_restore.cpp:
  Auto merged
2005-06-13 09:11:53 +02:00
unknown
06ab901376 bug#10294 - ndb restore with #concurrent transactions < parallelism
Enable retry on startTransaction


ndb/tools/restore/consumer_restore.cpp:
  Enable retry on startTransaction==NULL
2005-06-13 09:09:50 +02:00
unknown
71e9d6ef7f Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
2005-06-10 15:20:32 +02:00
unknown
5bcd1651e2 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
2005-06-10 15:15:10 +02:00
unknown
05b341943a ndb -
Fix mem leak in testBlobs


ndb/test/ndbapi/testBlobs.cpp:
  Fix mem leak in testBlobs
2005-06-10 15:13:44 +02:00
unknown
2ee292fb42 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-06-10 12:34:15 +02:00
unknown
3d749dbc68 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/common/logger/Logger.cpp:
  Auto merged
2005-06-10 12:33:07 +02:00
unknown
bb9268b803 ndb - autotest
Fix stack overflow in ndb_cpcd on amd64


ndb/src/common/logger/Logger.cpp:
  Fix stack overflow in ndb_cpcd on amd64
2005-06-10 12:31:55 +02:00
unknown
a5bfc6ffb4 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-06-10 10:31:21 +02:00
unknown
4f07f59e14 merge 2005-06-10 10:28:09 +02:00
unknown
f429d536e3 ndb - autotest
script fixes for solaris


ndb/src/cw/cpcd/main.cpp:
  fix usage of load_defaults, as it does have a short option
ndb/test/run-test/make-config.sh:
  fix script wrt solaris
ndb/test/run-test/ndb-autotest.sh:
  fix script wrt solaris
2005-06-10 10:22:32 +02:00
unknown
fec1c6ac67 Merge
BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_check.c:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/sql_mode.result:
  SCCS merged
mysql-test/t/sql_mode.test:
  SCCS merged
sql/sql_acl.cc:
  SCCS merged
sql/sql_handler.cc:
  SCCS merged
sql/sql_table.cc:
  SCCS merged
2005-06-09 17:15:06 +01:00
unknown
290d97a2f8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-06-09 16:13:23 +02:00
unknown
408d069ea0 merge 2005-06-09 16:11:34 +02:00
unknown
66ef0f1440 merge
ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-06-09 15:44:57 +02:00
unknown
2f2ab54691 bug#11205 - ndb - 4006 when starting scan
mysql-test/r/ndb_subquery.result:
  Add testing of new 4006 handling
mysql-test/t/ndb_subquery.test:
  Add testing of new 4006 handling
ndb/include/ndbapi/Ndb.hpp:
  Check #transactions in startTransaction instead of getNdbCon
ndb/src/ndbapi/Ndb.cpp:
  Check #transactions in startTransaction instead of getNdbCon
ndb/src/ndbapi/NdbScanOperation.cpp:
  Check #transactions in startTransaction instead of getNdbCon
ndb/src/ndbapi/Ndbif.cpp:
  Check #transactions in startTransaction instead of getNdbCon
ndb/src/ndbapi/Ndbinit.cpp:
  Check #transactions in startTransaction instead of getNdbCon
ndb/src/ndbapi/Ndblist.cpp:
  Check #transactions in startTransaction instead of getNdbCon
ndb/test/ndbapi/testNdbApi.cpp:
  Check #transactions in startTransaction instead of getNdbCon
ndb/test/run-test/daily-basic-tests.txt:
  Check #transactions in startTransaction instead of getNdbCon
sql/ha_ndbcluster.cc:
  Check #transactions in startTransaction instead of getNdbCon
2005-06-09 15:39:14 +02:00
unknown
af0287be3c ndb - autotest
small script fixes
  - Don't use hostname -s as it's linux specific
  - Don't remove result unless scp worked


ndb/test/run-test/ndb-autotest.sh:
  Don't use hostname -s as it's linux specific
  Don't remove result unless scp worked
2005-06-09 08:07:48 +02:00
unknown
db7228228d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-06-09 07:53:34 +02:00
unknown
2e8a10334b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-06-09 07:52:02 +02:00
unknown
b854d06bf0 ndb - uint overflow when running on 64-bit platform with more than 4Gb of mem
bug#10711
bug#10058
bug#9363
bug#9025
bug#8918


ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Use UintPtr when computing page address to make sure that Uint32 does not overflow
2005-06-09 07:49:48 +02:00
unknown
86c4e1d2d9 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-06-08 17:12:08 +02:00
unknown
dbfce2a555 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/tools/restore/Restore.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
2005-06-08 16:55:06 +02:00
unknown
a7917b1e8a bug#11166 - ndb
Fix potential inconsistency when running ndb_restore due to faulty parsing
    of backup log wrt inserts


ndb/src/kernel/blocks/backup/Backup.cpp:
  Make sure that entire stopGCP is in log
ndb/tools/restore/Restore.cpp:
  
    Notice: this will not group and commit the deltas listed below
    into a ChangeSet, because there are no ChangeSet comments.
    Click [Checkin] again to check in only the commented deltas,
    or type Control-l to go back and provide ChangeSet comments.
ndb/tools/restore/Restore.hpp:
  Keep track of last gci to next iteration
ndb/tools/restore/consumer_restore.cpp:
  Handle insert in log
  Only allow certain errors
2005-06-08 16:48:57 +02:00
unknown
09944efd71 BUG#10365 Cluster handler uses non-standard error codes
- Added better error messages when trying to open a table that can't be discovered or unpacked. The most likely cause of this is that it does not have any frm data, probably since it has been created from NdbApi or is a NDB system table.
 - Separated functionality that was in ha_create_table_from_engine into two functions. One that checks if the table exists and another one that tries to create the table from the engine.


mysql-test/r/ndb_autodiscover.result:
  Add tests for reading from a table that can't be discovered(SYSTAB_0)
  Discovery is not performed during create table anymore.
mysql-test/t/ndb_autodiscover.test:
  Add tests for reading from a table that can't be discovered(SYSTAB_0)
  Discovery is not performed during create table anymore.
ndb/test/ndbapi/create_tab.cpp:
  Set connectstring before creating Ndb object.
sql/ha_ndbcluster.cc:
  Rename and use the function ndbcluster_table_exists_in_engine.
  Correct return valu from ndbcluster_discover
  Remove old code "ndb_discover_tables"
sql/ha_ndbcluster.h:
  Rename function ndbcluster_table_exists to ndb ndbcluster_table_exists_in_engine
sql/handler.cc:
  Update comment of ha_create_table_from_engine
  Remove parameter create_if_found from ha_create_table_from_engine, the function ha_table_exists_in_engine is now used toi check if table is found in engine.
  Cleanup return codes from ha_create_table_from_engine.
  Change name of ha_table_exists to ha_table_exists_in_engine, update comment and returne codes.
sql/handler.h:
  Remove paramter create_if_cound from  ha_create_table_from_engine
  Rename ha_table_exists to ha_table_exists_in_engine
sql/sql_base.cc:
  Use the function ha_table_exists_in_engine to detect if table exists in enegine. 
  If it exists, call function ha_create_table_from_engine to try and create it.
  If create of table fails, set correct error message.
sql/sql_table.cc:
  Add comments, remove parameter create_if_found to ha_create_table_from_engine.
  When dropping a table, try to discover it from engine. If discover fails, use same error message as if the table didn't exists. 
  Maybe another message should be displayed here, ex: "Table could not be dropped, unpack failed"
  
  When creating a new table, use ha_table_exists_in_engine to check if a table with the given name already exists.
2005-06-08 13:31:59 +02:00
unknown
db20f45b7d BUG#10893 Cluster hangs on initial startup
IPCConfig wasn't constructing the connect string properly.


ndb/src/common/mgmcommon/IPCConfig.cpp:
  fix construction of connect string from configuration.
  
  the port number was not being added correctly. This would cause the handle to default
  to localhost:1186
2005-06-08 17:35:11 +10:00
unknown
2f11b617e4 ndb - update test prg for testDict -n NF1
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  update test prg for testDict -n NF1
ndb/test/ndbapi/testDict.cpp:
  update test prg for testDict -n NF1
2005-06-07 18:06:49 +02:00
unknown
8c80400cd2 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/ndbapi/DictCache.cpp:
  Auto merged
ndb/src/ndbapi/DictCache.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
2005-06-07 17:09:47 +02:00
unknown
d4e921d639 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-06-07 15:25:21 +02:00
unknown
62321bd298 bug#11133 - ndb
incorrect handling of writeTuple with multi op transaction


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  1) Pass operation instead of insertIsDone to LQH
  2) transform operation correctly when in parallell que
     (multi op within same trans)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Let ACC decide what operation was performed when WRITE
ndb/test/ndbapi/testNdbApi.cpp:
  Add testcase for bug 11133
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase for bug 11133
2005-06-07 15:10:57 +02:00
unknown
202c149a46 ndb - backup/restore, fix count of dist keys
better fix for bug#10190


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  better fix for bug#10190
2005-06-07 12:50:42 +02:00
unknown
e37db41fed Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
2005-06-07 10:50:27 +02:00
unknown
6f1db965ad merge 2005-06-07 12:44:00 +10:00
unknown
0602da4d0c BUG#10948 NDB Replication: Race condition with ALTER/DROP table
BUG#9826  Server crash on schema change ("drop table", "alter table") with NDB

See note on 10948 for detailed explanation.

struct a { void* a; long long b[1]; };

on PPC32 (and 32bit pa risc): 16
on x86: 12

so a malloc(sizeof(void*)+extra_bits) is wrong.

Assuming that the long long is 64 bit aligned as non-aligned 64bit accesses
are rather expensive on ppc.

Thanks to paulus for doing the PPC port of valgrind.
Without which I would no doubt still be trying to find this.


ndb/src/ndbapi/DictCache.cpp:
  Fix allocation size for Ndb_local_table_info for architectures such as PPC and PA-RISC (32bit)
  where
  struct a { void* a; long long b;};
  is 64 bit aligned (i.e. sizeof(struct a)==16)
ndb/src/ndbapi/DictCache.hpp:
  Add warning about having to be the last member in the structure
2005-06-04 18:14:34 +10:00
unknown
b442d912f9 Merge dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.0


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
2005-06-02 21:31:25 +02:00
unknown
336d32b19c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/tmp
2005-06-02 21:25:37 +02:00
unknown
28a467c6fa CommandInterpreter.cpp:
Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails


ndb/src/mgmclient/CommandInterpreter.cpp:
  Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails
2005-06-02 21:14:14 +02:00
unknown
f44acb04a9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-ndb
into neptunus.(none):/home/msvensson/mysql/bug9626


ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2005-06-02 14:57:46 +02:00