MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Martin Skold Date:May 31 2006 1:26pm
Subject:bk commit into 5.1 tree (mskold:1.2180)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2180 06/05/31 15:26:39 mskold@stripped +3 -0
  Merge mskold@stripped:/home/bk/mysql-5.1-new-ndb
  into  mysql.com:/home/marty/MySQL/mysql-5.1-new

  sql/ha_ndbcluster.cc
    1.312 06/05/31 15:26:32 mskold@stripped +1 -1
    Merge

  mysql-test/t/disabled.def
    1.160 06/05/31 15:22:04 mskold@stripped +0 -0
    Auto merged

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.137 06/05/31 15:22:04 mskold@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/home/marty/MySQL/mysql-5.1-new/RESYNC

--- 1.159/mysql-test/t/disabled.def	2006-05-30 23:21:04 +02:00
+++ 1.160/mysql-test/t/disabled.def	2006-05-31 15:22:04 +02:00
@@ -28,7 +28,7 @@
 rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD
 rpl_ndb_ddl              : BUG#18946 result file needs update + test needs to checked
 rpl_ndb_innodb2ndb       : Bug #19710  	Cluster replication to partition table fails on DELETE FROM statement
-rpl_ndb_log              : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create table and insert (on different table) not determ
+#rpl_ndb_log              : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create table and insert (on different table) not determ
 rpl_ndb_myisam2ndb       : Bug #19710  	Cluster replication to partition table fails on DELETE FROM statement
 rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian
 rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly

--- 1.136/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-05-31 15:12:36 +02:00
+++ 1.137/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-05-31 15:22:04 +02:00
@@ -56,7 +56,6 @@
    DBUG_RETURN(b);\
 }
 
-extern Uint64 g_latest_trans_gci;
 int ndb_dictionary_is_mysqld = 0;
 
 bool
@@ -4235,7 +4234,6 @@
 {
   const WaitGCPConf * const conf=
     CAST_CONSTPTR(WaitGCPConf, signal->getDataPtr());
-  g_latest_trans_gci= conf->gcp;
   m_waiter.signal(NO_WAIT);
 }
 

--- 1.311/sql/ha_ndbcluster.cc	2006-05-31 15:12:36 +02:00
+++ 1.312/sql/ha_ndbcluster.cc	2006-05-31 15:26:32 +02:00
@@ -4661,7 +4661,7 @@
                                share->db, share->table_name,
                                m_table->getObjectId(),
                                m_table->getObjectVersion(),
-                               SOT_CREATE_TABLE);
+                               SOT_CREATE_TABLE, 0, 0, 1);
       break;
     }
   }
@@ -5052,7 +5052,7 @@
                                old_dbname, m_tabname,
                                ndb_table_id, ndb_table_version,
                                SOT_RENAME_TABLE,
-                               m_dbname, new_tabname);
+                               m_dbname, new_tabname, 1);
   }
 
   // If we are moving tables between databases, we need to recreate
@@ -5101,6 +5101,7 @@
                             const char *db,
                             const char *table_name)
 {
+  THD *thd= current_thd;
   DBUG_ENTER("ha_ndbcluster::ndbcluster_delete_table");
   NDBDICT *dict= ndb->getDictionary();
 #ifdef HAVE_NDB_BINLOG
@@ -5132,7 +5133,7 @@
       ndb_table_version= h->m_table->getObjectVersion();
     }
 #endif
-    h->release_metadata(current_thd, ndb);
+    h->release_metadata(thd, ndb);
   }
   else
   {
@@ -5198,11 +5199,11 @@
 
   if (!IS_TMP_PREFIX(table_name) && share)
   {
-    ndbcluster_log_schema_op(current_thd, share,
-                             current_thd->query, current_thd->query_length,
+    ndbcluster_log_schema_op(thd, share,
+                             thd->query, thd->query_length,
                              share->db, share->table_name,
                              ndb_table_id, ndb_table_version,
-                             SOT_DROP_TABLE);
+                             SOT_DROP_TABLE, 0, 0, 1);
   }
   else if (table_dropped && share && share->op) /* ndbcluster_log_schema_op
                                                    will do a force GCP */
@@ -5781,6 +5782,7 @@
 
 static void ndbcluster_drop_database(char *path)
 {
+  THD *thd= current_thd;
   DBUG_ENTER("ndbcluster_drop_database");
 #ifdef HAVE_NDB_BINLOG
   /*
@@ -5798,9 +5800,9 @@
 #ifdef HAVE_NDB_BINLOG
   char db[FN_REFLEN];
   ha_ndbcluster::set_dbname(path, db);
-  ndbcluster_log_schema_op(current_thd, 0,
-                           current_thd->query, current_thd->query_length,
-                           db, "", 0, 0, SOT_DROP_DB);
+  ndbcluster_log_schema_op(thd, 0,
+                           thd->query, thd->query_length,
+                           db, "", 0, 0, SOT_DROP_DB, 0, 0, 0);
 #endif
   DBUG_VOID_RETURN;
 }
@@ -6875,6 +6877,7 @@
 */
 int handle_trailing_share(NDB_SHARE *share)
 {
+  THD *thd= current_thd;
   static ulong trailing_share_id= 0;
   DBUG_ENTER("handle_trailing_share");
 
@@ -6885,7 +6888,7 @@
   bzero((char*) &table_list,sizeof(table_list));
   table_list.db= share->db;
   table_list.alias= table_list.table_name= share->table_name;
-  close_cached_tables(current_thd, 0, &table_list, TRUE);
+  close_cached_tables(thd, 0, &table_list, TRUE);
 
   pthread_mutex_lock(&ndbcluster_mutex);
   if (!--share->use_count)
@@ -9989,13 +9992,13 @@
                              thd->query, thd->query_length,
                              "", info->tablespace_name,
                              0, 0,
-                             SOT_TABLESPACE);
+                             SOT_TABLESPACE, 0, 0, 0);
   else
     ndbcluster_log_schema_op(thd, 0,
                              thd->query, thd->query_length,
                              "", info->logfile_group_name,
                              0, 0,
-                             SOT_LOGFILE_GROUP);
+                             SOT_LOGFILE_GROUP, 0, 0, 0);
 #endif
   DBUG_RETURN(FALSE);
 
Thread
bk commit into 5.1 tree (mskold:1.2180)Martin Skold31 May