Commit graph

962 commits

Author SHA1 Message Date
unknown
9f8d2e5b14 ndb - no bugs number
1) Make sure not to read uninitialized data in unique index code
      harmless (atleast before dynattr)
  2) Dont update p_latest_trans_gci
      for dirty unique index lookup
  


storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Make sure not to read uninitialized data in unique index code
    harmless (atleast before dynattr)
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Dont update p_latest_trans_gci
    for dirty unique index lookup
2006-11-21 14:23:42 +01:00
unknown
d7cc8d4022 ndb - bug#24331
Make sure LCP scan record is correct initialized


storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Init ScanOp
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  And set correct pointers...
2006-11-21 14:21:11 +01:00
unknown
32510f6289 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testScan.cpp:
  merge
2006-11-21 14:18:52 +01:00
unknown
a4e3ac42c6 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-11-21 12:06:34 +01:00
unknown
8c806e5cf1 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/common/util/InputStream.cpp:
  merge
2006-11-21 11:59:21 +01:00
unknown
548e128262 Bug#24361 valgrind error when shutting down mysqld connected to cluster
- Disconnect from transporter before starting to delete objects


storage/ndb/src/ndbapi/Ndbinit.cpp:
  Make sure to disconnect from transporter to stop signals from coming in
  before starting to delete the objects that would recieve the signals
2006-11-20 21:11:45 +01:00
unknown
2531b1ac95 Bug#24361 valgrind error when shutting down mysqld connected to cluster
- Disconnect from transporter before starting to delete objects


storage/ndb/src/ndbapi/Ndbinit.cpp:
  Make sure to diconnect from transporter to stop signals from coming in before
  starting to delete the objects that would recieve the signals
2006-11-17 13:18:09 +01:00
unknown
77fc294aca Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-misc
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-misc


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2006-11-16 18:15:03 +01:00
unknown
c823c4fa77 Merge dev3-47.dev.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-47.dev.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/bug19203-5.1-new-ndb-bj
2006-11-14 09:56:30 +08:00
unknown
89d83739ee BUG#19808, Online config. Wrong error message if DataMemory less than a data on cluster
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  add err message when error occur
2006-11-14 09:33:43 +08:00
unknown
309e0d6faf Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


configure.in:
  Auto merged
2006-11-13 13:01:31 +01:00
unknown
a47ee8676e Bug#19203, Different error reports for similar cases - unable allocate memory
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  if malloc failed, it will show the parameter's name
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  if malloc failed, it will show the parameter's name
storage/ndb/src/kernel/vm/ArrayPool.hpp:
  reduce err message, or else some of it will be cut
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  add the feature which it can display the parameter's name if malloc failed
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  add an input argument which is the ID of a parameter
2006-11-13 15:31:59 +08:00
unknown
00d96458b7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


client/mysqldump.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
sql/sql_class.h:
  Fixed indentation
2006-11-10 11:38:54 +01:00
unknown
fdd6efb69a BUG#24143 Heavy file fragmentation with multiple ndbd on single fs
If we have the XFS headers (at build time) we can use XFS specific ioctls
(once testing the file is on XFS) to better allocate space.

This dramatically improves performance of mysql-test-run cases as well:

e.g.
number of extents for ndb_dd_basic tablespaces and log files
BEFORE this patch: 57, 13, 212, 95, 17, 113 
WITH this patch  :  ALL 1 or 2 extents

(results are consistent over multiple runs. BEFORE always has several files
with lots of extents).

As for timing of test run:
BEFORE
ndb_dd_basic                   [ pass ]         107727
real    3m2.683s
user    0m1.360s
sys     0m1.192s

AFTER
ndb_dd_basic                   [ pass ]          70060
real    2m30.822s
user    0m1.220s
sys     0m1.404s

(results are again consistent over various runs)

similar for other tests (BEFORE and AFTER):
ndb_dd_alter                   [ pass ]         245360
ndb_dd_alter                   [ pass ]         211632


