Commit graph

14581 commits

Author SHA1 Message Date
unknown
2e43e47040 moved all ndb thread specific data into new placeholder
new methods to keep "records" up to date
unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
new methods to keep "records" up to datecorrect record field in ndbcluster handler
new method for ndbcluster handler to store/retrieve table and thread specific data
changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
hanged deleteKey to return ponter to deleted object
moved heavy global cache fetch from inline to separate method


mysql-test/r/ndb_alter_table.result:
  correct record field in ndbcluster handler
mysql-test/r/ndb_blob.result:
  correct record field in ndbcluster handler
ndb/include/ndbapi/NdbDictionary.hpp:
  new method for ndbcluster handler to store/retrieve table and thread specific data
ndb/src/ndbapi/DictCache.cpp:
  changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
ndb/src/ndbapi/DictCache.hpp:
  changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
ndb/src/ndbapi/Ndb.cpp:
  replaced method DictionaryImpl::getTable with DictionaryImpl::get_local_table_info
ndb/src/ndbapi/NdbDictionary.cpp:
  new method for ndbcluster handler to store/retrieve table and thread specific data
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
  moved heavy global cache fetch from inline to separate method
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  replaced method DictionaryImpl::getTable with DictionaryImpl::get_local_table_info
ndb/src/ndbapi/NdbLinHash.hpp:
  changed deleteKey to return ponter to deleted object
sql/ha_ndbcluster.cc:
  moved all ndb thread specific data into new placeholder
  new methods to keep "records" up to date
  unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
sql/ha_ndbcluster.h:
  new methods to keep "records" up to date
sql/sql_class.h:
  moved all ndb thread specific data into new placeholder
2004-09-14 08:52:21 +00:00
unknown
cd573513a3 removed shaky test case 2004-09-10 17:40:02 +00:00
unknown
d4e230afad configure.in:
bumped up version to 3.5.1


configure.in:
  bumped up version to 3.5.1
2004-09-10 17:29:10 +00:00
unknown
0c140b7b48 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
2004-09-10 15:04:40 +00:00
unknown
9c71d59d08 bug#5435 2004-09-10 14:55:42 +00:00
unknown
dc37e041d2 removed debug printout that slipped in 2004-09-09 21:53:01 +00:00
unknown
e2252a49f7 fixed compile error 2004-09-09 20:43:42 +00:00
unknown
fb7d91e708 added possibility to use comma-separated connectstring
compile error/warning fixes
added force of heartbeat
added ability to force heartbeat


ndb/src/common/mgmcommon/LocalConfig.cpp:
  added possibility to use comma-separated connectstring
ndb/src/common/mgmcommon/NdbConfig.c:
  compile error/warning fixes
ndb/src/mgmsrv/MgmtSrvr.cpp:
  added force of heartbeat
ndb/src/mgmsrv/main.cpp:
  changed help text
ndb/src/ndbapi/ClusterMgr.cpp:
  added ability to force heartbeat
ndb/src/ndbapi/Ndbinit.cpp:
  added comment
2004-09-09 19:52:03 +00:00
unknown
dc21dcd2a1 Merge
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  SCCS merged
2004-09-09 16:43:11 +00:00
unknown
4ea4e9ee2e main.cpp:
removed shhor switch for nodaemon


ndb/src/mgmsrv/main.cpp:
  removed shhor switch for nodaemon
2004-09-09 16:41:20 +00:00
unknown
0450e21c91 MgmtSrvr.cpp:
Added ability to force heartbeat


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Added ability to force heartbeat
2004-09-09 16:40:15 +00:00
unknown
96a45ab066 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-09 16:34:25 +00:00
unknown
759644bce9 mysql_protocols.result:
fix test result.


mysql-test/r/mysql_protocols.result:
  fix test result.
2004-09-09 11:22:23 -05:00
unknown
647d895acc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge


ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-09-09 16:22:47 +02:00
unknown
10ce6d0b26 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-09 14:22:46 +00:00
unknown
ea018f2042 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-09 13:57:23 +00:00
unknown
0a7f9e24d8 improved show command
fixed some mutex locks for Ndb objects
moved TranspoterFacade::stop_instance to cluster connection
moved Socket Server::start_server outside the TransporterFacade::start_instance thread


ndb/include/mgmapi/mgmapi.h:
  improved show command
ndb/src/mgmapi/mgmapi.cpp:
  improved show command
ndb/src/mgmclient/CommandInterpreter.cpp:
  improved show command
ndb/src/mgmsrv/MgmtSrvr.cpp:
  improved show command
ndb/src/mgmsrv/MgmtSrvr.hpp:
  improved show command
ndb/src/mgmsrv/Services.cpp:
  improved show command
