mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-05 02:33:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30253 commits 2856 branches 349 tags 1.7 GiB
Commit graph

2695 commits

Author SHA1 Message Date
unknown
06d0f3fb22 Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0


ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
 2006-05-09 12:17:38 +02:00
unknown
1bdb7f7789 bug UniqueHashIndexes resource leak: allocate array pool based on MaxNoOfTables 2006-05-09 11:55:41 +02:00
unknown
303cdacd09 ndb - bug#17421, changes NDB API pushdown LIKE arg to plain char 
mysql-test/r/ndb_condition_pushdown.result:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
mysql-test/t/ndb_condition_pushdown.test:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
ndb/include/ndbapi/NdbOperation.hpp:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
ndb/include/util/NdbSqlUtil.hpp:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
ndb/src/common/util/NdbSqlUtil.cpp:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
 2006-05-05 00:53:34 +02:00
unknown
b5732e7c8c Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/space/pekka/ndb/version/my50


mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/t/ndb_blob.test:
  Auto merged
ndb/include/kernel/signaldata/TcKeyReq.hpp:
  Auto merged
ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_table.cc:
  Auto merged
ndb/tools/delete_all.cpp:
  nuts
 2006-05-03 23:17:16 +02:00
unknown
e93b203d08 ndb - bug#19201 (4.1), see comment in NdbBlob.cpp 
ndb/test/ndbapi/testBlobs.cpp:
  option -fac (fetch across commit)
ndb/tools/delete_all.cpp:
  option --transactional (default remains truncate)
mysql-test/r/ndb_blob.result:
  bug#19201
mysql-test/t/ndb_blob.test:
  bug#19201
ndb/include/kernel/signaldata/TcKeyReq.hpp:
  bug#19201
ndb/include/ndbapi/NdbBlob.hpp:
  bug#19201
ndb/src/ndbapi/NdbBlob.cpp:
  bug#19201
 2006-05-02 14:33:55 +02:00
unknown
2f955d19a6 Bug ndbd getting "node failure handling not complete..." after graceful restart 
- addded more retries to wait for nodefailure to complete
Bug  multi node failure causes node failure handling not to complete
- patch to avoid this scenario when the management server is used to perform the stop
- wait for NF_COMPLETE_REP in management server before returning
ndb: allocate nodeid
- only retry on retryable error
 2006-04-26 16:57:45 +02:00
unknown
c0c6461a11 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-26 16:57:43 +02:00
unknown
2a04d49e77 ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions 2006-04-26 16:57:41 +02:00
unknown
e1e3a93f73 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-04-26 16:57:41 +02:00
unknown
6dd5c29025 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
 2006-04-26 16:53:25 +02:00
unknown
9f5cec7622 BUG#19340 small leak in ndbd 
small cleanup fixes in kernel/vm/Configuration


ndb/src/kernel/vm/Configuration.cpp:
  clean up m_logLevel
  
  free the connectstring if we allocated one
 2006-04-25 10:04:46 -07:00
unknown
27ace48127 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2006-04-25 16:01:54 +02:00
unknown
abc0d700bb ndb - bug#18597 
Handle early abort of scan, so that resources are correctly freed


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Handle early abort
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle early abort so that require on running.empty() does not fire
 2006-04-25 16:01:08 +02:00
unknown
e9bf1b9a89 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-21 18:31:17 +02:00
unknown
b5cde201d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
 2006-04-21 14:02:21 +02:00
unknown
0a22763fa6 Bug Can't change character-sets-dir for ndbd 2006-04-21 13:53:48 +02:00
unknown
946adafdc2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2006-04-21 12:16:17 +02:00
unknown
8b35dc5738 Fix for bug#19088: NDBAPI: Segfault in NdbIndexScanOperation::setBound(...) 2006-04-21 10:17:55 +02:00
unknown
c01754c9f3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2006-04-20 13:35:34 +02:00
unknown
316c96fa81 Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code 2006-04-20 12:06:22 +02:00
unknown
0775a71222 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-19 18:27:18 -07:00
unknown
8e27c3744f Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysys/mf_keycache.c:
  Auto merged
ndb/src/kernel/SimBlockList.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
mysql-test/r/func_gconcat.result:
  Manual merge
mysql-test/r/key_cache.result:
  Manual merge
mysql-test/t/func_gconcat.test:
  Manual merge
mysql-test/t/key_cache.test:
  Manual merge
sql/item_func.cc:
  Manual merge
sql/item_sum.h:
  Manual merge
sql/lock.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge
sql/unireg.h:
  Manual merge
 2006-04-19 18:08:15 -07:00
