Commit graph

1642 commits

Author SHA1 Message Date
unknown
2b165500c4 Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
2005-01-19 15:08:56 +01:00
unknown
6ed3ff49fc MgmtSrvr.cpp:
corrected erroneous comparison boolean < 0


ndb/src/mgmsrv/MgmtSrvr.cpp:
  corrected erroneous comparison boolean < 0
2005-01-19 15:03:34 +01:00
unknown
58d7968665 removed compiler warnings 2005-01-19 14:56:40 +01:00
unknown
da8a9e2f20 ndb compiler warning, c++ style comment in c-file
ndb/include/ndb_constants.h:
  remove // from .h-file
2005-01-19 10:07:15 +01:00
unknown
21d24f34a6 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
ndb/include/ndb_global.h.in:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2005-01-19 10:07:14 +01:00
unknown
ed327104b6 bug#7777 - ndb compile on qnx
remove usage of compiler supplied <new> and instead
  impl. own inlined placement new


ndb/include/kernel/AttributeHeader.hpp:
  remove usage <new>
ndb/include/ndb_global.h.in:
  remove usage <new>
  instead impl. own
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  remove usage <new>
ndb/src/kernel/blocks/grep/GrepInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/suma/SumaInit.cpp:
  remove usage <new>
ndb/src/kernel/vm/Emulator.cpp:
  remove usage <new>
ndb/src/kernel/vm/SimulatedBlock.hpp:
  remove usage <new>
ndb/src/mgmapi/mgmapi_configuration.cpp:
  remove usage <new>
2005-01-19 09:15:34 +01:00
unknown
7cbe4d19e4 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-19 07:37:42 +01:00
unknown
bfe74e6990 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


configure.in:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-01-19 07:34:57 +01:00
unknown
153160d1ff bug#7693 - ndb
when using shm transporter, set sigmask on each thread using pthread_sigmask


configure.in:
  Add more functions needed for SHM
ndb/src/common/portlib/NdbThread.c:
  1) Create thread wrapper function
  2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
ndb/src/common/transporter/TransporterRegistry.cpp:
  (un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
sql/ha_ndbcluster.cc:
  cast pointer to UintPtr before printout
2005-01-19 07:23:20 +01:00
unknown
982e0b8cfb changed "formatting" after sergs comments on prev chanset 2005-01-19 04:43:54 +01:00
unknown
a66d80d17e removed default usage of shared memory transporter as it is not verified on enough platforms 2005-01-18 22:09:15 +01:00
unknown
d89f9108c9 compile bug fix 2005-01-18 16:10:37 +01:00
unknown
3842b1df35 compile error fix 2005-01-18 14:46:24 +01:00
unknown
3671fe1f72 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-18 11:45:41 +01:00
unknown
0eb1a8107f ndb - use reentrant functions in HugoCalulator
ndb/test/src/HugoCalculator.cpp:
  Use reentrant function in HugoCalulator
2005-01-18 08:08:36 +01:00
unknown
7aecbab85c Merge with global tree
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/order_by.test:
  Merge
sql/sql_lex.cc:
  Merge
sql/sql_yacc.yy:
  Use local copy
2005-01-18 04:03:26 +02:00
unknown
77b8a94d7a make the code to look safe, not only be safe 2005-01-17 22:35:53 +01:00
unknown
a05bacb06e Bug#7937 2005-01-17 12:29:43 +01:00
unknown
364052161c Merge
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/log_event.cc:
  Auto merged
mysql-test/r/user_var.result:
  SCCS merged
ndb/docs/Makefile.am:
  Auto merged
2005-01-16 21:39:21 +01:00
unknown
0de6a42684 Makefile.am:
Bug#7721


ndb/docs/Makefile.am:
  Bug#7721
2005-01-16 21:39:19 +01:00
unknown
41c1a6c658 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-16 09:58:41 +01:00
unknown
93e17bb3c7 ndb - fix bugs into test framework (updates values for pk's)
ndb/test/src/HugoCalculator.cpp:
  fix newly introduced bug in Hugo
ndb/test/src/HugoOperations.cpp:
  fix newly introduced bug in Hugo
2005-01-16 09:55:13 +01:00
unknown
b3c7c4d74c bumped up ndb version
compatible with 4.1.9


configure.in:
  bumped up ndb version
2005-01-14 16:14:50 +01:00
unknown
2acfc2b9e1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-14 14:30:30 +01:00
unknown
9d9d758208 added support for 'show status like 'Ndb%''
added number_of_replicas printout in show table status


mysql-test/r/ndb_alter_table.result:
  added number_of_replicas to show table status printout
mysql-test/r/ndb_autodiscover.result:
  added number_of_replicas to show table status printout
ndb/include/ndbapi/NdbDictionary.hpp:
  added get method for replica count
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  added get method of node id
ndb/src/ndbapi/NdbDictionary.cpp:
  added get method for replica count
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added get method of node id
2005-01-14 12:32:33 +01:00
unknown
3705bf9dfb wl2240 - ndb - new testcase for validating startTransation with hint
ndb/include/ndbapi/NdbDictionary.hpp:
  NdbDictionaryColumn::getSizeInBytes
ndb/include/ndbapi/NdbOperation.hpp:
  NdbOperation::getTable
ndb/include/ndbapi/NdbTransaction.hpp:
  Make getConnectionNodeId public (for test programs)
ndb/include/util/Base64.hpp:
  base64(void*)
ndb/src/common/util/Base64.cpp:
  base64(void*)
ndb/src/kernel/blocks/ERROR_codes.txt:
  New error code for REF'ing non-local TCKEYREQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Easy clearing of ERROR_INSERT
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  New error code for REF'ing non-local TCKEYREQ
ndb/src/ndbapi/NdbDictionary.cpp:
  NdbDictionaryColumn::getSizeInBytes
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  If m_noIfDistKyes == 0, then each PK is dist key
ndb/src/ndbapi/NdbOperation.cpp:
  NdbOperation::getTable
ndb/src/ndbapi/NdbOperationSearch.cpp:
  remove d-key handling for pk ops
ndb/test/include/HugoCalculator.hpp:
  remove unimpletemented methods
ndb/test/include/HugoOperations.hpp:
  1) HugoOperation::setTransaction 
  2) Type independant value handling
  3) Some more util methods
