Commit graph

545 commits

Author SHA1 Message Date
unknown
d5e109ea6a bug#16742 - ndb dd - round filesize upwards
storage/ndb/src/kernel/blocks/tsman.cpp:
  Round filesize upwards
2006-01-24 11:41:58 +01:00
unknown
5f7d84930d bug#16738 - ndb dd - out of diskspace
fix typo + add error code to printable list


storage/ndb/include/kernel/signaldata/Extent.hpp:
  Set correct error code
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  err is already negative
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Set correct error code
storage/ndb/src/ndbapi/ndberror.c:
  Add error code to printable list
2006-01-24 10:47:04 +01:00
unknown
5c20cae88a Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-01-23 14:51:45 +01:00
unknown
8af5860ee4 ndb - Fix strange SR problems
uninit variable


storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  Correct signal length
2006-01-23 14:15:35 +01:00
unknown
13c7251e14 ndb - fix typo
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix typo
2006-01-23 09:57:04 +01:00
unknown
c4b12f644c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-23 09:12:22 +01:00
unknown
97c6ff7bf2 ndb - wl#2972 injector cleanup accessed blob event ops via Ndb => crash
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  hide blob event ops under main op
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  hide blob event ops under main op
2006-01-23 07:27:49 +01:00
unknown
4649ac0746 Small cleanups to remove old or un-needed methods.
storage/csv/ha_tina.cc:
  Removed unimplemented methods.
storage/csv/ha_tina.h:
  Reomoved unneeded methods
2006-01-22 13:51:42 -08:00
unknown
fef9b7499c wl1497 - ndb - dynamic mem in ndbd
Impl. NdbdSuperPool (subclass of SuperPool) that uses Ndbd_mem_manager
  Impl. micro benchmark


storage/ndb/src/kernel/vm/Makefile.am:
  Add NdbdSuperPool , which impl. SuperPool
storage/ndb/src/kernel/vm/SuperPool.cpp:
  remove virtuallity
storage/ndb/src/kernel/vm/SuperPool.hpp:
  Remove unneccesary virtuality
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  Add util methods used by NdbdSuperPool
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  Add util methods used by NdbdSuperPool
storage/ndb/src/kernel/vm/NdbdSuperPool.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/NdbdSuperPool.cpp''
storage/ndb/src/kernel/vm/NdbdSuperPool.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/NdbdSuperPool.hpp''
storage/ndb/src/kernel/vm/bench_pool.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/bench_pool.cpp''
2006-01-22 18:23:48 +01:00
unknown
567a31e33f ndb - wl#2972 fix tinyblob
storage/ndb/src/ndbapi/NdbBlob.cpp:
  tinyblob of course has no blob table and no blob op
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  tinyblob of course has no blob table and no blob op
storage/ndb/test/ndbapi/test_event_merge.cpp:
  tinyblob of course has no blob table and no blob op
2006-01-22 13:28:43 +01:00
unknown
30877fc598 ndb - wl#2972 injector saw blob table drop event => crash
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  catch non-data events on blob part tables
2006-01-22 10:37:57 +01:00
unknown
e698a39dc8 Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-rbr


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
2006-01-21 11:57:15 +01:00
unknown
59206da15a Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1
2006-01-20 14:50:03 +01:00
unknown
3da6381046 Merge mysql.com:/usr/local/mysql/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1


sql/sql_class.cc:
  Auto merged
2006-01-20 13:24:18 +01:00
unknown
e3523a0f6c Portability compilation fixes.
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Fix sol10-amd64-a compile failure, conflict with system headers.
sql/log.cc:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/mysql_priv.h:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/sql_delete.cc:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/table.cc:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/sql_parse.cc:
  Fix HPUX compile failure, initializing char * with const char *
2006-01-20 13:23:24 +01:00
unknown
2c6b3c8c2f Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1.4
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge
storage/ndb/src/ndbapi/ndberror.c:
  merge