unknown
fb62bcb002 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug15530 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
 2006-04-19 17:14:35 +10:00
unknown
535eeb5b48 ndb - 
post merge


ndb/src/ndbapi/TransporterFacade.hpp:
  merge fix
 2006-04-18 14:36:29 +02:00
unknown
ad2d268d24 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
 2006-04-18 14:34:40 +02:00
unknown
e0218948e5 ndb - 
fix api_signal_log print of uncond signals


ndb/src/ndbapi/Ndbif.cpp:
  Send TC_COMMIT_ACK uncond
ndb/src/ndbapi/TransporterFacade.cpp:
  Fix printout of uncond signals
ndb/src/ndbapi/TransporterFacade.hpp:
  Fix printout of uncond signals
 2006-04-18 14:34:11 +02:00
unknown
da35bb1bb1 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18881 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge


ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
 2006-04-18 17:39:05 +10:00
unknown
49bd763249 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18843 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/merge


ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
 2006-04-18 17:22:25 +10:00
unknown
ac7ec58460 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18833 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/merge
 2006-04-18 17:21:54 +10:00
unknown
5bdf4ce46a ndb - bug#17607 
4.1->5.0 merge


ndb/src/kernel/blocks/backup/Backup.cpp:
  post merge fix
 2006-04-10 13:51:43 +02:00
unknown
6187359960 ndb - bug#17607 
fix correct frag count in Backup block


ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Fix correct no of fragment records
 2006-04-10 13:45:33 +02:00
unknown
d57f53bf3c Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
 2006-04-10 08:29:24 +02:00
unknown
ec9b46a9b4 ndb - bug#11034 
fix mem leak (not during running of transactions, but a few bytes when shutting down)


ndb/src/ndbapi/NdbLinHash.hpp:
  Make sure that getNext(0) actually finds first element
 2006-04-07 17:10:56 +02:00
unknown
c3058a64cf ndb - bug#11033 
silent valgrind warnings 5.0, ndb_autodiscover


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  append 4 bytes of 0's to end of buffer to shut valgrind up
 2006-04-07 15:48:13 +02:00
unknown
978c18b680 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
 2006-04-07 12:01:08 +02:00
unknown
cfee84be3a multi node shutdown adabtions for restart of management servers 2006-04-07 12:01:07 +02:00
unknown
1a72428ae0 BUG#18881 valgrind: kernel memory leak in vm/Emulator.cpp 
ndb/src/kernel/vm/Emulator.cpp:
  destroy theShutdownMutex in the destructor
 2006-04-07 19:28:18 +10:00
unknown
aef9795719 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
 2006-04-07 10:52:35 +02:00
unknown
6caa249531 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/41-work
 2006-04-07 10:51:21 +02:00
unknown
1de7807da9 Support for ndb multi-node shutdown 2006-04-07 10:39:47 +02:00
unknown
f3c792863c Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
 2006-04-07 10:26:53 +02:00
unknown
47de160d65 ndb - 
remove debug prinouts in Qmgr


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  remove debug prinouts
 2006-04-07 10:10:09 +02:00
unknown
2123006d3d BUG#15530: Cluster start up "show" shows all data nodes as master during start 
along with the fix for 18843, this should fix the bug.


ndb/src/mgmclient/CommandInterpreter.cpp:
  Only show we have a master if one has been elected
 2006-04-07 00:58:08 +10:00
unknown
2b5f62586d Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
 2006-04-06 16:31:34 +02:00
unknown
4c4afd225e Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
 2006-04-06 16:19:22 +02:00
unknown
b96e8d7a97 ndb - bug#18612 - post review fixes 
1) make sure that check_multi_node_shutdown does not proceed (in stop case)
  2) Fix printout


ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  make sure that check_multi_node_shutdown does not proceed (in stop case)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  make sure that check_multi_node_shutdown does not proceed (in stop case)
 2006-04-06 16:18:42 +02:00
unknown
3af116f187 BUG#18833 valgrind: Mismatched free()/delete/delete[] in SimBlockList 
ndb/src/kernel/SimBlockList.cpp:
  NEW_BLOCK allocates the elements with new, we should free them with delete
  but only if we're not building with VM_TRACE
 2006-04-06 21:59:20 +10:00
unknown
9cc12d65cd BUG#18843 valgrind: cond jump on uninit in Qmgr::execAPI_REGREQ 
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Also init a few internals before start phase 1 as they can be accessed before that
 2006-04-06 21:59:13 +10:00
unknown
71a1864f8c Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
 2006-04-06 11:55:36 +02:00
unknown
86ca1bc3b5 post merge fixes 2006-04-06 11:51:24 +02:00