Commit d679b903 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1 

into  mysql.com:/home/mydev/mysql-5.1-wl1563
parents d9e3f538 5872e5ae

mysql-test/t/ndb_dd_ddl.test

+10 −10
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ INITIAL_SIZE 16M 
UNDO_BUFFER_SIZE = 1M

ENGINE=NDB;



--error 1502

--error ER_CREATE_TABLESPACE_FAILED

CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M
@@ -32,7 +32,7 @@ ALTER LOGFILE GROUP lg1 
ADD UNDOFILE 'undofile02.dat'

INITIAL_SIZE 4M ENGINE NDB;



--error 1507

--error ER_ALTER_TABLESPACE_FAILED

ALTER LOGFILE GROUP lg1

ADD UNDOFILE 'undofile02.dat'

INITIAL_SIZE 4M ENGINE=NDB;
@@ -43,20 +43,20 @@ USE LOGFILE GROUP lg1 
INITIAL_SIZE 12M

ENGINE NDB;



--error 1502 # Bug 16158

--error ER_CREATE_TABLESPACE_FAILED

CREATE TABLESPACE ts1

ADD DATAFILE 'datafile.dat'

USE LOGFILE GROUP lg1

INITIAL_SIZE 12M

ENGINE NDB;



# Currently a bug, bug#16158



ALTER TABLESPACE ts1

ADD DATAFILE 'datafile2.dat'

INITIAL_SIZE 12M

ENGINE=NDB;



--error 1507 # Currently a bug, bug#16158

--error ER_ALTER_TABLESPACE_FAILED

ALTER TABLESPACE ts1

ADD DATAFILE 'datafile2.dat'

INITIAL_SIZE 12M
@@ -67,7 +67,7 @@ CREATE TABLE t1 
tablespace ts1 storage disk

engine ndb;



--error 1050

--error ER_TABLE_EXISTS_ERROR

CREATE TABLE t1

(pk1 int not null primary key, b int not null, c int not null)

tablespace ts1 storage disk
@@ -79,7 +79,7 @@ ALTER TABLESPACE ts1 
DROP DATAFILE 'datafile2.dat' 

ENGINE=NDB;



--error 1507

--error ER_ALTER_TABLESPACE_FAILED

ALTER TABLESPACE ts1

DROP DATAFILE 'datafile2.dat' 

ENGINE=NDB;
@@ -88,7 +88,7 @@ ALTER TABLESPACE ts1 
DROP DATAFILE 'datafile.dat' 

ENGINE=NDB;



--error 1507

--error ER_ALTER_TABLESPACE_FAILED

ALTER TABLESPACE ts1

DROP DATAFILE 'datafile.dat' 

ENGINE=NDB;
@@ -96,14 +96,14 @@ ENGINE=NDB; 
DROP TABLESPACE ts1 

ENGINE=NDB;



--error 1503

--error ER_DROP_TABLESPACE_FAILED

DROP TABLESPACE ts1 

ENGINE=NDB;



DROP LOGFILE GROUP lg1 

ENGINE=NDB;



--error 1503

--error ER_DROP_TABLESPACE_FAILED

DROP LOGFILE GROUP lg1 

ENGINE=NDB;

--echo **** End Duplicate Statement Testing ****

sql/event_executor.cc

+9 −2
Original line number Diff line number Diff line
@@ -184,6 +184,13 @@ event_executor_main(void *arg) 
  // needs to call my_thread_init(), otherwise we get a coredump in DBUG_ stuff

  my_thread_init();



  if (sizeof(my_time_t) != sizeof(time_t))

  {

    sql_print_error("sizeof(my_time_t) != sizeof(time_t) ."

                    "The scheduler will not work correctly. Stopping.");

    goto err_no_thd;

  }

  

  //TODO Andrey: Check for NULL

  if (!(thd = new THD)) // note that contructor of THD uses DBUG_ !

  {
@@ -275,7 +282,7 @@ event_executor_main(void *arg) 
      }

        

      DBUG_PRINT("evex main thread",("computing time to sleep till next exec"));

      time(&now);

      time((time_t *)&now);

      my_tz_UTC->gmt_sec_to_TIME(&time_now, now);

      t2sleep= evex_time_diff(&et->execute_at, &time_now);

      VOID(pthread_mutex_unlock(&LOCK_event_arrays));

sql/event_timed.cc

+2 −2
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ event_timed::compute_next_execution_time() 
    }

    goto ret;

  }

  time(&now);

  time((time_t *)&now);

  my_tz_UTC->gmt_sec_to_TIME(&time_now, now);

/*

  sql_print_information("[%s.%s]", dbname.str, name.str);
@@ -703,7 +703,7 @@ event_timed::mark_last_executed() 
  TIME time_now;

  my_time_t now;



  time(&now);

  time((time_t *)&now);

  my_tz_UTC->gmt_sec_to_TIME(&time_now, now);



  last_executed= time_now; // was execute_at

storage/ndb/include/ndbapi/NdbDictionary.hpp

+2 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,8 @@ public: 
      _TE_CREATE=6,

      _TE_GCP_COMPLETE=7,

      _TE_CLUSTER_FAILURE=8,

      _TE_STOP=9

      _TE_STOP=9,

      _TE_NUL=10 // internal (INS o DEL within same GCI)

    };

#endif

    /**

storage/ndb/include/ndbapi/NdbEventOperation.hpp

+6 −0
Original line number Diff line number Diff line
@@ -93,6 +93,12 @@ public: 
   * Retrieve current state of the NdbEventOperation object

   */

  State getState();

  /**

   * By default events on same NdbEventOperation within same GCI

   * are merged into a single event.  This can be changed with

   * separateEvents(true).

   */

  void separateEvents(bool flag);



  /**

   * Activates the NdbEventOperation to start receiving events. The