2006-01-20 11:05:02 +01:00
unknown
ccc4681d03 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-20 09:25:21 +01:00
unknown
ed50d89604 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
2006-01-20 09:10:58 +01:00
unknown
af7051c98a Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-01-20 07:23:25 +01:00
unknown
4234038b63 Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new
into  mysql.com:/home/stewart/Documents/MySQL/5.1/2868
2006-01-20 15:52:19 +11:00
unknown
4c7d6191b6 WL#2868 Fix backup trigger handling
BACKUP previous set up triggers using DICT.
This lead to all kind of trouble.
An smaller alternative to using SUMA for backup
  is to just make BACKUP handle triggers to TUP directly.

This way all triggers will be totally local,
  and error handling is much simpler.

--- old impl.

Start: Master recives GSN_DEFINE_BACKUP_CONF from all participants
Master sends CREATE_TRIG_REQ for all tables to local DICT (dict master)
Master sends START_BACKUP_REQ to all paricipants with trigger ids from DICT
Master sends ALTER_TRIG_REQ (online) to local DICT
Master waits for GCP
Master starts distributed scan
When scan has finished
Master waits for GCP
Master sends DROP_TRIGGER to local DICT
Master sends STOP_BACKUP_REQ to all participants

--- new impl.

Start: Master recives GSN_DEFINE_BACKUP_CONF from all participants
Master sends START_BACKUP_REQ to all paricipants
  Participand sends CREATE_TRIG_REQ for all tables to local TUP
Master waits for GCP
Master starts distributed scan
When scan has finished
Master waits for GCP
Master sends STOP_BACKUP_REQ to all participants
  Participant sends DROP_TRIGGER to local TUP

Changes:
All trigger handling is _local_
 This implies, that abort (e.g due to node failure) can be _local_


fix testBackup test so that it will run successfully with the (now correct)
backup trigger code.


storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  rework START_BACKUP signals as we no longer need tableId and triggerIds.
storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  START_BACKUP_REQ no longer has tableIds and trigger ids
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Use TUP triggers directly.
  
  removes ALTER trigger
  simplifies DROP triggers
  
  changes to node failure handling
  
  changes in signal order
  
  use SlaveData to track slave status.
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  - remove ALTER_TRIG (now unused)
  - add signalNo to BackupRecord
  - add SlaveData
  - remove dead items from MasterData
  - update prototype of startBackupReply
storage/ndb/src/kernel/blocks/backup/Backup.txt:
  Update signals for new backup code.
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  remove ALTER_TRIG REF and CONF as we no longer use them.
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add comment about meaning of triggerId
  Add sender BlockNumber parameter to dropTrigger.
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  for SUBSCRIPTION triggers, make it so that the trigger ids are private to each block.
storage/ndb/test/ndbapi/testBackup.cpp:
  Don't do initial restart, just a restart. This is to avoid cache issues with
  schema versions
storage/ndb/test/src/NdbBackup.cpp:
  Update error insertions.
2006-01-20 15:42:00 +11:00
unknown
b8c8953867 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  outpost.site:/home/cps/mysql/devel/test-6
2006-01-20 00:42:57 +03:00
unknown
bd7120f97c Fix the tree: plugin-related changes, necessary for
CSV storage engine to be statically compiled.
Derived from antony's patch.


config/ac-macros/storage.m4:
  don't add objects to the object list if
  we don't have them
configure.in:
  compile CSV statically
sql/ha_myisam.cc:
  fix prototype to get rid of THD
sql/ha_myisam.h:
  fix prototype to get rid of THD
sql/handler.cc:
  new function for plugins
sql/handler.h:
  fix prototype to get rid of THD
  declare functions used by plugins
sql/item.h:
  Don't include all the types and files when not building mysqld
sql/lock.cc:
  don's assume that handler knows about THD
sql/mysql_priv.h:
  Don't include all the types and files when not building mysqld
  declare new plugin functions
sql/sql_class.cc:
  New plugin functions
sql/sql_class.h:
  Don't include all the types and files when not building mysqld
sql/sql_lex.h:
  Don't include all the types and files when not building mysqld
storage/csv/Makefile.am:
  compile CSV into a static lib to be
  linked into mysqld
storage/csv/ha_tina.cc:
  fix ha_tina to be able to build it static
storage/csv/ha_tina.h:
  fix prototype to get rid of THD
