List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:March 8 2011 9:18am
Subject:bzr push into mysql-5.5-cluster branch (magnus.blaudd:3219 to 3221)
View as plain text  
 3221 Magnus Blåudd	2011-03-08
      ndb
       - remove useless typedef's in ndb_share.h

    modified:
      sql/ndb_share.h
 3220 Magnus Blåudd	2011-03-08
      ndb
       - move NDB_SHARE(with related struct's and enums) into ndb_share.h
       - add(still empty) ndb_share.cc

    added:
      sql/ndb_share.cc
      sql/ndb_share.h
    modified:
      sql/ha_ndbcluster.h
      storage/ndb/CMakeLists.txt
 3219 Magnus Blåudd	2011-03-04 [merge]
      Merge 5.5-telco-7.0 -> 5.5-cluster

    added:
      mysql-test/r/tablespace.result
      mysql-test/std_data/cluster_7022_table.MYD
      mysql-test/std_data/cluster_7022_table.MYI
      mysql-test/std_data/cluster_7022_table.frm
      mysql-test/t/tablespace.test
    modified:
      include/mysql_com.h
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/ndb/r/ndb_column_properties.result
      mysql-test/suite/ndb/r/ndb_dd_basic.result
      mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb/t/ndb_column_properties.test
      mysql-test/suite/ndb/t/ndb_dd_restore_compat.test
      sql/field.h
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      sql/ha_ndbcluster_glue.h
      sql/handler.cc
      sql/handler.h
      sql/lex.h
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_yacc.yy
      sql/table.cc
      sql/table.h
      sql/unireg.cc
=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2011-02-21 12:09:15 +0000
+++ b/sql/ha_ndbcluster.h	2011-03-08 09:04:24 +0000
@@ -120,101 +120,7 @@ int get_ndb_blobs_value(TABLE* table, Nd
                         uchar*& buffer, uint& buffer_size,
                         my_ptrdiff_t ptrdiff);
 
-typedef enum {
-  NSS_INITIAL= 0,
-  NSS_DROPPED,
-  NSS_ALTERED 
-} NDB_SHARE_STATE;
-
-#ifdef HAVE_NDB_BINLOG
-enum enum_conflict_fn_type
-{
-  CFT_NDB_UNDEF = 0
-  ,CFT_NDB_MAX
-  ,CFT_NDB_OLD
-  ,CFT_NDB_MAX_DEL_WIN
-};
-
-/* NdbOperation custom data which points out handler and record. */
-struct Ndb_exceptions_data {
-  struct st_ndbcluster_share *share;
-  const uchar* row;
-};
-
-typedef struct st_ndbcluster_conflict_fn_share {
-  enum_conflict_fn_type m_resolve_cft;
-
-  /* info about original table */
-  uint8 m_pk_cols;
-  uint8 m_resolve_column;
-  uint8 m_resolve_size;
-  uint8 unused;
-  uint16 m_offset[16];
-
-  const NdbDictionary::Table *m_ex_tab;
-  uint32 m_count;
-} NDB_CONFLICT_FN_SHARE;
-#endif
-
-/*
-  Stats that can be retrieved from ndb
-*/
-struct Ndb_statistics {
-  Uint64 row_count;
-  Uint64 commit_count;
-  ulong row_size;
-  Uint64 fragment_memory;
-  Uint64 fragment_extent_space; 
-  Uint64 fragment_extent_free_space;
-};
-
-typedef struct st_ndbcluster_share {
-  NDB_SHARE_STATE state;
-  MEM_ROOT mem_root;
-  THR_LOCK lock;
-  pthread_mutex_t mutex;
-  char *key;
-  uint key_length;
-  char *new_key;
-  uint use_count;
-  uint commit_count_lock;
-  ulonglong commit_count;
-  char *db;
-  char *table_name;
-  Ndb::TupleIdRange tuple_id_range;
-  struct Ndb_statistics stat;
-  bool util_thread; // if opened by util thread
-  uint32 connect_count;
-  uint32 flags;
-#ifdef HAVE_NDB_BINLOG
-  NDB_CONFLICT_FN_SHARE *m_cfn_share;
-#endif
-  Ndb_event_data *event_data; // Place holder before NdbEventOperation is created
-  NdbEventOperation *op;
-  char *old_names; // for rename table
-  MY_BITMAP *subscriber_bitmap;
-  NdbEventOperation *new_op;
-} NDB_SHARE;
-
-inline
-NDB_SHARE_STATE
-get_ndb_share_state(NDB_SHARE *share)
-{
-  NDB_SHARE_STATE state;
-  pthread_mutex_lock(&share->mutex);
-  state= share->state;
-  pthread_mutex_unlock(&share->mutex);
-  return state;
-}
-
-inline
-void
-set_ndb_share_state(NDB_SHARE *share, NDB_SHARE_STATE state)
-{
-  pthread_mutex_lock(&share->mutex);
-  share->state= state;
-  pthread_mutex_unlock(&share->mutex);
-}
+#include "ndb_share.h"
 
 struct Ndb_tuple_id_range_guard {
   Ndb_tuple_id_range_guard(NDB_SHARE* _share) :

=== added file 'sql/ndb_share.cc'
--- a/sql/ndb_share.cc	1970-01-01 00:00:00 +0000
+++ b/sql/ndb_share.cc	2011-03-08 09:04:24 +0000
@@ -0,0 +1,18 @@
+/*
+   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "ndb_share.h"

=== added file 'sql/ndb_share.h'
--- a/sql/ndb_share.h	1970-01-01 00:00:00 +0000
+++ b/sql/ndb_share.h	2011-03-08 09:13:39 +0000
@@ -0,0 +1,132 @@
+/*
+   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef NDB_SHARE_H
+#define NDB_SHARE_H
+
+#include <my_global.h>
+#include <my_alloc.h>        // MEM_ROOT
+#include <thr_lock.h>        // THR_LOCK
+#include <my_bitmap.h>       // MY_BITMAP
+
+#include <ndbapi/Ndb.hpp>    // Ndb::TupleIdRange
+
+
+enum NDB_SHARE_STATE {
+  NSS_INITIAL= 0,
+  NSS_DROPPED,
+  NSS_ALTERED 
+};
+
+
+#ifdef HAVE_NDB_BINLOG
+enum enum_conflict_fn_type
+{
+  CFT_NDB_UNDEF = 0
+  ,CFT_NDB_MAX
+  ,CFT_NDB_OLD
+  ,CFT_NDB_MAX_DEL_WIN
+};
+
+
+/* NdbOperation custom data which points out handler and record. */
+struct Ndb_exceptions_data {
+  struct NDB_SHARE* share;
+  const uchar* row;
+};
+
+
+struct NDB_CONFLICT_FN_SHARE {
+  enum_conflict_fn_type m_resolve_cft;
+
+  /* info about original table */
+  uint8 m_pk_cols;
+  uint8 m_resolve_column;
+  uint8 m_resolve_size;
+  uint8 unused;
+  uint16 m_offset[16];
+
+  const NdbDictionary::Table *m_ex_tab;
+  uint32 m_count;
+};
+#endif
+
+
+/*
+  Stats that can be retrieved from ndb
+*/
+struct Ndb_statistics {
+  Uint64 row_count;
+  Uint64 commit_count;
+  ulong row_size;
+  Uint64 fragment_memory;
+  Uint64 fragment_extent_space; 
+  Uint64 fragment_extent_free_space;
+};
+
+
+struct NDB_SHARE {
+  NDB_SHARE_STATE state;
+  MEM_ROOT mem_root;
+  THR_LOCK lock;
+  pthread_mutex_t mutex;
+  char *key;
+  uint key_length;
+  char *new_key;
+  uint use_count;
+  uint commit_count_lock;
+  ulonglong commit_count;
+  char *db;
+  char *table_name;
+  Ndb::TupleIdRange tuple_id_range;
+  struct Ndb_statistics stat;
+  bool util_thread; // if opened by util thread
+  uint32 connect_count;
+  uint32 flags;
+#ifdef HAVE_NDB_BINLOG
+  NDB_CONFLICT_FN_SHARE *m_cfn_share;
+#endif
+  class Ndb_event_data *event_data; // Place holder before NdbEventOperation is created
+  class NdbEventOperation *op;
+  char *old_names; // for rename table
+  MY_BITMAP *subscriber_bitmap;
+  class NdbEventOperation *new_op;
+};
+
+
+inline
+NDB_SHARE_STATE
+get_ndb_share_state(NDB_SHARE *share)
+{
+  NDB_SHARE_STATE state;
+  pthread_mutex_lock(&share->mutex);
+  state= share->state;
+  pthread_mutex_unlock(&share->mutex);
+  return state;
+}
+
+
+inline
+void
+set_ndb_share_state(NDB_SHARE *share, NDB_SHARE_STATE state)
+{
+  pthread_mutex_lock(&share->mutex);
+  share->state= state;
+  pthread_mutex_unlock(&share->mutex);
+}
+
+#endif

=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2011-02-09 11:12:05 +0000
+++ b/storage/ndb/CMakeLists.txt	2011-03-08 09:04:24 +0000
@@ -103,6 +103,7 @@ SET(NDBCLUSTER_SOURCES
   ../../sql/ha_ndbcluster_binlog.cc
   ../../sql/ha_ndbinfo.cc
   ../../sql/ndb_local_connection.cc
+  ../../sql/ndb_share.cc
 )
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include)
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster branch (magnus.blaudd:3219 to 3221) Magnus Blåudd8 Mar