Commit graph

1844 commits

Author SHA1 Message Date
unknown
09ce1b950a remove mysql-test-run from autotest 2008-02-09 07:26:34 +01:00
unknown
a026379f7a ndb -
fix failing autotest-test


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  "fix" testprg
storage/ndb/test/run-test/daily-basic-tests.txt:
  increase allowed time
2008-02-08 16:42:17 +01:00
unknown
56165c20ec ndb - bug#34378
Using more than 16g can cause record-pool ptr.i values to overflow
  Fix by splitting memory into 2 zones, lo(16g)/hi(rest)
  When record pools only use zone_lo, and datamemory, buffers etc...can use any


storage/ndb/src/kernel/blocks/lgman.cpp:
  adopt to changed interface for Ndbd_mem_manager
storage/ndb/src/kernel/vm/Pool.cpp:
  Always use ZONE_LO for record pools
    as they use ptr.i == 19 bit page id + 13 bit page index
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  Add zones to Ndbd_mem_manager
  ZONE_LO = lower 16g
  ZONE_HI = rest
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  Add zones to Ndbd_mem_manager
  ZONE_LO = lower 16g
  ZONE_HI = rest
2008-02-08 15:17:45 +01:00
unknown
25bddc4de1 Merge pilot.mysql.com:/data/msvensson/mysql/bug32025/my50-bug32025
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-ndb


storage/ndb/tools/waiter.cpp:
  Manual merge from 5.0
2008-02-07 08:14:17 +01:00
unknown
9f85d0dc6b Merge pilot.mysql.com:/data/msvensson/mysql/bug32025/my50-bug32025
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build


storage/ndb/tools/waiter.cpp:
  Manual merge from 5.0
2008-02-07 08:12:25 +01:00
unknown
20fb40b0d6 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Merge
2008-02-06 15:10:18 +01:00
unknown
e156d6af4d ndb - bug#34216
During TC-take-over (NF) the new-TC builds up a new transaction state
  And commits operation according to this state.
  However, in the new state that is build, the operations does not have to be in same order, as "real" state
  In the multi-update-case, this means that operations can be commit in "incorrect" order

  i.e update A, delete A, insert A is normally commited in same order as prepared
      but can be committed in any order

  This patch changes TUP handling of these out-order commits, and previous implementation
    could confuse the TUX triggers


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  new method
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  move removeActiveOpList, cause it's now only used by DbtupAbort
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  - move tux-trigger execution *before* check of disk, since ops can be committed during a disk timeslice
  - allow out-of-order commits and use tuple_ptr->m_operation_ptr_i for determening "real" commit
    (instead of re-ordering operations on the fly, which confused tux-triggers)
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  use constant instead of number
storage/ndb/test/run-test/daily-basic-tests.txt:
  "old-51" does not yet support --nologging
2008-02-06 13:06:05 +01:00
unknown
d65318519e ndb - bug#34216
testcases


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  new error codes
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  new error codes
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  remove assert
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  new testcase
  1) -n Bug34216
     Which tests node diying during multip-op commit
     Very controlled
  
  2) -n mixedmultiop
     Runs several threads "load" of same scenario...not very controlled
storage/ndb/test/run-test/daily-basic-tests.txt:
  new testcases
2008-02-06 11:28:43 +01:00
unknown
b38d88b23e ndb_version.h.in : Fix a syntax error (variable declaration came too late).
storage/ndb/include/ndb_version.h.in:
  C syntax requires variable declarations to be before executable statements.
2008-02-05 15:24:41 +01:00
unknown
20b9785284 Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my51-bug31239
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-05 13:53:40 +01:00
unknown
9c58c0b20f Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my50-bug31239
into  pilot.mysql.com:/data/msvensson/mysql/bug31239/my51-bug31239


storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged
2008-02-05 12:45:42 +01:00
unknown
41c186e9c3 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb


storage/ndb/src/common/debugger/SignalLoggerManager.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Auto merged
storage/ndb/src/kernel/vm/pc.hpp:
  Auto merged
2008-02-04 14:36:54 +01:00
unknown
2895760572 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb


storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
2008-02-04 12:05:23 +01:00
unknown
f01ed1196c ndb - bug#33619
make sure to alloc logspace and set bits
  if doing delete after previous update wo/ touching DD part


mysql-test/suite/ndb/r/ndb_dd_basic.result:
  testcase
mysql-test/suite/ndb/t/ndb_dd_basic.test:
  testcase
2008-02-03 21:24:59 +01:00
unknown
6bb77bf6bb Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
2008-02-03 14:14:32 +01:00
unknown
0f88379324 ndb - bug#34260
remove incorrect ndbrequire
2008-02-03 14:01:31 +01:00
unknown
0d2be94e60 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  mysql.com:/usr/clones/mysql-5.1-new-ndb2
2008-02-01 13:51:55 -06:00
unknown
c2505873d8 NdbRepStress.cpp:
Updated with new support function from Magnus push to dbutil


storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp:
  Updated with new support function from Magnus push to dbutil
2008-02-01 13:51:04 -06:00
unknown
5032fadd04 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
2008-02-01 00:18:30 +01:00
unknown
57ea5ad5df ndb - bug#34107 - post-merge
storage/ndb/src/ndbapi/ndberror.c:
  post-merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  enable testInterpreter
2008-02-01 00:07:15 +01:00
unknown
2032e23ad2 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34107


storage/ndb/test/ndbapi/testInterpreter.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  ul, fix next
2008-01-31 23:46:07 +01:00
unknown
e2bdd9b244 Fixed support for specifying explicit database 2008-01-31 16:00:06 +01:00
unknown
58d93fbd9e Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34107


mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
  Auto merged
storage/ndb/include/ndbapi/ndbapi_limits.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  silly stuff
storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp:
  a name was improved in 5.1
storage/ndb/src/ndbapi/ndberror.c:
  use local due to huge bogus diff
2008-01-31 14:47:50 +01:00
unknown
b6d3eac082 Merge perch.ndb.mysql.com:/home/jonas/src/50-ndb
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/vm/DLHashTable.hpp:
  Auto merged
storage/ndb/src/kernel/vm/DLHashTable2.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  merge
2008-01-30 12:52:55 +01:00
unknown
7650ce4b81 Merge bk-internal:/home/bk/mysql-5.1-opt
into  macbook.gmz:/Users/kgeorge/mysql/work/B31326-merge-5.1-opt
2008-01-30 13:37:57 +02:00
unknown
4c414b10d5 ndb - bug#34118 - hash index trigger vs. disk
mysql-test/suite/ndb/r/ndb_dd_basic.result:
  bug#34118 hash index trigger disk flag
mysql-test/suite/ndb/t/ndb_dd_basic.test:
  bug#34118 hash index trigger disk flag
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  bug#34118 hash index trigger disk flag
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  bug#34118 hash index trigger disk flag
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  bug#34118 hash index trigger disk flag
2008-01-29 15:25:27 +01:00
unknown
a0f0e41f20 ndb - bug#34046 - rename Ndbd_mem_manager::log2 to ndb_log2
storage/ndb/src/kernel/vm/NdbdSuperPool.cpp:
  rename Ndbd_mem_manager::log2 to ndb_log2
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  rename Ndbd_mem_manager::log2 to ndb_log2
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  rename Ndbd_mem_manager::log2 to ndb_log2
2008-01-28 14:48:09 +01:00
unknown
eb493203aa ndb - bug#31477 post-merge fixes in 5.1
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  bug#31477 post-merge fixes in 5.1
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  bug#31477 post-merge fixes in 5.1
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  bug#31477 post-merge fixes in 5.1
2008-01-28 13:03:27 +01:00
unknown
7674d5ef97 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug31477
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug31477


storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/src/common/util/NdbOut.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  mindless merge
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  mindless merge
2008-01-28 03:14:29 +01:00
unknown
ccb999656f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
2008-01-25 14:34:15 +01:00
unknown
77b2e8f314 ndb_restore.result, ndb_restore.test:
Changed to use information_schema to check auto_increment
Ndb.cpp:
  Bug #33534   Bad performance of INSERT's in auto_incremented tables: Saving highest seen value when setting auto_increment fields