2006-01-20 00:40:56 +03:00
unknown
1e84cb0dea Merge mysql.com:/usr/local/mysql/ab/mirrors/pullers/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1


sql/log_event.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2006-01-19 21:50:57 +01:00
unknown
efdeeca25f Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-rbr
2006-01-19 19:33:51 +01:00
unknown
dd9189756b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-19 19:33:51 +01:00
unknown
ea67b28c5b WL #2747: After push fixes
mysql-test/ndb/ndbcluster.sh:
  Upgraded DataMemory to 20M so that ndb_restore tests fit in memory
mysql-test/r/ndb_config.result:
  Upgraded DataMemory to 20M so that ndb_restore tests fit in memory
mysql-test/r/ndb_restore.result:
  Added check that no extra objects exist before starting
  Added printout from erronous node group map
mysql-test/t/disabled.def:
  Activated ndb_restore again
mysql-test/t/ndb_restore.test:
  Added new test cases and handling of error case for node group maps
storage/ndb/tools/restore/consumer_restore.cpp:
  Removed debug printouts
storage/ndb/tools/restore/restore_main.cpp:
  Removed debug printouts
  ndbout => info
  some ndbout => err
  and yet others
  ndbout => debug
2006-01-19 13:32:58 -05:00
unknown
4eede6f031 Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-01-19 15:05:57 +01:00
unknown
0d340013f5 bug#16455 - ndb crash when running of of rope pool
storage/ndb/include/kernel/signaldata/CreateTable.hpp:
  New error code for rope pool
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  New error code for rope pool
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  New error code for rope pool
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  New error code for rope pool
storage/ndb/src/ndbapi/ndberror.c:
  New error code for rope pool
2006-01-19 14:08:05 +01:00
unknown
cae0b6f9a8 ndb - wl#2972 rbr blobs ndb api support
storage/ndb/include/ndbapi/NdbBlob.hpp:
  rbr blobs ndb api support
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  rbr blobs ndb api support
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
  rbr blobs ndb api support
storage/ndb/ndbapi-examples/ndbapi_event/Makefile:
  rbr blobs ndb api support
storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp:
  rbr blobs ndb api support
storage/ndb/src/ndbapi/NdbBlob.cpp:
  rbr blobs ndb api support
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  rbr blobs ndb api support
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  rbr blobs ndb api support
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  rbr blobs ndb api support
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
  rbr blobs ndb api support
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  rbr blobs ndb api support
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  rbr blobs ndb api support
storage/ndb/test/ndbapi/test_event_merge.cpp:
  rbr blobs ndb api support
2006-01-19 14:01:32 +01:00
unknown
41536fcefe WL1019: complete patch. Reapplied patch to the clean
tree to get rid of multiple typos in CS comments and
unify the patch.


configure.in:
  CSV is compiled in by default now
include/my_base.h:
  add new ha_extra flag for the log tables
mysql-test/include/im_check_os.inc:
  we should only run im tests if csv is on for now: im relies
  on mysqld options available only in csv build.
mysql-test/include/system_db_struct.inc:
  check log tables structure
mysql-test/lib/init_db.sql:
  create log tables when running tests.
mysql-test/mysql-test-run.pl:
  Add old logs flag to IM tests. As IM could only deal with
  old logs (this feature is not needed with log tables)
mysql-test/r/connect.result:
  update result
mysql-test/r/csv.result:
  update result
mysql-test/r/im_utils.result:
  update result
mysql-test/r/information_schema.result:
  update result
mysql-test/r/mysqlcheck.result:
  update result
mysql-test/r/show_check.result:
  update result
mysql-test/r/system_mysql_db.result:
  update result
mysql-test/t/connect.test:
  disable test if CSV engine is not in: result depends on the
  presence of CSV-based log tables
mysql-test/t/csv.test:
  add tests for concurrent insert (the functionality is added
  to CSV in this patch)
mysql-test/t/information_schema.test:
  disable test if CSV engine is not in: result depends on the
  presence of CSV-based log tables
mysql-test/t/mysqlcheck.test:
  disable test if CSV engine is not in: result depends on the
  presence of CSV-based log tables
