MySQL Lists: commits: bk commit into 5.1 tree (tomas:1.2513)

List:	Commits	« Previous Message Next Message »
From:	tomas	Date:	May 30 2007 1:49pm
Subject:	bk commit into 5.1 tree (tomas:1.2513)
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@stripped, 2007-05-30 13:48:53+02:00, tomas@stripped +21 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
  into  whalegate.ndb.mysql.com:/home/tomas/telco-6.2
  MERGE: 1.2506.1.16

  mysql-test/r/ndb_basic.result@stripped, 2007-05-30 13:48:47+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.54.1.1

  mysql-test/t/disabled.def@stripped, 2007-05-30 13:48:47+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.243.1.11

  mysql-test/t/ndb_basic.test@stripped, 2007-05-30 13:48:47+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.54.1.2

  sql/ha_ndbcluster.cc@stripped, 2007-05-30 13:48:47+02:00, tomas@stripped +0
-0
    Auto merged
    MERGE: 1.408.1.47

  storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile@stripped, 2007-05-30 13:48:47+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.1.1.3

  storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp@stripped, 2007-05-30 13:48:47+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.1.1.4

  storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp@stripped, 2007-05-30 13:48:47+02:00,
tomas@stripped +0 -0
    Merge rename: storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp ->
storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@stripped, 2007-05-30 13:48:47+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.33.1.6

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2007-05-30 13:48:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.112.1.23

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-05-30 13:48:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.96.1.27

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@stripped, 2007-05-30 13:48:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.58.1.9

  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@stripped, 2007-05-30 13:48:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.23.1.4

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-05-30 13:48:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.129.1.29

  storage/ndb/src/kernel/blocks/dblqh/Makefile.am@stripped, 2007-05-30 13:48:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.9.2.1

  storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp@stripped, 2007-05-30
13:48:48+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.9.2.1

  storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp@stripped, 2007-05-30
13:48:47+02:00, tomas@stripped +0 -0
    Merge rename: storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
-> storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@stripped, 2007-05-30 13:48:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.22.1.4

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@stripped, 2007-05-30 13:48:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.41.1.15

  storage/ndb/src/kernel/blocks/pgman.cpp@stripped, 2007-05-30 13:48:47+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.20.1.4

  storage/ndb/src/kernel/vm/WatchDog.cpp@stripped, 2007-05-30 13:48:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.6.1.3

  storage/ndb/test/include/NdbRestarter.hpp@stripped, 2007-05-30 13:48:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.11.1.5

  storage/ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2007-05-30 13:48:49+02:00,
tomas@stripped +0 -3
    Auto merged
    MERGE: 1.36.1.21

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-05-30 13:48:49+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.61.1.30

# 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:	whalegate.ndb.mysql.com
# Root:	/home/tomas/telco-6.2/RESYNC

--- 1.55/mysql-test/r/ndb_basic.result	2007-05-08 18:45:36 +02:00
+++ 1.56/mysql-test/r/ndb_basic.result	2007-05-30 13:48:47 +02:00
@@ -770,35 +770,6 @@
 d	ab	ab
 e	abc	abc
 DROP TABLE t1;
-End of 5.0 tests
-CREATE TABLE t1 (a VARCHAR(255) NOT NULL,
-CONSTRAINT pk_a PRIMARY KEY (a))engine=ndb;
-CREATE TABLE t2(a VARCHAR(255) NOT NULL,
-b VARCHAR(255) NOT NULL,
-c VARCHAR(255) NOT NULL,
-CONSTRAINT pk_b_c_id PRIMARY KEY (b,c),
-CONSTRAINT fk_a FOREIGN KEY(a) REFERENCES t1(a))engine=ndb;
-drop table t1, t2;
-create table t1 (a int not null primary key, b int) engine=ndb;
-insert into t1 values(1,1),(2,2),(3,3);
-create table t2 like t1;
-insert into t2 select * from t1;
-select * from t1 order by a;
-a	b
-1	1
-2	2
-3	3
-select * from t2 order by a;
-a	b
-1	1
-2	2
-3	3
-drop table t1, t2;
-create table t1 (a int not null primary key, b int not null default 0, c varchar(254))
engine=ndb;
-create table if not exists t1 (a int not null primary key, b int not null default 0, c
varchar(254)) engine=ndb;
-create table t2 like t1;
-rename table t1 to t10, t2 to t20;
-drop table t10,t20;
 create table t1 (a int not null primary key, b int not null) engine=ndb;
 create table t2 (a int not null primary key, b int not null) engine=ndb;
 insert into t1 values (1,10), (2,20), (3,30);
@@ -867,7 +838,36 @@
 a	b
 1	10
 2	10
-3	1
+3	30
 4	1
 drop table t1,t2;
