Commit daaf51fb authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/mysqld.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
parents 96b2748a eceb0350

BUILD/compile-solaris-sparc

+5 −9
Original line number Diff line number Diff line 
#! /bin/sh



gmake -k clean || true

/bin/rm -f */.deps/*.P config.cache

 

#!/usr/bin/bash

path=`dirname $0`

. "$path/autorun.sh"



CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client

. "$path/SETUP.sh"

extra_flags=""

extra_configs="$max_configs"



gmake -j 4
 
. "$path/FINISH.sh"

BUILD/compile-solaris-sparc-debug

+5 −9
Original line number Diff line number Diff line 
#! /bin/sh



gmake -k clean || true

/bin/rm -f */.deps/*.P config.cache

 

#!/usr/bin/bash

path=`dirname $0`

. "$path/autorun.sh"

 

CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-debug

. "$path/SETUP.sh"

extra_flags="$debug_cflags"

extra_configs="$debug_configs $max_configs"



gmake -j 4
 
. "$path/FINISH.sh"

include/mysql/plugin.h

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ struct st_mysql_plugin 
  const char *name;     /* plugin name                                  */

  const char *author;   /* plugin author (for SHOW PLUGINS)             */

  const char *descr;    /* general descriptive text (for SHOW PLUGINS ) */

  int (*init)(void);    /* the function to invoke when plugin is loaded */

  int (*deinit)(void);  /* the function to invoke when plugin is unloaded */

  int (*init)(void *);  /* the function to invoke when plugin is loaded */

  int (*deinit)(void *);/* the function to invoke when plugin is unloaded */

  unsigned int version; /* plugin version (for SHOW PLUGINS)            */

  struct st_mysql_show_var *status_vars;

  void * __reserved1;   /* placeholder for system variables             */

sql/ha_ndbcluster.cc

+32 −29
Original line number Diff line number Diff line
@@ -74,13 +74,13 @@ static const int max_transactions= 3; // should really be 2 but there is a trans 


static uint ndbcluster_partition_flags();

static uint ndbcluster_alter_table_flags(uint flags);

static int ndbcluster_init(void);

static int ndbcluster_init(void *);

static int ndbcluster_end(ha_panic_function flag);

static bool ndbcluster_show_status(THD*,stat_print_fn *,enum ha_stat_type);

static int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info);

static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond);



handlerton ndbcluster_hton;

handlerton *ndbcluster_hton;



static handler *ndbcluster_create_handler(TABLE_SHARE *table,

                                          MEM_ROOT *mem_root)
