Commit graph

3503 commits

Author SHA1 Message Date
unknown
77f51bf11a Bug , 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
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 : 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