+End of 5.0 tests
+CREATE TABLE t1 (a VARCHAR(255) NOT NULL,
+CONSTRAINT pk_a PRIMARY KEY (a))engine=ndb;
+CREATE TABLE t2(a VARCHAR(255) NOT NULL,
+b VARCHAR(255) NOT NULL,
+c VARCHAR(255) NOT NULL,
+CONSTRAINT pk_b_c_id PRIMARY KEY (b,c),
+CONSTRAINT fk_a FOREIGN KEY(a) REFERENCES t1(a))engine=ndb;
+drop table t1, t2;
+create table t1 (a int not null primary key, b int) engine=ndb;
+insert into t1 values(1,1),(2,2),(3,3);
+create table t2 like t1;
+insert into t2 select * from t1;
+select * from t1 order by a;
+a	b
+1	1
+2	2
+3	3
+select * from t2 order by a;
+a	b
+1	1
+2	2
+3	3
+drop table t1, t2;
+create table t1 (a int not null primary key, b int not null default 0, c varchar(254))
engine=ndb;
+create table if not exists t1 (a int not null primary key, b int not null default 0, c
varchar(254)) engine=ndb;
+create table t2 like t1;
+rename table t1 to t10, t2 to t20;
+drop table t10,t20;
 End of 5.1 tests

--- 1.55/mysql-test/t/ndb_basic.test	2007-05-08 18:45:36 +02:00
+++ 1.56/mysql-test/t/ndb_basic.test	2007-05-30 13:48:47 +02:00
@@ -752,46 +752,6 @@
 SELECT * FROM t1 ORDER BY a;
 DROP TABLE t1;
 
-# End of 5.0 tests
---echo End of 5.0 tests
-
-
-#
-# Bug #18483 Cannot create table with FK constraint
-# ndb does not support foreign key constraint, it is silently ignored
-# in line with other storage engines
-#
-CREATE TABLE t1 (a VARCHAR(255) NOT NULL,
-                 CONSTRAINT pk_a PRIMARY KEY (a))engine=ndb;
-CREATE TABLE t2(a VARCHAR(255) NOT NULL,
-                b VARCHAR(255) NOT NULL,
-                c VARCHAR(255) NOT NULL,
-                CONSTRAINT pk_b_c_id PRIMARY KEY (b,c),
-                CONSTRAINT fk_a FOREIGN KEY(a) REFERENCES t1(a))engine=ndb;
-drop table t1, t2;
-
-# bug#24301
-create table t1 (a int not null primary key, b int) engine=ndb;
-insert into t1 values(1,1),(2,2),(3,3);
-create table t2 like t1;
-insert into t2 select * from t1;
-select * from t1 order by a;
-select * from t2 order by a;
-drop table t1, t2;
-
-# create table if not exists
---disable_warnings
-create table t1 (a int not null primary key, b int not null default 0, c varchar(254))
engine=ndb;
-create table if not exists t1 (a int not null primary key, b int not null default 0, c
varchar(254)) engine=ndb;
---enable_warnings
-
-# create like
-create table t2 like t1;
-
-# multi rename
-rename table t1 to t10, t2 to t20;
-drop table t10,t20;
-
 # delete
 create table t1 (a int not null primary key, b int not null) engine=ndb;
 create table t2 (a int not null primary key, b int not null) engine=ndb;
@@ -831,5 +791,45 @@
 update ignore t1,t2 set a = 1, c = 1 where a = 3 and c = 3;
 select * from t1 order by a;
 drop table t1,t2;
+
+# End of 5.0 tests
+--echo End of 5.0 tests
+
+
+#
+# Bug #18483 Cannot create table with FK constraint
+# ndb does not support foreign key constraint, it is silently ignored
+# in line with other storage engines
+#
+CREATE TABLE t1 (a VARCHAR(255) NOT NULL,
+                 CONSTRAINT pk_a PRIMARY KEY (a))engine=ndb;
+CREATE TABLE t2(a VARCHAR(255) NOT NULL,
+                b VARCHAR(255) NOT NULL,
+                c VARCHAR(255) NOT NULL,
+                CONSTRAINT pk_b_c_id PRIMARY KEY (b,c),
+                CONSTRAINT fk_a FOREIGN KEY(a) REFERENCES t1(a))engine=ndb;
+drop table t1, t2;
+
+# bug#24301
+create table t1 (a int not null primary key, b int) engine=ndb;
+insert into t1 values(1,1),(2,2),(3,3);
+create table t2 like t1;
+insert into t2 select * from t1;
+select * from t1 order by a;
+select * from t2 order by a;
+drop table t1, t2;
+
+# create table if not exists
+--disable_warnings
+create table t1 (a int not null primary key, b int not null default 0, c varchar(254))
engine=ndb;
+create table if not exists t1 (a int not null primary key, b int not null default 0, c
varchar(254)) engine=ndb;
+--enable_warnings
+
+# create like
+create table t2 like t1;
+
+# multi rename
+rename table t1 to t10, t2 to t20;
+drop table t10,t20;
 
 --echo End of 5.1 tests