@@ -4012,7 +4012,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) 
        thd_ndb->init_open_tables();

        thd_ndb->stmt= trans;

	thd_ndb->query_state&= NDB_QUERY_NORMAL;

        trans_register_ha(thd, FALSE, &ndbcluster_hton);

        trans_register_ha(thd, FALSE, ndbcluster_hton);

      } 

      else 

      {
@@ -4028,7 +4028,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) 
          thd_ndb->init_open_tables();

          thd_ndb->all= trans; 

	  thd_ndb->query_state&= NDB_QUERY_NORMAL;

          trans_register_ha(thd, TRUE, &ndbcluster_hton);

          trans_register_ha(thd, TRUE, ndbcluster_hton);



          /*

            If this is the start of a LOCK TABLE, a table look
@@ -4182,7 +4182,7 @@ int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type) 
      ERR_RETURN(ndb->getNdbError());

    no_uncommitted_rows_reset(thd);

    thd_ndb->stmt= trans;

    trans_register_ha(thd, FALSE, &ndbcluster_hton);

    trans_register_ha(thd, FALSE, ndbcluster_hton);

  }

  thd_ndb->query_state&= NDB_QUERY_NORMAL;

  m_active_trans= trans;
@@ -5551,7 +5551,7 @@ void ha_ndbcluster::get_auto_increment(ulonglong offset, ulonglong increment, 
                HA_HAS_RECORDS



ha_ndbcluster::ha_ndbcluster(TABLE_SHARE *table_arg):

  handler(&ndbcluster_hton, table_arg),

  handler(ndbcluster_hton, table_arg),

  m_active_trans(NULL),

  m_active_cursor(NULL),

  m_table(NULL),
@@ -6379,35 +6379,36 @@ static int connect_callback() 


extern int ndb_dictionary_is_mysqld;



static int ndbcluster_init()

static int ndbcluster_init(void *p)

{

  int res;

  DBUG_ENTER("ndbcluster_init");



  ndb_dictionary_is_mysqld= 1;



  {

    handlerton &h= ndbcluster_hton;

    h.state=            have_ndbcluster;

    h.db_type=          DB_TYPE_NDBCLUSTER;

    h.close_connection= ndbcluster_close_connection;

    h.commit=           ndbcluster_commit;

    h.rollback=         ndbcluster_rollback;

    h.create=           ndbcluster_create_handler; /* Create a new handler */

    h.drop_database=    ndbcluster_drop_database;  /* Drop a database */

    h.panic=            ndbcluster_end;            /* Panic call */

    h.show_status=      ndbcluster_show_status;    /* Show status */

    h.alter_tablespace= ndbcluster_alter_tablespace;    /* Show status */

    h.partition_flags=  ndbcluster_partition_flags; /* Partition flags */

    h.alter_table_flags=ndbcluster_alter_table_flags; /* Alter table flags */

    h.fill_files_table= ndbcluster_fill_files_table;

  ndbcluster_hton= (handlerton *)p;



  {

    handlerton *h= ndbcluster_hton;

    h->state=            have_ndbcluster;

    h->db_type=          DB_TYPE_NDBCLUSTER;

    h->close_connection= ndbcluster_close_connection;

    h->commit=           ndbcluster_commit;

    h->rollback=         ndbcluster_rollback;

    h->create=           ndbcluster_create_handler; /* Create a new handler */

    h->drop_database=    ndbcluster_drop_database;  /* Drop a database */

    h->panic=            ndbcluster_end;            /* Panic call */

    h->show_status=      ndbcluster_show_status;    /* Show status */

    h->alter_tablespace= ndbcluster_alter_tablespace;    /* Show status */

    h->partition_flags=  ndbcluster_partition_flags; /* Partition flags */

    h->alter_table_flags=ndbcluster_alter_table_flags; /* Alter table flags */

    h->fill_files_table= ndbcluster_fill_files_table;

#ifdef HAVE_NDB_BINLOG

    ndbcluster_binlog_init_handlerton();

#endif

    h.flags=            HTON_CAN_RECREATE | HTON_TEMPORARY_NOT_SUPPORTED;

    h.discover=         ndbcluster_discover;

    h.find_files= ndbcluster_find_files;

    h.table_exists_in_engine= ndbcluster_table_exists_in_engine;

    h->flags=            HTON_CAN_RECREATE | HTON_TEMPORARY_NOT_SUPPORTED;

    h->discover=         ndbcluster_discover;

    h->find_files= ndbcluster_find_files;

    h->table_exists_in_engine= ndbcluster_table_exists_in_engine;

  }



  if (have_ndbcluster != SHOW_OPTION_YES)
@@ -6516,6 +6517,8 @@ static int ndbcluster_init() 
    delete g_ndb_cluster_connection;

  g_ndb_cluster_connection= NULL;

  have_ndbcluster= SHOW_OPTION_DISABLED;	// If we couldn't use handler

  ndbcluster_hton->state= SHOW_OPTION_DISABLED;               // If we couldn't use handler



  DBUG_RETURN(TRUE);

}
@@ -8120,7 +8123,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) 
    Wait for cluster to start

  */

  pthread_mutex_lock(&LOCK_ndb_util_thread);

  while (!ndb_cluster_node_id && (ndbcluster_hton.slot != ~(uint)0))

  while (!ndb_cluster_node_id && (ndbcluster_hton->slot != ~(uint)0))

  {

    /* ndb not connected yet */

    set_timespec(abstime, 1);
@@ -10611,7 +10614,7 @@ SHOW_VAR ndb_status_variables_export[]= { 
};



struct st_mysql_storage_engine ndbcluster_storage_engine=

{ MYSQL_HANDLERTON_INTERFACE_VERSION, &ndbcluster_hton };

{ MYSQL_HANDLERTON_INTERFACE_VERSION, ndbcluster_hton };



mysql_declare_plugin(ndbcluster)

{

sql/ha_ndbcluster_binlog.cc

+4 −4
Original line number Diff line number Diff line
@@ -662,9 +662,9 @@ static int ndbcluster_binlog_func(THD *thd, enum_binlog_func fn, void *arg) 


void ndbcluster_binlog_init_handlerton()

{

  handlerton &h= ndbcluster_hton;

  h.binlog_func=      ndbcluster_binlog_func;

  h.binlog_log_query= ndbcluster_binlog_log_query;

  handlerton *h= ndbcluster_hton;

  h->binlog_func=      ndbcluster_binlog_func;

  h->binlog_log_query= ndbcluster_binlog_log_query;

}
@@ -3431,7 +3431,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 


    if (thd_ndb == NULL)

    {

      DBUG_ASSERT(ndbcluster_hton.slot != ~(uint)0);

      DBUG_ASSERT(ndbcluster_hton->slot != ~(uint)0);

      if (!(thd_ndb= ha_ndbcluster::seize_thd_ndb()))

      {

        sql_print_error("Could not allocate Thd_ndb object");