ndb/test/ndbapi/testPartitioning.cpp:
  new testcase for validating startTransation with hint
ndb/test/run-test/atrt-mysql-test-run:
  fix checks of return values
ndb/test/src/HugoCalculator.cpp:
  Better generation of values
   -- depends on fact that srand(K), rand() == srand(K), rand()
  Generate string with base64
ndb/test/src/HugoOperations.cpp:
  1) HugoOperation::setTransaction 
  2) Type independant value handling
  3) Some more util methods
2005-01-14 08:58:50 +01:00
unknown
e1e34b516c Bug#7626 2005-01-13 23:26:59 +01:00
unknown
2f77a22a01 To get correct values in SHOW TABLE STATUS
Added pseudo column fragment memory
    changed ndb_get_table_statistics to take struct 
    and read row_size and fragment_memory


ndb/include/kernel/AttributeHeader.hpp:
  Added pseudo column fragment memory
ndb/include/ndbapi/NdbDictionary.hpp:
  Added pseudo column fragment memory
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Added pseudo column fragment memory
ndb/src/ndbapi/NdbDictionary.cpp:
  Added pseudo column fragment memory
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Added pseudo column fragment memory
sql/ha_ndbcluster.cc:
  changed ndb_get_table_statistics to take struct 
  and read row_size and fragment_memory
sql/ha_ndbcluster.h:
  partially implemented update_table_comment
2005-01-13 18:24:19 +01:00
unknown
7d095a37b9 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
2005-01-13 10:35:05 +01:00
unknown
a2e905a5b7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-13 10:29:03 +01:00
unknown
fee822e41f bug#7864 - fix ndb limit 4.5G data memory due to truncation error
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove 8k->32k conversion
ndb/src/kernel/vm/Configuration.cpp:
  compute size in 32k pages directly
2005-01-13 10:28:26 +01:00
unknown
112325c402 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-13 08:41:42 +01:00
unknown
e0c95d1b97 ndb - take booked scan frags into account when getting scan_fragconf
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  take booked fragments into account before starting a new frag scan
2005-01-13 08:40:32 +01:00
unknown
d6cb2dbe5b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/test/src/HugoTransactions.cpp:
  Auto merged
2005-01-12 22:16:29 +01:00
unknown
54ccf5d16c added som signal printout functions
search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
    not necessarily the same starts and stops...
    +error corrected in ref signal
    added print of error codes + more correct error handling of event errors
    + added goto instead of erroneous break to fix bug#7627


ndb/include/kernel/signaldata/SignalData.hpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SumaImpl.cpp:
  added som signal printout functions
ndb/src/kernel/blocks/suma/Suma.cpp:
  search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
  not necessarily the same starts and stops...
  +error corrected in ref signal
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  indentation
  event error handling
  debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  debug printouts
  + added goto instead of erroneous break to fix bug#7627
ndb/test/src/HugoTransactions.cpp:
  added print of error codes + more correct error handling of event errors
2005-01-12 22:09:43 +01:00
unknown
55ad8626c4 fix shm key 2005-01-12 18:19:30 +01:00
unknown
c992cc4962 ndb - more test of partitioning wrt scans & lock modes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle "fragment scan" (scan with distribution key) wrt committed read
ndb/test/ndbapi/testPartitioning.cpp:
  Extend test prg to try differnt lock modes / parallelism parameters
2005-01-12 17:29:46 +01:00
unknown
6f041af11b ndb - Add test-case file for 16-nodes 2005-01-12 16:20:21 +01:00
unknown
b9dc94a079 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 15:46:37 +01:00
unknown
8296883ff4 ndb - Fix problem with parallelism < fragcount & committedread
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Pre book fragments to keep count how many ops need to be continued by 
    api
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Pre book fragments to keep count how many ops need to be continued by 
    api
  
  Fixes problem with parallelism < fragcount && committed read
ndb/test/ndbapi/testScan.cpp:
  new testcase for scan parallelism
ndb/test/run-test/daily-basic-tests.txt:
  Run new testcase
ndb/test/src/HugoTransactions.cpp:
  Use parallelism parameter
2005-01-12 15:36:52 +01:00
unknown
1454564f1c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-12 14:34:34 +01:00
unknown
d8a2ed781a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-12 14:30:04 +01:00
unknown
ec03f8acb2 added management server port as "unique" id for use in shmkey 2005-01-12 14:03:10 +01:00
unknown
124bc850d5 ndb - Fix init of replica/frag count in ndb api
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix init of replica/frag count
2005-01-12 13:33:04 +01:00
unknown
ce2f345a7d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 11:27:30 +01:00
unknown
2123dc6ba3 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 11:25:54 +01:00
unknown
40649e92f7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
2005-01-12 11:24:46 +01:00
unknown
7e36a0b7cb ndb - fix 64-bit problem in autotest
ndb/test/src/CpcClient.cpp:
  Fix 64-bit problem
2005-01-12 11:17:03 +01:00
unknown
2ee0dc0936 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
2005-01-12 09:22:10 +01:00
unknown
a964b18269 change to using public enum for log events
ndb/include/Makefile.am:
  added ndb_logevent to source dist
2005-01-11 23:25:45 +01:00