Commit graph

29691 commits

Author SHA1 Message Date
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
ef55f642ca Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-23 14:51:44 +01:00
unknown
816b77516b Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
2006-01-23 14:48:12 +01:00
unknown
69238a7071 disabled.def:
updated


mysql-test/t/disabled.def:
  updated
2006-01-23 14:46:56 +01:00
unknown
949197ad71 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 14:16:35 +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
02de80335c rpl_foreign_key.test:
Added comments on 1022 per Lars request


mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Added comments on 1022 per Lars request
2006-01-23 14:07:58 +01:00
unknown
3acdcaa9d8 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2006-01-23 15:31:54 +04:00
unknown
d8cf1f49fa Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-23 11:02:11 +01:00
unknown
ff71755e3a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-23 10:44:18 +01:00
unknown
1b0b7e6948 added option for relative pat in ndb config
added option for verbose ndb startup


mysql-test/mysql-test-run.pl:
  added option for relative pat in ndb config
mysql-test/ndb/ndbcluster.sh:
  added option for relative pat in ndb config
2006-01-23 10:42:02 +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
c28a33713c 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:32:32 +01:00
unknown
5374448acc bug#13556 - (ndb) - incorrect parsing in tablespace code
end_ptr to my_strtoll10 is in/out parameter


sql/sql_yacc.yy:
  init end_ptr as it's an in/out parameter, not only out
2006-01-23 09:31:03 +01:00
unknown
7ae1df4bfa Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-23 09:17:08 +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
793a8bb7c3 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-01-23 11:59:31 +04:00
unknown
823ec15c65 Fixes about the embedded-server in 5.1
libmysqld/lib_sql.cc:
  logger initialization added
mysql-test/mysql-test-run.pl:
  ndbcluster and ssl disabled in embedded server
mysql-test/mysql-test-run.sh:
  ndbcluster disabled in embedded server
mysql-test/r/mysqltest.result:
  result fixed
mysql-test/r/sp_notembedded.result:
  result fixed
mysql-test/t/log_tables.test:
  test disabled in embedded server
mysql-test/t/sp_notembedded.test:
  test fixed
2006-01-23 11:58:14 +04: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
1a6dc1488d rpl_foreign_key_innodb.result, rpl_foreign_key.test:
had to add order by


mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  had to add order by
mysql-test/r/rpl_foreign_key_innodb.result:
  had to add order by
2006-01-20 23:39:13 +01:00
unknown
e885b1af6c Updated test
BitKeeper/deleted/.del-not_ndb_table.inc~86f167fc49e34d38:
  Delete: mysql-test/include/not_ndb_table.inc
BitKeeper/deleted/.del-not_ndb_table.require~1e81af954dbb864a:
  Delete: mysql-test/r/not_ndb_table.require
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Cleanup test for NDB
mysql-test/t/rpl_foreign_key_innodb.test:
  Cleanup test for NDB
mysql-test/r/rpl_foreign_key_innodb.result:
  Cleanup test for NDB
mysql-test/t/rpl_optimize.test:
  setting back to orginal values
2006-01-20 23:28:52 +01:00
unknown
fa90abeb34 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-20 22:29:40 +01:00
unknown
eae11c590d Disable partitioning test on servers compiled without partitioning. 2006-01-20 22:28:14 +01:00
unknown
61946d225a Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  selena.:H:/MYSQL/src/#00000-mysql-5.1


client/mysqlslap.c:
  Auto merged
configure.in:
  Auto merged
VC++Files/mysql.sln:
  manual merge
2006-01-20 18:40:02 +03:00
unknown
94ea98832a Post review updates for win32 port of mysqlslap 2006-01-20 18:20:03 +03:00
unknown
b14d5d64f1 ndb -
remove removed makefiles


config/ac-macros/ha_ndbcluster.m4:
  remove removed makefiles
2006-01-20 15:12:21 +01:00
unknown
b045ee3297 Merge mysql.com:/usr/local/mysql/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1
2006-01-20 14:50:04 +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
ba315e9bcd option to run mysql-test-run without binlog
calculate ndbcluster slave port


mysql-test/mysql-test-run.pl:
  calculate ndbcluster slave port
mysql-test/mysql-test-run.sh:
  option to run mysql-test-run without binlog
sql/mysqld.cc:
  option to run mysql-test-run without binlog
2006-01-20 14:50:02 +01:00
unknown
9687e5683e Fix formatting. 2006-01-20 13:51:18 +01:00
unknown
f3989fedd4 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1
2006-01-20 13:26:41 +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
e4cae610d9 Back out errorneous Windows fix. 2006-01-20 13:17:55 +01:00
unknown
72a1ae420b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-20 13:07:59 +01:00
unknown
cf735347e5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-01-20 12:56:39 +01:00
unknown
ae737a1f7f fix so that ndb builds --without-ndb-binlog 2006-01-20 12:55:07 +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
10a0b7b927 Merge mysql.com:/M51/merge-5.1 into mysql.com:/M51/mysql-5.1 2006-01-20 10:45:30 +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
9e59b396dd Updated with feedback omer provided
mysql-test/t/ndb_dd_ddl.test:
  Updated test case with suggestions from omer
mysql-test/r/ndb_dd_ddl.result:
  Updated test case with suggestions from omer
2006-01-20 04:00:10 +01: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
a32426919a mysqlslap.c:
Fix incorrect option description.


client/mysqlslap.c:
  Fix incorrect option description.
2006-01-19 12:33:51 -06:00
unknown
fd40509ce3 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
2006-01-19 13:33:50 -05:00