mysql-test/t/show_check.test:
  disable test if CSV engine is not in: result depends on the
  presence of CSV-based log tables
mysql-test/t/system_mysql_db.test:
  disable test if CSV engine is not in: result depends on the
  presence of CSV-based log tables
mysql-test/t/system_mysql_db_fix.test:
  disable test if CSV engine is not in: result depends on the
  presence of CSV-based log tables
scripts/mysql_create_system_tables.sh:
  new system tables: slow_log and general_log
scripts/mysql_fix_privilege_tables.sql:
  add new log tables: use an SP to create them for
  non-csv build to work fine.
sql/ha_myisam.cc:
  move locking-related checks to the hanlder
sql/ha_myisam.h:
  new function declared
sql/handler.h:
  new virtual function is added: we should check for handler-related
  locking issues in the handler
sql/lock.cc:
  from now on we check for handler-related locking issues
  in the handler itself rather then in lock.cc
sql/log.cc:
  Add log tables support, refactoring: there are log event
  handlers with common interface. They are used by the LOGGER
  class, which is responsible for their initialization, cleanup
  and managment. Logging to the tables provided by one of the
  log event handler types.
sql/log.h:
  declare new log classes
sql/log_event.cc:
  convert old logging routines calls to use new API
sql/mysql_priv.h:
  define common log routines and objects
sql/mysqld.cc:
  Add support for the log tables. Their initalization, cleanup
  and specific options.
sql/share/errmsg.txt:
  add new error messages for the log tables
sql/slave.cc:
  convert old logging routines calls to use new API
sql/sql_base.cc:
  TABLE objects used by the logger should be skipped
  during refreshes (as log tables are always opened
  and locked). fix table_is_used to skip them.  This
  is needed for FLUSH LOGS to work
sql/sql_db.cc:
  convert old logging routines calls to use new API
sql/sql_delete.cc:
  fix TRUNCATE to work with log tables
sql/sql_parse.cc:
  command_name is now an array of LEX_STRINGs
sql/sql_prepare.cc:
  convert old logging routines calls to use new API
sql/sql_show.cc:
  convert old logging routines calls to use new API
sql/sql_table.cc:
  don't reoped the log tables for admin purposes
sql/table.cc:
  mark log tables as such during the open
sql/table.h:
  add log-related info
storage/csv/ha_tina.cc:
  add support for concurrent insert (see bk commit - 5.1 tree
  (petr:1.1910) for standalone patch), add log tables-specific
  csv table handling.
storage/csv/ha_tina.h:
  enable concurrent insert for CSV, add log table flag
mysql-test/r/log_tables.result:
  New BitKeeper file ``mysql-test/r/log_tables.result''
mysql-test/t/log_tables.test:
  New BitKeeper file ``mysql-test/t/log_tables.test''
2006-01-19 05:56:06 +03:00
unknown
acdd08f051 fixed startup suma bug when ndb api connects during node restart 2006-01-18 16:45:17 +01:00
unknown
1e0f64fb18 ndb - wl#2972 (5.1) omit trigger check post!=pre if recipient is SUMA
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  send identical post/pre data on update if recipient is SUMA (events, replication)
2006-01-18 14:21:24 +01:00
unknown
f21a2c3680 ndb - wl#2972 (5.1, related) un-initialized var in Suma
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  un-initialized m_reportAll caused event operation create / drop /create to get m_reportAll = true
2006-01-18 10:59:41 +01:00
unknown
5e54f45fad Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-relmerge


include/config-win.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/log_event.cc:
  Manual merge
2006-01-17 18:35:16 +01:00
unknown
35137c3d91 fix my_compress/zlib link error 2006-01-17 18:35:15 +01:00
unknown
98fa568a47 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-17 18:35:13 +01:00
unknown
ba641e2df9 Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-01-17 18:35:13 +01:00
unknown
6aa4cded53 fix compile error 2006-01-17 18:35:11 +01:00
unknown
8d7692d353 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2747-push


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
2006-01-17 12:35:09 -05:00
unknown
93026d045b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-01-17 17:22:04 +01:00
unknown
db30c09c6e Merge c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2604-push


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
2006-01-17 09:36:55 -05:00
unknown
17f3f28a8f Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-01-17 10:48:48 +01:00
unknown
788521526a ndb - merge all blocks into one lib, enables better parallell build
(since am cant build directories in parallell)