ndb/src/ndbapi/Ndbinit.cpp:
  fixed some mutex locks for Ndb objects
  moved TranspoterFacade::stop_instance to cluster connection
ndb/src/ndbapi/TransporterFacade.cpp:
  movet Socket Server::start_server outside the TransporterFacade::start_instance thread
ndb/src/ndbapi/TransporterFacade.hpp:
  movet Socket Server::start_server outside the TransporterFacade::start_instance thread
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  movet Socket Server::start_server outside the TransporterFacade::start_instance thread
2004-09-09 13:55:14 +00:00
unknown
8d1e535e4a Bug #5430 ctype_tis620 test failure
BitKeeper/deleted/.del-ctype_tis620-master.opt~38b79f80b9348a14:
  Delete: mysql-test/t/ctype_tis620-master.opt
2004-09-09 18:44:53 +05:00
unknown
cc12a462d6 Bug #3453 MySQL output formatting in multibyte character sets 2004-09-09 18:21:31 +05:00
unknown
2aa6973450 merge
ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
2004-09-09 14:39:01 +02:00
unknown
cfcdabf3f8 fix NdbDictionary 2004-09-09 14:20:11 +02:00
unknown
1ba3a17099 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-09-09 09:23:39 +00:00
unknown
2cd71180ef better error printouts on cannot alloc node id
put ByteOrder config param back as depricated


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  put ByteOrder config param back as depricated
ndb/src/mgmsrv/MgmtSrvr.cpp:
  better error printouts on cannot alloc node id
2004-09-09 09:04:53 +00:00
unknown
9106686846 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
2004-09-09 10:41:33 +02:00
unknown
1460e454d0 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1group_concat


sql-common/client.c:
  Auto merged
2004-09-09 13:02:15 +06:00
unknown
c59228f85c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into ndbmaster.mysql.com:/ndb/clone-mysql-4.1-ndb-daily-2004-09-08
2004-09-09 08:41:37 +02:00
unknown
6bbbccbe3a wl1292 -
Fix autotest of backups
Fix autotest with mysql-test-run


ndb/test/run-test/atrt-testBackup:
  Rename: ndb/test/ndbapi/atrt-testBackup -> ndb/test/run-test/atrt-testBackup
ndb/test/run-test/Makefile.am:
  Install atrt wrappers
ndb/test/run-test/atrt-mysql-test-run:
  Take args from caller
ndb/test/run-test/daily-devel-tests.txt:
  Use wrapper to test backup
ndb/test/run-test/main.cpp:
  Add MYSQL_BASE_DIR to environment of test programs
2004-09-09 08:40:20 +02:00
unknown
50f9e2f581 client_test.c:
fix typos noticed while poking around in test program.


tests/client_test.c:
  fix typos noticed while poking around in test program.
2004-09-08 20:13:27 -05:00
unknown
5c571cc58c Ndb backup/restore also handle indexes
ndb/src/kernel/blocks/backup/Backup.cpp:
  Save meta data for indexes (but not actual data)
ndb/src/kernel/blocks/backup/Backup.hpp:
  Save meta data for indexes (but not actual data)
ndb/src/kernel/blocks/backup/restore/consumer.hpp:
  Introduced endOfTables into Consumer interface
ndb/src/kernel/blocks/backup/restore/consumer_restore.cpp:
  Store indexes and create then when endOfTables is called
ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp:
  Store indexes and create then when endOfTables is called
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Run endOfTables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Split getIndexImpl into 2 methods
  (one being used by restore)
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Split getIndexImpl into 2 methods
  (one being used by restore)
2004-09-08 22:30:05 +02:00
unknown
b1c77d977b log.cc:
Changed label on INFORMATION log items to NOTE


sql/log.cc:
  Changed label on INFORMATION log items to NOTE
2004-09-08 22:05:49 +02:00
unknown
d7a230677c A fix and test case for Bug#5194 "Bulk Insert Failures with Prepared
Statements": 
- fix a couple of net->buff overruns in libmysql,
- check in the server that statement parameter count is less than
  65535 (maximum value supported by prepared statements protocol).
 


libmysql/libmysql.c:
  Bug#5194 "Bulk Insert Failures with Prepared Statements":
  - clean up my_realloc_str()
  - ensure that net buffer has space when storing null bits and
    parameter typecodes.
sql/net_serv.cc:
  - set net->last_errno if packet is too big, even on client
    (Why was it ifdefed before?)
sql/sql_prepare.cc:
  Bug#5194 "Bulk Insert Failures with Prepared Statements":
  - if placeholder count is bigger than 65535, give error.
    We have only 2 bytes reserved for transferring placeholder count
    in 4.1 protocol.
  - can't add a proper error code and message in 4.1 because of
    possible merge difficulties."