ndb_auto_increment.result:
  Regenerated result


mysql-test/suite/ndb/r/ndb_auto_increment.result:
  Regenerated result
mysql-test/suite/ndb/r/ndb_restore.result:
  Changed to use information_schema to check auto_increment
mysql-test/suite/ndb/t/ndb_restore.test:
  Changed to use information_schema to check auto_increment
storage/ndb/src/ndbapi/Ndb.cpp:
  Bug #33534   Bad performance of INSERT's in auto_incremented tables: Saving highest seen value when setting auto_increment fields
2008-01-25 10:43:30 +01:00
unknown
45aaaac8d4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2008-01-24 16:00:31 +01:00
unknown
8f77ea23b1 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  merge
2008-01-24 15:31:42 +01:00
unknown
ae3ded6ee2 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  merge
2008-01-24 15:13:42 +01:00
unknown
d91fba31e1 ndb - jamify (better) DbtupDiskAlloc
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  jamify DbtupDiskAlloc
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  jamify DbtupDiskAlloc
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  jamify DbtupDiskAlloc
2008-01-24 15:10:46 +01:00
unknown
eff091100d ndb - bug#34033
remove LCP-snapshot from MM-tables,
  removing possibility of spurious 899 on MM-tables


storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  dont run LCP-snapshot on pure MM-tables,
  this is implemented by not setting frag.m_lcp_scan_op
  which will make TUP_COMMIT do nothing
2008-01-24 14:21:52 +01:00
unknown
d36be3437b Bug#30366 (recommit) NDB fails to start on OS X, PPC, 64 bit
- The errno variable should only be used when the previous socket
  write failed, it should be regarded as undefined at other times
2008-01-24 12:06:40 +01:00
unknown
e69bf055ab Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  manual merge
2008-01-23 14:42:58 +01:00
unknown
78ac242f2b Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
2008-01-23 13:10:09 +01:00
unknown
e2ba0ab94c Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
2008-01-23 13:05:29 +01:00
unknown
7e6ab3a006 Ndb.hpp, Ndb.cpp, ha_ndbcluster.cc:
Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
ndb_restore.result:
  Updated result file


mysql-test/suite/ndb/r/ndb_restore.result:
  Updated result file
sql/ha_ndbcluster.cc:
  Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
storage/ndb/include/ndbapi/Ndb.hpp:
  Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
storage/ndb/src/ndbapi/Ndb.cpp:
  Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
2008-01-23 11:40:06 +01:00
unknown
bd70a104d9 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/common/util/Bitmask.cpp:
  merge
2008-01-23 10:28:30 +01:00
unknown
71377f4163 Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/include/util/Bitmask.hpp:
  Auto merged
storage/ndb/src/common/util/Bitmask.cpp:
  merge
storage/ndb/test/ndbapi/testBitfield.cpp:
  merge
2008-01-23 10:11:40 +01:00
unknown
57cea8f663 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/Ndb.cpp:
  Using local, will merge manually.
storage/ndb/include/ndbapi/Ndb.hpp:
  Changed parameter name to better reflect meaning.
2008-01-22 14:45:29 +01:00
unknown
4789e3f606 Add SqlResultSet
storage/ndb/test/include/DbUtil.hpp:
  Add support for SqlResultSet
storage/ndb/test/ndbapi/Makefile.am:
  Add testNDBT
storage/ndb/test/src/DbUtil.cpp:
  Add support for SqlResultSet
storage/ndb/test/src/Makefile.am:
  Build AtrtClient
storage/ndb/test/include/AtrtClient.hpp:
  New BitKeeper file ``storage/ndb/test/include/AtrtClient.hpp''
storage/ndb/test/ndbapi/testNDBT.cpp:
  New BitKeeper file ``storage/ndb/test/ndbapi/testNDBT.cpp''
storage/ndb/test/src/AtrtClient.cpp:
  New BitKeeper file ``storage/ndb/test/src/AtrtClient.cpp''