--- 1.136/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2007-05-15 14:51:08 +02:00
+++ 1.137/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2007-05-30 13:48:48 +02:00
@@ -700,6 +700,9 @@
   case FsConnectRecord::OPEN_READ_SCHEMA2:
     openSchemaFile(signal, 1, fsPtr.i, false, false);
     break;
+  case FsConnectRecord::OPEN_READ_TAB_FILE2:
+    openTableFile(signal, 1, fsPtr.i, c_readTableRecord.tableId, false);
+    break;
   default:
     jamLine((fsPtr.p->fsState & 0xFFF));
     ndbrequire(false);
@@ -1075,8 +1078,11 @@
 void Dbdict::readTableRef(Signal* signal,
                           FsConnectRecordPtr fsPtr)
 {
+  /**
+   * First close corrupt file
+   */
   fsPtr.p->fsState = FsConnectRecord::OPEN_READ_TAB_FILE2;
-  openTableFile(signal, 1, fsPtr.i, c_readTableRecord.tableId, false);
+  closeFile(signal, fsPtr.p->filePtr, fsPtr.i);
   return;
 }//Dbdict::readTableRef()
 

--- 1.172/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-05-29 07:25:56 +02:00
+++ 1.173/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-05-30 13:48:48 +02:00
@@ -8009,11 +8009,6 @@
     return;
   }
 
-  /* maximum number of log file operations */
-  clfoFileSize = clogPageFileSize;
-  if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
-    clfoFileSize = ZLFO_MIN_FILE_SIZE;
-
   // Update timer on tcConnectRecord
   tcConnectptr.p->tcTimer = cLqhTimeOutCount;
   init_acc_ptr_list(scanptr.p);

--- 1.11/storage/ndb/src/kernel/vm/WatchDog.cpp	2007-03-02 11:52:08 +01:00
+++ 1.12/storage/ndb/src/kernel/vm/WatchDog.cpp	2007-05-30 13:48:48 +02:00
@@ -16,6 +16,7 @@
 
 #include <ndb_global.h>
 #include <my_pthread.h>
+#include <sys/times.h>
 
 #include "WatchDog.hpp"
 #include "GlobalData.hpp"
@@ -129,6 +130,13 @@
         break;
       }//switch
       g_eventLogger.warning("Ndb kernel is stuck in: %s", last_stuck_action);
+      {
+        struct tms my_tms;
+        times(&my_tms);
+        g_eventLogger.info("User time: %llu  System time: %llu",
+                           (Uint64)my_tms.tms_utime,
+                           (Uint64)my_tms.tms_stime);
+      }
       if(alerts == 3){
 	shutdownSystem(last_stuck_action);
       }

--- 1.471/sql/ha_ndbcluster.cc	2007-05-23 08:08:56 +02:00
+++ 1.472/sql/ha_ndbcluster.cc	2007-05-30 13:48:47 +02:00
@@ -3524,7 +3524,8 @@
    * If IGNORE the ignore constraint violations on primary and unique keys,
    * but check that it is not part of INSERT ... ON DUPLICATE KEY UPDATE
    */
-  if (m_ignore_dup_key && thd->lex->sql_command == SQLCOM_UPDATE)
+  if (m_ignore_dup_key && (thd->lex->sql_command == SQLCOM_UPDATE ||
+                           thd->lex->sql_command == SQLCOM_UPDATE_MULTI))
   {
     int peek_res= peek_indexed_rows(new_data, pk_update);
     

--- 1.4/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile	2007-01-06 01:21:21 +01:00
+++ 1.5/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile	2007-05-30 13:48:47 +02:00
@@ -1,6 +1,6 @@
 TARGET = mgmapi_logevent2
-SRCS = $(TARGET).cpp
-OBJS = $(TARGET).o
+SRCS = main.cpp
+OBJS = main.o
 CXX = g++
 CFLAGS = -c -Wall -fno-rtti -fno-exceptions
 CXXFLAGS = 
@@ -17,7 +17,7 @@
 $(TARGET): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys
-lmystrings -lz $(SYS_LIB) -o $(TARGET)
 
-$(TARGET).o: $(SRCS)
+$(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi 
-I$(INCLUDE_DIR)/ndbapi $(SRCS)
 
 clean:

--- 1.11/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2007-02-22 15:49:31 +01:00
+++ 1.12/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2007-05-30 13:48:48 +02:00
@@ -16,7 +16,7 @@
 bin_PROGRAMS = ndbd_redo_log_reader
 
 ndbd_redo_log_reader_SOURCES = redoLogReader/records.cpp \
-  redoLogReader/redoLogFileReader.cpp
+  redoLogReader/reader.cpp
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
Thread
• bk commit into 5.1 tree (tomas:1.2513)	tomas	30 May