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

1213 commits

Author SHA1 Message Date
unknown
211250d2ed Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-19 14:55:13 +01:00
unknown
7856482c4f ndb - test_event 
Fix compile error with gcc4


storage/ndb/test/ndbapi/test_event.cpp:
  Fix compile error with gcc4
 2007-03-19 14:51:17 +01:00
unknown
0cdd8600df Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
 2007-03-19 12:39:03 +01:00
unknown
75bd09a665 ndb - bug#20185 
Fix race in testprg...causing random TC crashes


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  remove incorrect work-around
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Fix race in testprg...causing random TC crashes
 2007-03-19 12:31:23 +01:00
unknown
542c495d68 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-19 11:15:05 +01:00
unknown
fbb955d725 ndb - autotest 
increase some timeouts...


storage/ndb/test/run-test/daily-devel-tests.txt:
  increase timeouts...
 2007-03-19 11:13:10 +01:00
unknown
4f27b308d4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-16 11:13:01 +01:00
unknown
1af746bf1f Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
 2007-03-16 11:12:15 +01:00
unknown
5df4ea9a3f ndb - bug#27203 
Allow readTablePk to stumble on scan+deleted tuple,
      reporting no-match instead of crash (in case scan is lock-owner)


storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Allow readTablePk to stumble on scan+deleted tuple,
    reporting no-match instead of crash
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Allow readTablePk to stumble on scan+deleted tuple,
    reporting no-match instead of crash
 2007-03-16 10:58:24 +01:00
unknown
1c64064243 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/home/hartmut/projects/mysql/dev/bug-trees/mysql-5.1-bug25933
 2007-03-15 13:52:25 +01:00
unknown
e61883c959 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
 2007-03-15 13:37:04 +01:00
unknown
d9cf47f925 added missing prototype implementations (bug #25933) 2007-03-15 13:35:49 +01:00
unknown
c0f28669cb ndb - bug#27169 
Fix bug in SUMA::resend_bucket which could cause mysqld to crash


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Remove *len* part from sz,
    or an extra word will be sent (sometimes) which will cause event-api barf
storage/ndb/test/ndbapi/test_event.cpp:
  test prg for bug#27169
storage/ndb/test/run-test/daily-basic-tests.txt:
  test prg for bug#27169
 2007-03-15 13:30:42 +01:00
unknown
f47ab8cc1d Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
 2007-03-15 11:06:57 +01:00
unknown
442595da47 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
 2007-03-15 11:06:01 +01:00
unknown
fd6aa55ba5 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-15 07:16:44 +01:00
unknown
44e5052f76 ndb - 
fix test_event -n EventOperationApplier


storage/ndb/test/ndbapi/test_event.cpp:
  fix potential race
storage/ndb/test/src/HugoCalculator.cpp:
  genrate longer varsize keys
 2007-03-15 07:08:15 +01:00
unknown
bbaa46be87 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-14 15:41:24 +01:00
unknown
0953d441f2 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/test/tools/listen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  merge
 2007-03-14 15:40:06 +01:00
unknown
ee05abd661 ndb - bug#27005 
Handle API failure during resend
    API failure could cause release of table object, which will make resend crash
      when dereferencing table object
      
    Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend



storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Handle API failure during resend
  API failure could cause release of table object, which will make resend crash
    when dereferencing table object
        
  Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend
storage/ndb/test/tools/listen.cpp:
  add new events
 2007-03-14 15:37:47 +01:00
unknown
7af5a3e977 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
 2007-03-14 18:48:51 +08:00
unknown
c10747bab7 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
 2007-03-14 11:23:58 +01:00
unknown
7e4252809c ndb - bug#27087 
Make sure not to handle API_FAILREQ if it's already handled


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Make sure not to handle API_FAILREQ if it's already handled
 2007-03-14 11:22:11 +01:00
unknown
2e583e96ee Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
 2007-03-14 10:16:24 +08:00
unknown
f653ed82b0 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
 2007-03-13 21:04:28 +01:00
unknown
2e1aac8a39 ndb - bug#27102 
Make sure head after undo execute does not point to last page of file
  As this will confuse next write to group


storage/ndb/src/kernel/blocks/lgman.cpp:
  Make sure head after undo execute does not point to last page of file
  As this will confuse next write to group
 2007-03-13 21:03:34 +01:00
unknown
252cbd4d21 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/restore.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
 2007-03-13 13:56:51 +01:00
unknown
10f55b029e ndb - bug#27003 
merge to 5.1, adopt testprg to optimized node recovery


storage/ndb/include/kernel/signaldata/LqhKey.hpp:
  Add Restore as friend
storage/ndb/src/kernel/blocks/restore.cpp:
  Give proper error message on LQHKEYREF
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  post merge fix, adopt to optimized node recovery...
 2007-03-13 12:38:47 +01:00
unknown
ecaf9b73ff Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
 2007-03-13 12:07:33 +01:00
unknown
d87ba06c27 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb.test 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.test


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Pool.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
 2007-03-13 18:18:17 +08:00
unknown
3409902162 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug26307
 2007-03-13 10:13:04 +00:00
unknown
04fa93433b Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
 2007-03-12 08:42:59 +01:00
unknown
75c207298c Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
 2007-03-09 20:44:44 +07:00
unknown
f184c81733 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
storage/ndb/src/ndbapi/ndberror.c:
  manual merge
 2007-03-09 20:38:10 +07:00
unknown
e85102684e Bug #26825 MySQL Server Crashes in high load 
Bug #26997  	mysqld segfault when in single user mode


sql/ha_ndbcluster.cc:
  make sure error is always set even if no proper error code from ndb
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  add error code for failing send signal (typically single user mode)
storage/ndb/src/ndbapi/ndberror.c:
  added error code for failing send signal and timeout waiting for node failure
 2007-03-09 20:29:46 +07:00
unknown
5621288afc Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
 2007-03-09 18:10:55 +07:00
unknown
019c72a43f Merge perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.0-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.1-telco-gca


storage/ndb/tools/waiter.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  merge
 2007-03-09 11:50:32 +01:00
unknown
1fee5402a5 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug25992
 2007-03-09 18:04:34 +08:00
unknown
b76fb8f72e BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), ndbd nodes are crashed 
storage/ndb/src/kernel/vm/Pool.hpp:
  Only when m_pool.seize() return true, the ptr.i and ptr.p is assigned the ri
  ght value, or else the parameter ptr should be "not touched"
 2007-03-09 10:21:11 +07:00