2008-01-18 22:55:02 +01:00
unknown
24e10360d4 DBU_TRUE and DBU_FALSE => TRUE/FALSE 2008-01-17 15:47:55 +01:00
unknown
29baec8ae3 Remove "#pragma once" it's already done by "#ifndef DBUTIL_HPP" 2008-01-17 15:42:50 +01:00
unknown
16159170b6 Bug#30366 NDB fails to start on OS X, PPC, 64 bit
- The errno variable should only be used when the previous socket
     write failed, it should be regarded as undefined at other times

OutputStream.cpp:
  Only use "errno" after the attempt to write to the socket has failed


storage/ndb/src/common/util/OutputStream.cpp:
  Only use "errno" after the attempt to write to the socket has failed
2008-01-15 15:01:21 +01:00
unknown
12855ff253 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2008-01-11 09:43:29 +01:00
unknown
b64f9dbe15 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
2008-01-11 09:31:55 +01:00
unknown
e984956385 ndb - bug#33793
dont assume that page is "all empty"
  only as gci is acked, as release_gci might not have processed it yet


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  dont assume that page is "all empty"
  only as gci is acked, as release_gci might not have processed it yet
storage/ndb/test/ndbapi/test_event.cpp:
  testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase
2008-01-11 09:20:16 +01:00
unknown
ed6d97c866 Makefile.am:
Updated to build NdbRepStress


storage/ndb/test/ndbapi/Makefile.am:
  Updated to build NdbRepStress
2008-01-10 19:07:24 +01:00
unknown
2f2206840d Makefile.am:
Updated for name chance on dbutil


storage/ndb/test/src/Makefile.am:
  Updated for name chance on dbutil
2008-01-10 18:59:44 +01:00
unknown
d8d857e0cc Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  SCCS merged
storage/ndb/src/ndbapi/ndberror.c:
  SCCS merged
2008-01-10 19:49:32 +08:00
unknown
20764f80ae 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-bug28298
2008-01-10 13:56:21 +08:00
unknown
c99c46b8e1 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298


storage/ndb/include/kernel/ndb_limits.h:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2008-01-10 13:47:14 +08:00
unknown
44ccc30b03 NdbRepStress.cpp:
More code improvments


storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp:
  More code improvments
2008-01-09 19:01:31 +01:00
unknown
5e85c850ac DbUtil.hpp, DbUtil.cpp, NdbRepStress.cpp:
More code improvments


storage/ndb/test/include/DbUtil.hpp:
  More code improvments
storage/ndb/test/src/DbUtil.cpp:
  More code improvments
storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp:
  More code improvments
2008-01-09 18:54:32 +01:00
unknown
0f5cf86410 NdbRepStress.cpp:
Updated with suggestions from Magnus and other fixes and adjustments I found along the way
DbUtil.hpp, DbUtil.cpp:
  fixes and adjustments I found along the way


storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp:
  Updated with suggestions from Magnus and other fixes and adjustments I found along the way
storage/ndb/test/src/DbUtil.cpp:
  fixes and adjustments I found along the way
storage/ndb/test/include/DbUtil.hpp:
  fixes and adjustments I found along the way
2008-01-08 23:34:30 +01:00
unknown
e3eadd61e6 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  mysql.com:/data0/jebs_clones/mysql-5.1-new-ndb
2008-01-08 23:26:45 +01:00
unknown
d4045eedd8 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
2008-01-08 13:25:54 +01:00
unknown
d2f7c2f9b9 ndb - bug#33739
page need to refetched after timeslice
2008-01-08 13:23:35 +01:00
unknown
3ca5566036 ndb - dict
remove dead code


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  remove dead code
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  remove dead code
2008-01-04 11:34:23 +01:00
unknown
ecaeffade1 DbUtil.cpp:
Rename: storage/ndb/test/src/dbutil.cpp -> storage/ndb/test/src/DbUtil.cpp
DbUtil.hpp, DbUtil.cpp:
  Many changes based off a review from Magnus
DbUtil.hpp:
  Rename: storage/ndb/test/include/dbutil.hpp -> storage/ndb/test/include/DbUtil.hpp


storage/ndb/test/src/DbUtil.cpp:
  Many changes based off a review from Magnus
storage/ndb/test/include/DbUtil.hpp:
  Many changes based off a review from Magnus
