List:Commits« Previous MessageNext Message »
From:tomas Date:January 5 2006 2:47pm
Subject:bk commit into 5.1 tree (tomas:1.2041)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2041 06/01/05 15:47:44 tomas@stripped +4 -0
  merge

  sql/ha_ndbcluster_binlog.cc
    1.3 06/01/05 15:47:36 tomas@stripped +2 -0
    merge

  sql/ha_ndbcluster.cc
    1.231 06/01/05 15:47:36 tomas@stripped +10 -9
    merge

  mysql-test/t/disabled.def
    1.31 06/01/05 15:47:35 tomas@stripped +3 -1
    merge

  mysql-test/r/ndb_multi.result
    1.9 06/01/05 15:47:35 tomas@stripped +2 -2
    merge

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-v6

--- 1.30/mysql-test/t/disabled.def	2006-01-04 14:00:29 +01:00
+++ 1.31/mysql-test/t/disabled.def	2006-01-05 15:47:35 +01:00
@@ -25,4 +25,6 @@
 ps_7ndb         : Bug#15923 Core dump in RBR mode when executing test suite
 #sp_trans        : Bug#15924 Code dump in RBR mode when executing test suite
 mysqlslap       : Bug#16167
-
+ndb_autodiscover : TBF with CR
+ndb_autodiscover2 : TBF with CR
+ndb_rpl_basic   : Results are not deterministic, Tomas will fix

--- 1.230/sql/ha_ndbcluster.cc	2006-01-05 14:48:58 +01:00
+++ 1.231/sql/ha_ndbcluster.cc	2006-01-05 15:47:36 +01:00
@@ -56,6 +56,8 @@
 static int ndbcluster_end(ha_panic_function flag);
 static bool ndbcluster_show_status(THD*,stat_print_fn *,enum ha_stat_type);
 
+#define IS_TMP_PREFIX(A) (is_prefix(A, tmp_file_prefix) || is_prefix(A, "@0023sql"))
+
 handlerton ndbcluster_hton = {
   MYSQL_HANDLERTON_INTERFACE_VERSION,
   "ndbcluster",
@@ -3922,7 +3924,7 @@
 #ifdef HAVE_NDB_BINLOG
     ndbcluster_create_binlog_setup(get_ndb(), name2, m_dbname, m_tabname,
                                    ndb_binlog_thread_running > 0 &&
-                                   !is_prefix(m_tabname, tmp_file_prefix),
+                                   !IS_TMP_PREFIX(m_tabname),
                                    0, TRUE);
 #endif /* HAVE_NDB_BINLOG */
     DBUG_RETURN(my_errno);
@@ -4096,7 +4098,7 @@
     }
     pthread_mutex_unlock(&ndbcluster_mutex);
 
-    while (!is_prefix(m_tabname, tmp_file_prefix))
+    while (!IS_TMP_PREFIX(m_tabname))
     {
       const NDBTAB *t= dict->getTable(m_tabname);
       String event_name(INJECTOR_EVENT_LEN);
@@ -4276,7 +4278,7 @@
     dict->forceGCPWait();
 
   /* handle old table */
-  if (!is_prefix(m_tabname, tmp_file_prefix))
+  if (!IS_TMP_PREFIX(m_tabname))
   {
     is_old_table_tmpfile= 0;
     String event_name(INJECTOR_EVENT_LEN);
@@ -4284,7 +4286,7 @@
     ndbcluster_handle_drop_table(ndb, event_name.c_ptr(), share);
   }
 
-  if (!result && !is_prefix(new_tabname, tmp_file_prefix))
+  if (!result && !IS_TMP_PREFIX(new_tabname))
   {
     /* always create an event for the table */
     String event_name(INJECTOR_EVENT_LEN);
@@ -4425,7 +4427,7 @@
   */
   int table_dropped= dict->getNdbError().code != 709;
 
-  if (!is_prefix(table_name, tmp_file_prefix) && share)
+  if (!IS_TMP_PREFIX(table_name) && share)
   {
     ndbcluster_log_schema_op(current_thd, share,
                              current_thd->query, current_thd->query_length,
@@ -4437,7 +4439,7 @@
                                                    will do a force GCP */
     dict->forceGCPWait();
 
-  if (!is_prefix(table_name, tmp_file_prefix))
+  if (!IS_TMP_PREFIX(table_name))
   {
     String event_name(INJECTOR_EVENT_LEN);
     ndb_rep_event_name(&event_name, path + sizeof(share_prefix) - 1, 0);
@@ -5061,8 +5063,7 @@
           pthread_mutex_lock(&LOCK_open);
           ndbcluster_create_binlog_setup(ndb, key, elmt.database, elmt.name,
                                          ndb_binlog_thread_running > 0 &&
-                                         !is_prefix(elmt.name,
-                                                    tmp_file_prefix),
+                                         !IS_TMP_PREFIX(elmt.name),
                                          share, TRUE);
           pthread_mutex_unlock(&LOCK_open);
         }
@@ -5202,7 +5203,7 @@
         pthread_mutex_unlock(&ndbcluster_mutex);
         pthread_mutex_lock(&LOCK_open);
         ndbcluster_create_binlog_setup(ndb, name, db, file_name,
-                                       !is_prefix(file_name, tmp_file_prefix),
+                                       !IS_TMP_PREFIX(file_name),
                                        share, TRUE);
         pthread_mutex_unlock(&LOCK_open);
         pthread_mutex_lock(&ndbcluster_mutex);

--- 1.8/mysql-test/r/ndb_multi.result	2006-01-05 12:01:56 +01:00
+++ 1.9/mysql-test/r/ndb_multi.result	2006-01-05 15:47:35 +01:00
@@ -52,13 +52,13 @@
 1	Hi!	89	Longtext column
 show status like 'handler_discover%';
 Variable_name	Value
-Handler_discover	0
+Handler_discover	1
 show tables like 't4';
 Tables_in_test (t4)
 t4
 show status like 'handler_discover%';
 Variable_name	Value
-Handler_discover	0
+Handler_discover	2
 show tables;
 Tables_in_test
 t1

--- 1.2/sql/ha_ndbcluster_binlog.cc	2006-01-05 14:48:58 +01:00
+++ 1.3/sql/ha_ndbcluster_binlog.cc	2006-01-05 15:47:36 +01:00
@@ -806,6 +806,7 @@
                              enum SCHEMA_OP_TYPE type)
 {
   DBUG_ENTER("ndbcluster_log_schema_op");
+#ifdef NOT_YET
   Thd_ndb *thd_ndb= get_thd_ndb(thd);
   if (!thd_ndb)
   {
@@ -1046,6 +1047,7 @@
     }
     (void) pthread_mutex_unlock(&share->mutex);
   }
+#endif
   DBUG_RETURN(0);
 }
 
Thread
bk commit into 5.1 tree (tomas:1.2041)tomas5 Jan