configure.in:
  Check for XFS headers
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  If the XFS headers are installed, use the xfsctl(XFS_IOC_RESVSP64) call (a
  wrapper around ioctl) to tell the xfs file system how much space to reserve
  for this file.
2006-11-10 01:08:35 +11:00
unknown
b1a3c4e7c6 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work


storage/ndb/include/util/Vector.hpp:
  Auto merged
2006-11-08 15:23:46 +11:00
unknown
086a2eb17b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work
2006-11-08 15:15:50 +11:00
unknown
43ce261779 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-11-07 13:59:46 +01:00
unknown
32034246f4 ndb - bug#24039
Make sure index scan does not commitDelete


mysql-test/r/ndb_index_ordered.result:
  testcase
mysql-test/t/ndb_index_ordered.test:
  testcase
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Make sure index scan does not commitDelete
2006-11-07 13:59:14 +01:00
unknown
b9956d0457 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/ndbapi/NdbTransaction.cpp:
  Auto merged
2006-11-06 15:12:08 +01:00
unknown
ed7eb26a67 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  merge
2006-11-06 15:09:58 +01:00
unknown
3ab332c43e BUG#20065 Erroneous error message at Node Restart if MaxNoOfOrderedIndexes changed too low
nicer error message to user, along with error code to help track down the problem.


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Report error when creating table (restartCreateTab_dihComplete) 
  to user in a nicer way.
2006-11-03 19:05:09 +11:00
unknown
3fc3c084be remove OSE
BitKeeper/deleted/.del-NdbErrHnd.cpp:
  Delete: storage/ndb/src/common/util/NdbErrHnd.cpp
BitKeeper/deleted/.del-MemoryChannelOSE.hpp:
  Delete: storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp
BitKeeper/deleted/.del-Makefile:
  Delete: storage/ndb/src/common/transporter/priotest/prioOSE/Makefile
BitKeeper/deleted/.del-OSE_Receiver.cpp:
  Delete: storage/ndb/src/common/transporter/OSE_Receiver.cpp
BitKeeper/deleted/.del-OSE_Receiver.hpp:
  Delete: storage/ndb/src/common/transporter/OSE_Receiver.hpp
BitKeeper/deleted/.del-OSE_Signals.hpp:
  Delete: storage/ndb/src/common/transporter/OSE_Signals.hpp
BitKeeper/deleted/.del-OSE_Transporter.cpp:
  Delete: storage/ndb/src/common/transporter/OSE_Transporter.cpp
BitKeeper/deleted/.del-OSE_Transporter.hpp:
  Delete: storage/ndb/src/common/transporter/OSE_Transporter.hpp
BitKeeper/deleted/.del-mmslist.cpp:
  Delete: storage/ndb/src/common/portlib/mmslist.cpp
2006-11-03 02:18:45 +11:00
unknown
1577b96241 BUG#22309 FileLogHandler::createNewFile() isn't thread safe - may loose log messages
BUG#22305  	SysLogHandler not thread safe
BUG#22313  	can get duplicate log messages in cluster log

Fix all these problems with one patch. Make Logger, hence EventLogger (with a 
bit more) thread safe.


storage/ndb/include/debugger/EventLogger.hpp:
  remove m_text to make thread safe
storage/ndb/include/logger/Logger.hpp:
  Use mutex to protect member variables for multithreaded use.
storage/ndb/src/common/debugger/EventLogger.cpp:
  use a string on the stack instead of member variable to make class thread safe
storage/ndb/src/common/logger/Logger.cpp:
  use mutexes to Guard member variables. makes class therad safe
2006-11-03 01:12:30 +11:00
unknown
ca095b6b0f Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work


storage/ndb/include/logger/FileLogHandler.hpp:
  Auto merged
storage/ndb/include/util/File.hpp:
  Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
2006-11-02 23:46:59 +11:00
unknown
479ffe15cb Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19352
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug19352


storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
2006-11-02 11:03:48 +00:00
unknown
3c52ab722e Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
storage/ndb/tools/ndb_size.tmpl:
  Auto merged