tests/client_test.c:
  A test case for Bug#5194 "Bulk Insert Failures with Prepared 
  Statements".
2004-09-08 23:07:11 +04:00
unknown
a2e570ab39 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-09-08 21:58:22 +03:00
unknown
b9826e1063 test case of bug#5220 2004-09-08 21:54:01 +03:00
unknown
aba34540f4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug-grp
2004-09-08 22:44:16 +04:00
unknown
4233d901f4 Fix for bug#5400 "GROUP_CONCAT returns everything twice":
Don't evaluate the value of GROUP_CONCAT several times for the same 'group', reuse the value instead.


mysql-test/r/group_by.result:
   Testcase for bug#5400
mysql-test/t/group_by.test:
   Testcase for bug#5400
2004-09-08 22:43:37 +04:00
unknown
9b6ca7f3a5 mysql.cc:
Print sqlstate value in batch mode, not just in interactive mode.


client/mysql.cc:
  Print sqlstate value in batch mode, not just in interactive mode.
2004-09-08 13:28:11 -05:00
unknown
9b44664537 removed unnecesary check in ConfigInfo
added retries to tryBind


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  removed unnecesary check in ConfigInfo
ndb/src/mgmsrv/main.cpp:
  added retries to tryBind
2004-09-08 16:31:52 +00:00
unknown
13de9798fd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-09-08 14:36:08 +00:00
unknown
1b84744616 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-09-08 14:31:13 +00:00
unknown
50729d601d dded method to retrieve mysqld, ndbd, and ndb_mgmd aliases for API,MGM and DB
added sanity checks for config file
changed so that ndb_0 is replaced by ndb_pid#### in ndb files
added error_string for to some functions, alloc_node_id(), start()
added better error printout for failed alloc node id
better error printouts for failures when starting ndb_mgmd


ndb/include/mgmapi/mgmapi.h:
  added method to retrieve mysqld, ndbd, and ndb_mgmd aliases for API,MGM and DB
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  added sanity checks for config file
ndb/src/common/mgmcommon/NdbConfig.c:
  changed so that ndb_0 is replaced by ndb_pid#### in ndb files
ndb/src/kernel/error/ErrorReporter.cpp:
  removed usage of tracefile early in startup (when it's normally filled with zeroes)
ndb/src/mgmapi/mgmapi.cpp:
  added method to retrieve mysqld, ndbd, and ndb_mgmd aliases for API,MGM and DB
ndb/src/mgmsrv/MgmtSrvr.cpp:
  added error_string for to some functions, alloc_node_id(), start()
ndb/src/mgmsrv/MgmtSrvr.hpp:
  added error_string for to some functions, alloc_node_id(), start()
ndb/src/mgmsrv/Services.cpp:
  added better error printout for failed alloc node id
ndb/src/mgmsrv/main.cpp:
  better error printouts for failures when starting ndb_mgmd
2004-09-08 14:30:39 +00:00
unknown
9b1a33435a After merge fix.
sql/mysqld.cc:
  mlockall() call hided behind !defined(EMBEDDED_LIBRARY).
2004-09-08 17:38:57 +05:00
unknown
c49a08dd75 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-08 13:44:52 +02:00
unknown
f128a98b35 Restore transid when flushing 2004-09-08 13:42:44 +02:00
unknown
434b5c7d49 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-09-08 12:42:22 +02:00
unknown
7b98930a2a Modified bulk load to allow ndbcluster to flush transactions 2004-09-08 11:50:17 +02:00
unknown
e2a42454b8 wl1292 - mysql-test-run in autotest
Reset SIGCHLD before exec-ing


ndb/src/cw/cpcd/Process.cpp:
  Reset SIGCHLD before exec-ing
2004-09-08 11:18:22 +02:00
unknown
e5af92b0d2 A fix and test case for bug#5399 "Wrong statement executed by MySQL
server" (use my_charset_bin for stmt id hash).


sql/sql_class.cc:
  Fix for bug#5399 "Wrong statement executed by MySQL server": 
  we hash stmt ids bytewise, need to use binary collation for it.
tests/client_test.c:
  Test case for bug#5399 "Wrong statement executed by MySQL server":
  create number of statements returning different results, execute them
  one by one.
2004-09-08 12:33:05 +04:00
unknown
d69d79377c Removed usage of "useFullyQualifiedNames" 2004-09-08 08:02:59 +02:00
unknown
d7773916ca bug#at - testNdbApi WaitUntilReady, MaxNdb
fix delete of dictionary before connection has been established


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix delete of dictionary before connection has been established
2004-09-08 06:48:03 +02:00
unknown
7fa2b4ef4e BUG#ndb_blob on 1 node
Make sure to flush buffer when sending long sig so that order is maintained
2004-09-08 06:26:44 +02:00