2007-12-20 21:06:52 +01:00
unknown
c7dc182db9 Bug #33061: ORDER BY DESC becomes ASC in NDB partition pruning to one partition
When partition pruning resulted in an ordered index scan spanning only
one partition, any descending flag for the scan was wrongly discarded,
turning ORDER BY DESC into ORDER BY ASC, and similar problems.

Fixed by correctly passing descending flag in SCAN_TABREQ signal sent
to data nodes.


mysql-test/suite/ndb/r/ndb_partition_key.result:
  Test case.
mysql-test/suite/ndb/r/ndb_partition_range.result:
  Test case.
mysql-test/suite/ndb/t/ndb_partition_key.test:
  Test case.
mysql-test/suite/ndb/t/ndb_partition_range.test:
  Test case.
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Even if ordered scan not requested (no need to merge-sorts scans of
  each partition), we still need to honor the descending flag.
2007-12-18 13:40:35 +01:00
unknown
ff1474765c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
2007-12-15 09:23:49 +01:00
unknown
763c1132c3 Bug #31326: No compile check of order of initializations
fixed -Wreorder warnings


BUILD/SETUP.sh:
  Bug #31326: enabled the -Wreorder warnings
sql/rpl_mi.cc:
  Bug #31326: fixed -Wreorder warnings
storage/heap/ha_heap.cc:
  Bug #31326: fixed -Wreorder warnings
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Bug #31326: fixed -Wreorder warnings
storage/ndb/src/kernel/blocks/pgman.cpp:
  Bug #31326: fixed -Wreorder warnings
2007-12-14 15:21:37 +02:00
unknown
ae2f748376 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2007-12-13 21:32:45 +01:00
unknown
7870d0a7da Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1


storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
2007-12-13 12:04:00 +01:00
unknown
8e6e313c36 bug#33142: access after free() for blob replication and online alter table 2007-12-11 16:04:33 +01:00
unknown
481385de3a compile error fix for osx 2007-12-11 15:19:37 +01:00
unknown
b74c55e859 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-12-10 10:32:21 +01:00
unknown
c853fa4fe2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/ha_ndbcluster_binlog.cc:
  Auto merged
2007-12-10 10:26:01 +01:00
unknown
154ffb3ff5 bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes 2007-12-07 11:05:19 +01:00
unknown
f0e3f8f1c2 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


storage/ndb/include/kernel/signaldata/TcKeyRef.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  Merge
2007-12-07 10:46:12 +01:00
unknown
068b6e4222 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge


client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_ssl.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
mysql-test/t/log_state.test:
  Manual merge fix-up
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/ctype_ucs.result:
  Manual merge
mysql-test/r/func_misc.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/r/key.result:
  Manual merge
mysql-test/r/log_state.result:
  Manual merge
mysql-test/suite/binlog/t/binlog_killed.test:
  Manual merge
mysql-test/t/ctype_ucs.test:
  Manual merge
mysql-test/t/func_misc.test:
  Manual merge
mysql-test/t/key.test:
  Manual merge
sql/item_strfunc.h:
  Manual merge
strings/ctype-simple.c:
  Manual merge
2007-12-05 12:33:36 -07:00
unknown
c124985e6d ndb - testNodeRestart -n Bug27466 T1
make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race, error insert causes 5s delay)


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  soem more printout
2007-12-03 14:31:17 +01:00
unknown
72cbad5c05 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2007-12-03 12:46:08 +01:00
unknown
4c85c8dd50 ndb - bug#26457
Fix bug in bug fix, causing random test-failure
2007-12-03 12:43:50 +01:00
unknown
37b188cdff BUG#30417 Cluster misbehaves on auto-inc w/o PK.
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  The check that how many auto_increment columns in table are there should be preceded creating the table.
  If there are more than one auto_increment columns, the table shouldn't be created.
mysql-test/suite/ndb/r/ndb_autoinc.result:
  Adding test case for auto_increment isn't the default primary key columns
mysql-test/suite/ndb/t/ndb_autoinc.test:
  Adding test case for auto_increment isn't the default primary key columns
