Commit graph

315 commits

Author SHA1 Message Date
unknown
394dd23495 bug#10987 - rpl_ndb_bank
last bug fix revealed another bug.
  fix buffer management when parsing table descriptor


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  remove pages on backup record, use buffer in file record instead
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  remove useless pages on backup record
    file buffer is good enough
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  remove useless pages on backup record
    file buffer is good enough
2006-01-31 11:42:36 +01:00
unknown
bf8274a49a 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-30 21:07:50 +01:00
unknown
857cff5a69 bug#10987 - rpl_ndb_bank -
Allow GET_TABINFO during BACKUP
  (otherwise LCP gets corrupt)


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  All GET_TABINFO during BACKUP
2006-01-30 21:07:01 +01:00
unknown
178b1740ab Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-01-30 17:07:37 +01:00
unknown
baec050207 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG16722/mysql-5.1-new


storage/myisam/ft_boolean_search.c:
  Auto merged
2006-01-30 16:28:51 +04:00
unknown
701347bc2e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-01-30 11:11:54 +01:00
unknown
1dc94a9dcf MySQL Bugs: #16772: Starting node joins cluster too early, workaround avoiding the issue for dynamically allocated nodeid's
storage/ndb/include/kernel/signaldata/AllocNodeId.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/AllocNodeId.hpp''
2006-01-30 11:09:55 +01:00
unknown
7501a104d4 bug#10987 - ndb - ndb_rpl_bank
more printouts...


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  printouts
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  printouts
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  printouts
2006-01-30 08:23:54 +01:00
unknown
d4c61055ed bug#10987 - ndb - ndb_rpl_bank
even more debug printouts


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  more printouts...
2006-01-29 23:13:39 +01:00
unknown
529267ee4f bug#10987 - ndb - more printouts to hunt rpl_ndb_bank problem in pushbuild
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  more printouts
  write tabfile sync
2006-01-29 15:53:34 +01:00
unknown
1fa5ff0488 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-27 22:26:05 +01:00
unknown
3e217c8161 ndb - fix compile error on sles9-x86
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix ref counts wrt alter table
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Fix trick goto, getting compile error on some platforms
2006-01-27 15:58:00 +01:00
unknown
9c46ce872f bug#16842 - ndb dd - drop logfile group crashed after SR
storage/ndb/src/kernel/blocks/lgman.cpp:
  Register thread start also on SR
2006-01-27 15:12:04 +01:00
unknown
92159be598 bug#16495 - ndb dd - dict ref count was not correctly set after SR
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Add dump for object/ref count
  Fix ref count on SR
2006-01-27 15:09:07 +01:00
unknown
9ea27d3250 ndb dd - Remove incorrect assertion making it's impossible to only use 1 undo file with "high" load
storage/ndb/src/kernel/blocks/lgman.cpp:
  Remove incorrect assertion making it's impossible to only use 1 undo file with "high" load
2006-01-27 14:23:43 +01:00
unknown
d255344c0b 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-27 07:38:39 +01:00
unknown
357cc3ea21 ndb dd -
fix bug in LCP + extent alloc


storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  fix for page allocation
storage/ndb/src/kernel/blocks/pgman.cpp:
  Fix LCP in pgman with more than 32 pages in one bucket
storage/ndb/src/kernel/blocks/tsman.cpp:
  ifdef printouts
2006-01-27 07:34:17 +01:00
unknown
0100356c22 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-26 21:00:00 +01:00
unknown
d85bdd5893 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG16722/mysql-5.1-new
2006-01-26 15:23:08 +04:00
unknown
1d5185d6ec BUG#16722 - Fulltext: implicit limit for query word number (depends on length of the query)
Remove implicit limit for query word number.


mysql-test/r/fulltext.result:
  Reoder results.
storage/myisam/ft_boolean_search.c:
  Remove implicit limit for query word number. Instead compute
  number of elements and allocate exactly needed memory.
2006-01-26 15:12:59 +04:00
unknown
328f044e49 bug#16787 - ndb dd - fix datafiles with more than 1 extent page
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  qd fix for inconsistency tsman/tup
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Increase extent pool
storage/ndb/src/kernel/blocks/pgman.cpp:
  Increase page entry pool
  Run LCP loop wo/ continueb
storage/ndb/src/kernel/blocks/tsman.cpp:
  Fix creating of datafiles with more than 1 extent page
2006-01-26 12:07:21 +01:00
unknown
77f51bf11a Bug #16152, create event assertion in debug version, list corruption 2006-01-26 11:14:20 +01:00
unknown
2b4d61cae5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-26 09:51:24 +01:00
unknown
456524c060 Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
my_stat() gettinng the correct parameter list may be next :)


client/mysqlslap.c:
  rename
extra/comp_err.c:
  rename
include/my_sys.h:
  replace
mysys/mf_tempdir.c:
  replace
mysys/my_malloc.c:
  replace
mysys/safemalloc.c:
  replace
sql/ha_federated.cc:
  replace
sql/log_event.cc:
  replace
sql/set_var.cc:
  replace
sql/set_var.h:
  replace
storage/myisam/ft_stopwords.c:
  replace
2006-01-25 19:54:42 -08:00
unknown
63a80b964f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51


mysql-test/t/disabled.def:
  Auto merged
2006-01-25 22:39:00 +01:00
unknown
465960c2e3 ndb - wl#2972 rbr blobs: write blob data to binlog
mysql-test/t/disabled.def:
  rbr blobs: write data + dict cache workarounds
sql/ha_ndbcluster.cc:
  rbr blobs: write data + dict cache workarounds
sql/ha_ndbcluster.h:
  rbr blobs: write data + dict cache workarounds
sql/ha_ndbcluster_binlog.cc:
  rbr blobs: write data + dict cache workarounds
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  rbr blobs: write data + dict cache workarounds
storage/ndb/src/ndbapi/NdbBlob.cpp:
  rbr blobs: write data + dict cache workarounds
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  rbr blobs: write data + dict cache workarounds
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  rbr blobs: write data + dict cache workarounds
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  rbr blobs: write data + dict cache workarounds
2006-01-25 22:22:50 +01:00
unknown
837723f652 bug#10987 - ndb - unable to find restorable replica
Add massive printout when failure detected


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Add dumping of replica info
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Add dumping of replica info
2006-01-25 11:02:19 +01:00
unknown
8dc5a6c6eb bug#16771 - ndb dd - fix leak of extents
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add debug printouts
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Add debug printouts
  Fix leak of extents
storage/ndb/src/kernel/blocks/pgman.cpp:
  Add debug printouts
2006-01-25 09:47:56 +01:00
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
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
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
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