1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-17 14:41:26 +03:00

1869 Commits

Author SHA1 Message Date
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
unknown
e4a398f1d3 ndb - bug#22672
fix another incorrect assertion


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  clear m_transaction_nodes.clear()
  to avoid asserion in debug-compiled in releaseApiCon
2006-10-19 11:18:04 +02:00
unknown
a1fa0ed49b ndb - fix incorrect assertion
Dont assert when getting gci=0 in read only transaction


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Dont assert when getting gci=0 in read only transaction
2006-10-19 10:43:25 +02:00
unknown
fdfabb82b0 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
sql/ha_ndbcluster.cc:
  merge
2006-10-19 10:29:52 +02:00
unknown
b8beac6f90 BUG #22547 LongMessageBuffer too large causes ndbd to exit and gives the exact paramter name in error log.
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Add a parameter id parameter for setSize method. When allocating memory error results in ndbd exit can gives exact parameter name in error log.
2006-10-19 13:49:32 +08:00
unknown
591f3194cf ndb - bug#23430
make sure not to release log buffer twice (or several times) in case of abort of multi update


storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  make sure not to release log buffer twice (or several times) in case of abort of multi update
2006-10-18 20:54:25 +02:00
unknown
245848081c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
2006-10-18 22:23:14 +10:00
unknown
e1922f0b32 BUG #14612 If a restore is done on a slave cluster, yet the apply_status and schema tables don't exist,
ndb_restore tool should create them.


storage/ndb/tools/restore/consumer.hpp:
  Add create apply_status and schema system table method when they don't exist.
storage/ndb/tools/restore/consumer_restore.cpp:
  Implement to create apply_status and schema system table method when they don't exist.
storage/ndb/tools/restore/consumer_restore.hpp:
  Add create apply_status and schema system table method when they don't exist.
storage/ndb/tools/restore/restore_main.cpp:
  if apply_status and schema system tables don't exist, create them also.
2006-10-18 18:12:55 +08:00
unknown
9910031cbe Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge


BitKeeper/deleted/.del-ha_berkeley.cc:
  Auto merged
BitKeeper/deleted/.del-ha_berkeley.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/blackhole/ha_blackhole.cc:
  Auto merged
storage/blackhole/ha_blackhole.h:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/csv/ha_tina.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
storage/example/ha_example.h:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/heap/ha_heap.h:
  Auto merged
storage/myisam/ha_myisam.h:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  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/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  merge
sql/ha_ndbcluster.h:
  merge
sql/handler.h:
  merge
sql/sql_delete.cc:
  merge
storage/archive/ha_archive.h:
  merge
storage/innobase/handler/ha_innodb.cc:
  merge
storage/innobase/handler/ha_innodb.h:
  merge
storage/myisam/ha_myisam.cc:
  merge
storage/myisammrg/ha_myisammrg.h:
  merge
2006-10-18 18:51:39 +10:00
unknown
c2e8969a8a Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug21253
2006-10-18 18:41:43 +10:00
unknown
7968c44c0e Bug #19148 Backup causes cluster down if _really_ early abort happens
Early abort, failing to allocate buffers, would go down the abort track and
 end up trying to sendDropTriggers (as the standard stop backup does). 
However, it is possible to not have any tables yet defined in the backup 
(due to allocating buffers is before this). Simple check in sendDropTrig 
(and continue to next step). Files may be open, so we continue to close them.

Also updated ERROR_Codes (and added one to test this bug).


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  update BACKUP error insert codes to reflect current reality.
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Allow for early abort when no tables have been included in backup.
  
  Allow for abort when file records have been seized but not yet allocated
  to specific uses (is the case when buffer allocation fails)
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  initialize BackupRecord file Ptrs
storage/ndb/test/src/NdbBackup.cpp:
  Add extra failure codes for buffer allocation failure in backup
2006-10-18 18:19:16 +10:00
unknown
de3b0d2d4a ndb -
Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)
2006-10-18 10:07:02 +02:00
unknown
72059a9be7 Bug#19454: Some values of MaxNoOfTriggers can stop a server
correct segment fault in setSize(), 
and improve the error message with displaying the specific parameter's name if malloc fail


storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  add an argument refer to the ID of a parameter which will be malloced
storage/ndb/src/kernel/vm/ArrayPool.hpp:
  in setSize(), correct the segment default due to overflow of two 32-bit interger's multiply
2006-10-18 13:45:41 +08:00
unknown
e1a122509d add a new mgmapi ndb_mgm_get_db_parameter_info, which retrieve parameter's name
storage/ndb/include/mgmapi/mgmapi.h:
  add a new function declaration
storage/ndb/src/mgmapi/Makefile.am:
  add a link of a new file ParamInfo.cpp which locate in mgmsrv dir
storage/ndb/src/mgmapi/mgmapi_configuration.cpp:
  add a new mgmapi function ndb_mgm_get_db_parameter_info
storage/ndb/src/mgmsrv/ParamInfo.cpp:
  New BitKeeper file ``storage/ndb/src/mgmsrv/ParamInfo.cpp''
  initialization information of all parameters, this copy from mgmsrv/ConfigInfo.cpp
storage/ndb/src/mgmsrv/ParamInfo.hpp:
  New BitKeeper file ``storage/ndb/src/mgmsrv/ParamInfo.hpp''
2006-10-18 11:06:35 +08:00
unknown
919dbf0e4a ndb - fix some ndb strict-alias problems
found with gcc 4.0.2 on Itanium2
  (ndb_dd_* failures)


storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Fix some potentil alias problems
storage/ndb/src/kernel/vm/Pool.hpp:
  Fix potential alias problem
2006-10-16 23:37:00 +02:00
unknown
afc81b7e37 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191
2006-10-16 11:44:53 +02:00
unknown
4154eb9abe BUG#21253 NdbApi.h should not include my_config.h
config/ac-macros/ha_ndbcluster.m4:
  re-introduce NDB_SIZEOF substitutions to prevent NdbApi depending on my_config
  which causes problems for autotools enabled ndbapi programs
storage/ndb/include/ndb_types.h.in:
  remove dependency on my_config.h that was causing problems for ndbapi programs
  using autoconf
2006-10-16 17:01:01 +10:00
unknown
44520da500 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191


sql/mysqld.cc:
  Auto merged
2006-10-15 12:11:52 +02:00
unknown
405c3c9abd DictTabInfo.cpp:
Fix for bug#23169 - memset param switching


storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Fix for bug#23169 - memset param switching
2006-10-14 00:42:39 +02:00
unknown
ad128072d6 BUG#21296 Add error messages when upgrading data node
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Add error messages.
2006-10-13 13:48:04 +00:00
unknown
3511385c1a fix merge problem 2006-10-13 13:54:47 +02:00
unknown
1b7ac27397 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  merge
2006-10-13 12:13:09 +02:00
unknown
f64849855b ndb - fix memleak (due to incorrect merge of bug#21941)
recommit into release-clone


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  fix missing "if" statement
2006-10-13 10:11:18 +02:00
unknown
2e3ee93de9 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/main
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2006-10-13 15:12:57 +10:00
unknown
994ce8f209 Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
2006-10-13 09:38:41 +08:00
unknown
38edc8ad72 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
2006-10-12 19:01:15 +02:00
unknown
38910a8637 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2006-10-12 18:58:52 +02:00
unknown
4d0b243578 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/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
2006-10-12 14:09:03 +02:00
unknown
5edab966ee fixed for BUG#21519, 'MySQLD Err msg "Management server closed connection" needs date & time stamp'.
added date & time stamp for the messages that will be printed to the mysqld message file.


storage/ndb/src/common/transporter/OSE_Receiver.cpp:
  added date & time stamp for the messages.
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  added date & time stamp for the messages.
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  added date & time stamp for the messages.
2006-10-12 10:31:27 +08:00
unknown
e1f52e72a6 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-10-11 05:16:50 +02:00
unknown
c34940a078 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


include/my_sys.h:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
2006-10-10 21:59:23 +02:00
unknown
ef0ee7642a 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/tools/restore/restore_main.cpp:
  Auto merged
2006-10-10 15:27:47 +02:00
unknown
ff604cb77c ndb -
ndb_restore Return OK even if temporary errors
    (otherwise mysql-test-run/ndb_restore can fail on really slow machines)


storage/ndb/tools/restore/restore_main.cpp:
  Return OK even if temporary errors
2006-10-10 15:26:39 +02:00
unknown
e833ecae4b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/innobase/btr/btr0btr.c:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/fsp/fsp0fsp.c:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/include/btr0cur.ic:
  Auto merged
storage/innobase/log/log0log.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2006-10-10 11:25:24 +02:00
unknown
6407b7716a 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-10 11:08:23 +02:00
unknown
7037b80970 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/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
2006-10-10 11:06:51 +02:00
unknown
9fceb8773c ndb - tux scan 5.1 post-merge fix 2006-10-09 20:46:29 +02:00
unknown
a667710f50 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug20446
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20446


storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  merge: manual
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/DbtuxMaint.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  SCCS merged
2006-10-09 16:40:57 +02:00
unknown
c254a9cc91 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug20446
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20446


storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  SCCS merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  merge: ur
storage/ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged
2006-10-09 14:44:40 +02:00
unknown
5e81d1301e Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/b19459-mysql-5.1-new


client/mysqlbinlog.cc:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/base64.c:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged
2006-10-06 15:31:05 +02:00
unknown
596bf8ec02 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Merge 5.0-ndb into 5.1-ndb


storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_debug.h:
  Auto merged
storage/ndb/include/util/Parser.hpp:
  Auto merged
storage/ndb/include/util/socket_io.h:
  Auto merged
storage/ndb/src/common/util/InputStream.cpp:
  Auto merged
storage/ndb/src/common/util/Parser.cpp:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/testMgm.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/drop_tab.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged
storage/ndb/tools/select_count.cpp:
  Auto merged
storage/ndb/tools/waiter.cpp:
  Auto merged
mysql-test/r/ndb_config.result:
  manual merge
mysql-test/t/ndb_config.test:
  manual merge
storage/ndb/include/util/InputStream.hpp:
  manual merge
storage/ndb/tools/desc.cpp:
  manual merge
storage/ndb/tools/ndb_condig.cpp:
  manual merge
storage/ndb/tools/restore/restore_main.cpp:
  manual merge
storage/ndb/tools/select_all.cpp:
  manual merge
2006-10-05 23:13:29 +10:00
unknown
d7bb7cc561 ndb - bug#17929
guess which scan type to use in handler


sql/ha_ndbcluster.cc:
  Add guessing of scan type when starting full-table-scan
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Add methods to check properties of a bitmap of columns
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Add DiskScanFlag
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add aggregate of #disk columns
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Add #disk columns
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Add disk scan flag
storage/ndb/tools/delete_all.cpp:
  Add tupscan/diskscan to delete_all
2006-10-05 14:25:18 +02:00
unknown
c74ffabeb8 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/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  merge
2006-10-04 11:42:50 +02:00
unknown
e963a7cd34 Merge bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-ndb-bj
into  bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb


client/mysqltest.c:
  Auto merged
include/config-netware.h:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
storage/csv/ha_tina.cc:
  manual merge.
storage/innobase/btr/btr0btr.c:
  SCCS merged
storage/innobase/buf/buf0buf.c:
  SCCS merged
storage/innobase/dict/dict0dict.c:
  SCCS merged
storage/innobase/fil/fil0fil.c:
  SCCS merged
storage/innobase/fsp/fsp0fsp.c:
  SCCS merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged
storage/innobase/include/btr0cur.ic:
  use local
storage/innobase/include/buf0buf.ic:
  SCCS merged
storage/innobase/log/log0log.c:
  SCCS merged
storage/innobase/log/log0recv.c:
  SCCS merged
storage/innobase/os/os0file.c:
  SCCS merged
storage/innobase/row/row0mysql.c:
  SCCS merged
storage/innobase/row/row0sel.c:
  SCCS merged
storage/innobase/srv/srv0start.c:
  SCCS merged
storage/innobase/ut/ut0dbg.c:
  SCCS merged
2006-10-04 11:33:28 +02:00
unknown
675f55a66e 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/common/debugger/signaldata/SignalNames.cpp:
  SCCS merged
2006-10-04 09:49:11 +02:00