sql/sql_table.cc:
  SCCS merged
2006-11-02 03:30:16 +03:00
unknown
a1db0e72de Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2006-11-01 13:26:03 +01:00
unknown
ce8011429a Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052


storage/ndb/include/ndbapi/ndberror.h:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
2006-11-01 10:53:24 +00:00
unknown
d7dc169ea0 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


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
2006-10-27 16:38:12 +02:00
unknown
bd6203d528 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
2006-10-27 16:37:16 +02:00
unknown
60b5420bff Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux


storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged
2006-10-25 17:32:32 +02:00
unknown
726a63b03c Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb


storage/ndb/include/util/UtilBuffer.hpp:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged
2006-10-25 10:44:22 +02:00
unknown
0ab6fd5f3e Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-25 08:49:35 +02:00
unknown
12111f9541 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


sql/ha_ndbcluster.cc:
  Auto merged
2006-10-25 08:45:06 +02:00
unknown
11951fda52 5.1.12 - release clone
ndb - revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
2006-10-23 09:48:36 +02:00
unknown
2318f1bf03 ndb -
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes


storage/ndb/src/mgmsrv/Services.cpp:
  revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
2006-10-22 08:24:31 +02:00
unknown
d747f61072 merge 2006-10-20 16:26:40 +02:00
unknown
f4326d0215 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/include/kernel/ndb_limits.h:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  merge
2006-10-20 16:25:14 +02:00
unknown
53b1792e17 ndb - bug#23494
Fix bug in restore with table with many columns, Compute size of databuffer pool correctly
2006-10-20 14:37:34 +02:00
unknown
d54d43b61c ndb -
Add better error message if getting error in RESTORE
2006-10-20 14:36:39 +02:00
unknown
8744989469 merge 2006-10-20 14:35:22 +02:00
unknown
30c8b7bd17 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-10-20 14:31:39 +02:00
unknown
9372279460 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21858
2006-10-20 16:38:26 +08:00
unknown
d1a7f24d05 BUG #21858 Make sure retry when EINTR returns, which decreases memory leak chance.
storage/ndb/src/common/util/File.cpp:
  Avoid memory leak when EINTR error returns. Even though a close error happens, a ERROR message in out-file is given, and this shouldn't affect the normally running.
2006-10-20 14:55:14 +08:00
unknown
87d0cf0da7 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug14612
2006-10-20 13:01:25 +08:00
unknown
b771bb74a6 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug22547
2006-10-20 11:32:21 +08:00
unknown
9d71c4f2f3 ndb - bug#22548, Data nodes fail during starting if MaxNoOfUniqueHashIndexes has upper limit.
added check in ndb_mgmd so that the sum of MaxNoOfTables, MaxNoOfOrderedIndexes, MaxNoOfUniqueHashIndexes and the number of System Tables must not overflow the max Uint32 number.


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  the sum of MaxNoOfTables, MaxNoOfOrderedIndexes, MaxNoOfUniqueHashIndexes and the number of System Tables must not overflow the max value of Uint32.
2006-10-20 10:54:27 +08:00
unknown
5dd4481daa Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux


storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  SCCS merged
storage/ndb/src/kernel/vm/DLFifoList.hpp:
  maybe already-done-merge
2006-10-19 12:29:24 +02:00
unknown
f0fb0d17c2 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
2006-10-19 11:23:34 +02:00
unknown
b8812c85db ndb - add temporary tables to hugo
and use it for testOperations/testTransactions


storage/ndb/test/include/NDBT_Test.hpp:
  Add support for temporary tables in hugo
storage/ndb/test/ndbapi/testOperations.cpp:
  Make testOperations use temporary tables
storage/ndb/test/ndbapi/testTransactions.cpp:
  Make testTransactions use temporary tables
storage/ndb/test/src/NDBT_Tables.cpp:
  Add support for temporary tables in hugo
storage/ndb/test/src/NDBT_Test.cpp:
  Add support for temporary tables in hugo
2006-10-19 11:20:04 +02:00