unknown
f68891f80d The most recent push into mysql-5.1 from mysql-5.2 was a mistake. 
This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)


configure.in:
  Reverse last push (from mysql-5.2 into mysql-5.1)
storage/ndb/src/common/util/version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)
 2007-03-08 18:38:17 +01:00
unknown
ceefecb211 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2


configure.in:
  Auto merged
 2007-03-08 17:55:20 +01:00
unknown
5e71938a76 BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), 
ndbd nodes are crashed


storage/ndb/src/kernel/vm/Pool.hpp:
  Only when m_pool.seize() return true, the ptr.i and ptr.p is assigned the right value, 
  or else the parameter ptr should be "not touched".
 2007-03-08 17:47:13 +08:00
unknown
57097f6956 Merge poseidon.mysql.com:/home/tomas/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
 2007-03-08 08:39:49 +07:00
unknown
182ac0071c Merge poseidon.mysql.com:/home/tomas/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


client/sql_string.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
 2007-03-07 00:31:12 +07:00
unknown
81e15b49cb BUG#25992 Data nodes died during creating many tables based on different tablespaces. 
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Because TableSpaces, Datafiles, Undofiles and LogfileGroups uses the same id-space with Tables,
  when they are created, the objId allocated for TableSpaces, Datafiles, Undofiles and LogfileGroups 
  shouldn't satisfy the rule of (tableId < c_tableRecordPool.getSize()).
 2007-03-05 11:25:44 +08:00
unknown
2c27d1a3b9 BUG#26307 correct inconsistant jam() and ljam() use in DBTUP source files. 
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  redefine jam and jamEntry and change offset ranges of source files
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  redefine jam and jamEntry
 2007-03-02 18:45:09 +00:00
unknown
3b53ec8261 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
 2007-03-02 19:11:56 +01:00
unknown
039a5f411a ndb - bug#15632 
arg...also fix starting node...(version 6)



storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  arg...also fix starting node...
 2007-03-02 19:08:58 +01:00
unknown
ee3fde4e97 ndb - bug#15632 
fix testNodeRestart -n Bug15632
  handle version > 5


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix testNodeRestart -n Bug15632
  handle version > 5
 2007-03-02 18:47:30 +01:00
unknown
6ad7d66431 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
 2007-03-02 11:52:16 +01:00