2007-11-29 19:19:55 +08:00
unknown
c51b1b8c02 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-11-23 16:22:59 +01:00
unknown
7c9cb76281 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
2007-11-23 13:22:16 +01:00
unknown
dbddc8b14b Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
2007-11-23 12:17:13 +01:00
unknown
8a06cfdcab ndb - bug#32652
release subscriber


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  release subscriber
2007-11-23 12:13:10 +01:00
unknown
bcd2abaaf8 bug#28445 - Heartbeat does not start until first API_REGREQ is recevied
- move api failure handling into own method
- add START_ORD so that hb checking can start really early


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  - make sure qmgr is "fully" informed about connections so that it can handle hb correctly
  - dont allow API/mysqld node to reconnect if we have not started yet (sp 8)
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  - move api failure handling into own method
  - add START_ORD so that hb checking can start really early
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  - move api failure handling into own method
  - add START_ORD so that hb checking can start really early
  - Init datastructures in constructor
  - as CONNECT_REP may occur before start phases
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  - Init datastructures in constructor
  - as CONNECT_REP may occur before start phases
  - start hb handling directly on connect rep (instead of first hb)
2007-11-23 10:46:48 +01:00
unknown
41362e64ee Bug#29621 - ndb_mgmd can timeout logevent request, making it to fail 2007-11-23 10:25:19 +01:00
unknown
24b8074f63 Bug #29139 missing error message for 275 2007-11-22 14:59:16 +01:00
unknown
5682d7c165 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-11-20 20:47:50 +01:00
unknown
87eb06f0d2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-11-20 15:13:26 +01:00
unknown
b217fd72d3 ndb - bug#32519
Add *correct* check when a LCP is restorable
  by looking at maxGciStarted from LCP_FRAG_REP
  (for all fragments)

  bug observed by running testSystemRestart -n SR_DD_1_LCP T1
  (causes "incorrect" behaviour in 51-ndb, and crash when using 2 LCP)


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  ndb - bug#32519
    Add *correct* check when a LCP is restorable
    by looking at maxGciStarted from LCP_FRAG_REP
    (for all fragments)
2007-11-20 15:08:48 +01:00
unknown
e606aa3c88 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-11-20 15:08:18 +01:00
unknown
02e378b140 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1


storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
2007-11-20 15:04:00 +01:00
unknown
1f43154bed Bug #31958 Slave stuck and stops processing relay logs 2007-11-20 15:02:37 +01:00
unknown
4d530ebbeb Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-11-19 13:43:31 +01:00
unknown
cb4df0a203 remove debug printout 2007-11-19 13:11:03 +01:00
unknown
49e3dcf1bb ndb - bug#22696
additional (not stricly necessary for this bug...)
  only send EXEC_SRCONF to node *in* SR
2007-11-19 11:10:36 +01:00
unknown
7d50a31b72 ndb - bug#22696
Fix handling of multiple redo phases
  - set correct state
  - handle 4 phases, by moving START_FRAGCONF to end of phase instead of beginning...


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  remove unused state ACTIVE_REMOVE_AFTER
  remove unused variable nextLcp
  remove unused methods (BUILD_INDX)
  add counter of outstanding GSN_EXEC_FRAGREQ
  remove c_redo_complete_fragments cause it fits badly with functional multi-redo-phases
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  remove unused stuff
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  1) set correct state before starting next non-empty REDO phase
  2) move GSN_START_FRAGCONF to execFRAGCONF instead of when sending GSN_EXEC_FRAGREQ
     or fragments with 4 redo-phases would never be complete...
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase
2007-11-19 10:47:26 +01:00
unknown
9c40bbc134 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-11-16 11:24:44 +01:00
unknown
79f8eeed86 ndb -
add new testtool that does connect/disconnect in loop


storage/ndb/test/tools/Makefile.am:
  add new test tool
storage/ndb/test/tools/connect.cpp:
  New BitKeeper file ``storage/ndb/test/tools/connect.cpp''
2007-11-14 13:28:45 +01:00
unknown
90c05bd8e4 ndb - Add new dump 8011
which dumps all subscribers


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Add new dump 8011
    which dumps all subscribers
2007-11-14 11:52:40 +01:00