BitKeeper/deleted/.del-Makefile.am~661a7e944c6a2048:
  Delete: storage/ndb/src/kernel/blocks/dbacc/Makefile.am
BitKeeper/deleted/.del-Makefile.am~7062fe587bbd7db4:
  Delete: storage/ndb/src/kernel/blocks/cmvmi/Makefile.am
BitKeeper/deleted/.del-Makefile.am~b7531a4ddc688658:
  Delete: storage/ndb/src/kernel/blocks/dbtux/Makefile.am
BitKeeper/deleted/.del-Makefile.am~e06c16d4515a6ce6:
  Delete: storage/ndb/src/kernel/blocks/dbtc/Makefile.am
BitKeeper/deleted/.del-Makefile.am~1f16f5bcb0850b40:
  Delete: storage/ndb/src/kernel/blocks/qmgr/Makefile.am
BitKeeper/deleted/.del-Makefile.am~2446a572de707944:
  Delete: storage/ndb/src/kernel/blocks/trix/Makefile.am
BitKeeper/deleted/.del-Makefile.am~51344ef8d0bbc561:
  Delete: storage/ndb/src/kernel/blocks/suma/Makefile.am
BitKeeper/deleted/.del-Makefile.am~c65b52fdd2143330:
  Delete: storage/ndb/src/kernel/blocks/ndbfs/Makefile.am
BitKeeper/deleted/.del-Makefile.am~c9ae371812ceaf68:
  Delete: storage/ndb/src/kernel/blocks/dbutil/Makefile.am
BitKeeper/deleted/.del-Makefile.am~e1b9fbc3d07a629d:
  Delete: storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am
storage/ndb/src/kernel/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/backup/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dbdict/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dbdih/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
  Merge all blocks into one lib
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Merge all blocks into one lib
2006-01-17 09:32:16 +01:00
unknown
6f83ed91f3 WL #2747: Fix such that backup and restore works for user defined
partitioned tables in NDB


include/my_sys.h:
  Move packfrm and unpackfrm to mysys
mysql-test/r/ndb_restore.result:
  New test cases
mysql-test/t/ndb_restore.test:
  New test cases
mysys/my_compress.c:
  Moved packfrm and unpackfrm to mysys
sql/ha_ndbcluster.cc:
  Set value of partition function in hidden field for user defined
  partitioning in NDB to handle restore and later on-line reorganize
  of partitions
  To save space value of those functions are limited to 32 bits
sql/ha_partition.cc:
  Use new get_partition_id interface
sql/handler.h:
  Use new get_partition_id interface
sql/mysql_priv.h:
  Moved to mysys
sql/mysqld.cc:
  Minor
sql/opt_range.cc:
  New get_partition_id interface
sql/sql_partition.cc:
  New get_partition_id interface
  Fix error checks of specification of engines in ALTER TABLE
  Moved packfrm and unpackfrm to mysys
sql/sql_table.cc:
  Fixed debug printouts
storage/ndb/include/kernel/ndb_limits.h:
  New constant
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  New table description item
storage/ndb/include/ndb_version.h.in:
  New version specific constant
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  New item in table descriptions
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  New item in table descriptions
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Write fragment id in backup's log entry
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
  Write fragment id in backup's log entry
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  New item in table description
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  New item in table description
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Moved constant
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  New item in table description
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  New item in table description
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  New item in table description
storage/ndb/tools/Makefile.am:
  Compress library needed for ndb_restore
storage/ndb/tools/restore/Restore.cpp:
  Handle fragment id and also handle backups from older versions
storage/ndb/tools/restore/Restore.hpp:
  Use fragment id
storage/ndb/tools/restore/consumer.hpp:
  Use fragment id
storage/ndb/tools/restore/consumer_printer.cpp:
  Use fragment id
storage/ndb/tools/restore/consumer_printer.hpp:
  Use fragment id
storage/ndb/tools/restore/consumer_restore.cpp:
  Code to map node groups if new cluster has different set of
  node groups from original cluster
  Very simple search and replace parser of partition syntax in frm file
  Fix settings of partition id properly using fragment id and hidden
  field in tables
storage/ndb/tools/restore/consumer_restore.hpp:
  Changed function headers and new one for mapping node groups
storage/ndb/tools/restore/consumer_restorem.cpp:
  Use fragment id
storage/ndb/tools/restore/restore_main.cpp:
  New parameter to set node group map, parser for this parameter
2006-01-17 09:25:12 +01:00
unknown
19bbb7cc85 WL #2604: Partition Management
Optimised version of ADD/DROP/REORGANIZE partitions for
non-NDB storage engines.
New syntax to handle REBUILD/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
Quite a few bug fixes


include/thr_lock.h:
  New method to downgrade locks from TL_WRITE_ONLY
  Possibility to upgrade lock while aborting locks
mysql-test/r/ndb_autodiscover.result:
  Fix for lowercase and that all NDB tables are now partitioned
mysql-test/r/ndb_bitfield.result:
  Fix for lowercase and that all NDB tables are now partitioned
mysql-test/r/ndb_gis.result:
  Fix for lowercase and that all NDB tables are now partitioned
mysql-test/r/ndb_partition_key.result:
  New test case
mysql-test/r/partition.result:
  New test case
mysql-test/r/partition_error.result:
  New test case
mysql-test/r/partition_mgm_err.result:
  Fix of test case results
mysql-test/t/disabled.def:
  partition_03ndb still has bug
mysql-test/t/ndb_partition_key.test:
  New test cases for new functionality and bugs
mysql-test/t/partition.test:
  New test cases for new functionality and bugs
mysql-test/t/partition_error.test:
  New test cases for new functionality and bugs
mysql-test/t/partition_mgm_err.test:
  New test cases for new functionality and bugs
mysys/thr_lock.c:
  New method to downgrade TL_WRITE_ONLY locks
  Possibility to specify if locks are to be upgraded at abort locks
sql/ha_archive.cc:
  New handlerton methods
sql/ha_berkeley.cc:
  New handlerton methods
sql/ha_blackhole.cc:
  New handlerton methods
sql/ha_federated.cc:
  New handlerton methods
sql/ha_heap.cc:
  New handlerton methods
sql/ha_innodb.cc:
  New handlerton methods
sql/ha_myisam.cc:
  New handlerton methods
sql/ha_myisammrg.cc:
  New handlerton methods
sql/ha_ndbcluster.cc:
  New handlerton methods
  Moved out packfrm and unpackfrm methods
  Adapted many parts to use table_share instead of table->s
  Ensured that .ndb file uses filename and not tablename
  according to new encoding of names (WL 1324)
  All NDB tables are partitioned and set up partition info
  Fixed such that tablenames use tablenames and not filenames in NDB
  NDB uses auto partitioning for ENGINE=NDB tables
  Warning for very large tables
  Set RANGE data
  Set LIST data
  New method to set-up partition info
  Set Default number of partitions flag
  Set linear hash flag
  Set node group array
  Set number of fragments
  Set max rows
  Set tablespace names
  New method to get number of partitions of table to use at open table
sql/ha_ndbcluster.h:
  Removed partition_flags and alter_table_flags from handler class
  A couple of new and changed method headers
sql/ha_ndbcluster_binlog.cc:
  Use new method headers
sql/ha_partition.cc:
  New handlerton methods
  Lots of new function headers
  Use #P# as separator between table name and partition name and
  #SP# as separator between partition name and subpartition name
  Use filename encoding for files both of table name part and of
  partition name parts
  New method to drop partitions based on partition state
  New method to rename partitions based on partition state
  New methods to optimize, analyze, check and repair partitions
  New methods to optimize, analyze, check and repair table
  Helper method to create new partition, open it and external lock
  it, not needed to lock it internally since no one else knows about
  it yet.
  Cleanup method at error for new partitions
  New methods to perform bulk of work at ADD/REORGANIZE partitions
  (change_partitions, copy_partitions)
sql/ha_partition.h:
  New methods and variables
  A few dropped ones and a few changed ones
sql/handler.cc:
  Handlerton interface changes
  New flag to open_table_from_share
sql/handler.h:
  New alter_table_flags
  New partition flags
  New partition states
  More states for default handling
  Lots of new, dropped and changed interfaces
sql/lex.h:
  Added REBUILD and changed name of REORGANISE to REORGANIZE
sql/lock.cc:
  Method to downgrade locks
  Able to specify if locks upgraded on abort locks
sql/log.cc:
  New handlerton methods
sql/mysql_priv.h:
  Lots of new interfaces
sql/share/errmsg.txt:
  Lots of new, dropped and changed error messages
sql/sql_base.cc:
  Adapted to new method headers
  New method to abort and upgrade lock
  New method to close open tables and downgrade lock
  New method to wait for completed table
sql/sql_lex.h:
  New flags
sql/sql_partition.cc:
  Return int instead of bool in get_partition_id
  More defaults handling
  Make use of new mem_alloc_error method
  More work on function headers
  Changes to generate partition syntax to cater for intermediate
  partition states
  Lots of new code with large comments describing new features for
  Partition Management:
  ADD/DROP/REORGANIZE/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
sql/sql_show.cc:
  Minors
sql/sql_table.cc:
  Moved a couple of methods
  New methods to copy create lists and key lists
  for use with mysql_prepare_table
  New method to write frm file
  New handling of handlers with auto partitioning
  Fix CREATE TABLE LIKE
  Moved code for ADD/DROP/REORGANIZE partitions
  Use handlerton method for alter_table_flags
sql/sql_yacc.yy:
  More memory alloc error checks
  New syntax for REBUILD, ANALYZE, CHECK, OPTIMIZE, REPAIR partitions
sql/table.cc:
  Fix length of extra part to be 4 bytes
  Partition state introduced in frm file
sql/table.h:
  Partition state introduced
sql/unireg.cc:
  Partition state introduced
  Default partition
storage/csv/ha_tina.cc:
  New handlerton methods
storage/example/ha_example.cc:
  New handlerton methods
storage/ndb/include/kernel/ndb_limits.h:
  RANGE DATA
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  New interfaces in ALTER TABLE towards NDB kernel
storage/ndb/include/kernel/signaldata/DiAddTab.hpp:
  New section
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Lots of new parts of table description
storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  tablespace id specified in LQHFRAGREQ
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Lots of new methods in NDB dictionary
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Lots of new variables in table description
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Lots of new variables in table description
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Lots of new variables in table description
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  New error insertion
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  a few extra jam's
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Changes to definition of blob tables
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Lots of new stuff in NDB dictionary
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Lots of new stuff in NDB dictionary
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Lots of new stuff in NDB dictionary
storage/ndb/test/ndbapi/test_event.cpp:
  removed use of methods no longer in existence
storage/ndb/tools/restore/Restore.cpp:
  Renamed variable
2006-01-17 08:40:00 +01:00
unknown
ed96f70849 added assert for when ndb share is not released as it should
+ corrected the bugs in this resuling from mysql-test-run
+removed some debug printouts


sql/ha_ndbcluster.cc:
  added assert for when ndb share is not released as it should
  + corrected the bugs in this resuling from mysql-test-run
sql/ha_ndbcluster.h:
  added assert for when ndb share is not released as it should
  + corrected the bugs in this resuling from mysql-test-run
sql/ha_ndbcluster_binlog.cc:
  added assert for when ndb share is not released as it should
  + corrected the bugs in this resuling from mysql-test-run
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  removed some debug printouts
2006-01-17 07:36:50 +01:00
unknown
6c83ba5c48 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG14194/mysql-5.1-new


mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
2006-01-16 22:27:36 +04:00
unknown
167e017cb6 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into moonbone.local:/work/15347-bug-5.1-new-mysql


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-01-16 19:01:57 +03:00
unknown
048754ff46 only use "public" types in plugin API
include/plugin.h:
  only use "public" types in plugin API:
  s/uint/unsigned int/ or s/uint/int/
  s/bool/char/
  s/byte/char/
  s/CHARSET_INFO */struct charset_info_st */
2006-01-16 15:17:45 +01:00