List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:April 17 2013 5:56pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:5108 to 5109)
View as plain text  
 5109 magnus.blaudd@stripped	2013-04-17 [merge]
      Merge

    modified:
      mysql-test/suite/ndb/include/ndb_desc_print.inc
      mysql-test/suite/ndb/r/ndb_backup_rate.result
      mysql-test/suite/ndb/t/ndb_backup_rate.test
      mysql-test/suite/ndb/t/ndb_native_default_support.test
      storage/ndb/test/src/NDBT_ReturnCodes.cpp
 5108 Mauritz Sundell	2013-04-11
      ndb - log exit message matching message id if no message passed to handleError/progError
       
      Bug #16614114 IMPROVE OUTPUT ON ERROR NDBCNTR (LINE: 793) 0X00000000
      
      For the specific case in the bug the logged message is changed from
       INFO     -- (null)
       INFO     -- NDBCNTR (Line: 793) 0x00000000
      to
       INFO     -- Node started while node shutdown in progress. Please wait until shutdown complete before starting node
       INFO     -- NDBCNTR (Line: 794) 0x00000004

    modified:
      storage/ndb/src/kernel/error/ErrorReporter.cpp
=== modified file 'mysql-test/suite/ndb/include/ndb_desc_print.inc'
--- a/mysql-test/suite/ndb/include/ndb_desc_print.inc	2010-09-22 15:27:31 +0000
+++ b/mysql-test/suite/ndb/include/ndb_desc_print.inc	2013-04-04 13:00:11 +0000
@@ -1,5 +1,20 @@
+# Check ndb_desc_opts argument variable
+if (!$ndb_desc_opts)
+{
+  echo The variable ndb_desc_opts must be set when calling ndb_desc_print.inc;
+  die Missing argument ndb_desc_opts;
+}
+
+let $ndb_desc_cmd= $NDB_DESC --no-defaults $ndb_desc_opts;
+
+# Uncomment  the following line in order to run ndb_desc through valgrind
+#let $ndb_desc_cmd= valgrind -q $ndb_desc_cmd;
+
 # Use replace_regex to remove non-deterministic values from the
 # ndb_desc output
 #
 --replace_regex /Version: [0-9]*/Version: Any/  /t2_unique_index\(j\) - OrderedIndex/Index/ /t2_unique_index\$unique\(j\) - UniqueHashIndex/Index/ /PRIMARY\(i\) - OrderedIndex/Index/  /BT=NDB\$BLOB_[0-9]*_/BT=NDB$BLOB_XX_/  /Length of frm data: [0-9]*/Length of frm data: XXX/ 
---exec $NDB_DESC --no-defaults $ndb_desc_opts
+--exec $ndb_desc_cmd
+
+# Reset argument variable in order to detect missing assignment
+let $ndb_desc_opts=;

=== modified file 'mysql-test/suite/ndb/r/ndb_backup_rate.result'
--- a/mysql-test/suite/ndb/r/ndb_backup_rate.result	2012-09-13 20:18:47 +0000
+++ b/mysql-test/suite/ndb/r/ndb_backup_rate.result	2013-04-11 13:21:03 +0000
@@ -14,10 +14,13 @@ insert into t1 select * from t1;
 insert into t1 select * from t1;
 insert into t1 select * from t1;
 insert into t1 select * from t1;
-insert into t1 select * from t1 limit 8192;
-insert into t1 select * from t1 limit 8192;
-insert into t1 select * from t1 limit 8192;
+create temporary table t1_8192(a varchar(1024));
+insert into t1_8192 select * from t1 limit 8192;
+insert into t1 select * from t1_8192;
+insert into t1 select * from t1_8192;
+insert into t1 select * from t1_8192;
 Continuing insert/delete until redo is full
 Redo log full, waiting for redo log having space...
 Redo had space again.
 drop table t1;
+drop table t1_8192;

=== modified file 'mysql-test/suite/ndb/t/ndb_backup_rate.test'
--- a/mysql-test/suite/ndb/t/ndb_backup_rate.test	2012-11-20 17:24:42 +0000
+++ b/mysql-test/suite/ndb/t/ndb_backup_rate.test	2013-04-11 13:21:03 +0000
@@ -29,13 +29,18 @@ insert into t1 select * from t1;
 insert into t1 select * from t1;
 insert into t1 select * from t1;
 
+# Cache 8192 rows in temporary table in order
+# to avoid scan during insert
+create temporary table t1_8192(a varchar(1024));
+insert into t1_8192 select * from t1 limit 8192;
+
 # ~32M 
 --error 0,1297
-insert into t1 select * from t1 limit 8192;
+insert into t1 select * from t1_8192;
 --error 0,1297
-insert into t1 select * from t1 limit 8192;
+insert into t1 select * from t1_8192;
 --error 0,1297
-insert into t1 select * from t1 limit 8192;
+insert into t1 select * from t1_8192;
 
 --echo Continuing insert/delete until redo is full
 
@@ -46,7 +51,7 @@ let $counter= 50;
 while (!$mysql_errno)
 {
   --error 0,1297
-  insert into t1 select * from t1 limit 8192;
+  insert into t1 select * from t1_8192;
 
   if (!$mysql_errno)
   {
@@ -55,9 +60,12 @@ while (!$mysql_errno)
       die Failed waiting for redo log full;
     }
     dec $counter;
+
+    # Delete the inserted rows to avoid table full
+    # and of course creating even more REDO log
+    --error 0,1297
+    delete from t1 limit 8192;
   }
-  --error 0,1297
-  delete from t1 limit 8192;
 }
 --enable_query_log
 --enable_result_log
@@ -72,13 +80,13 @@ let $counter= 600;
 while ($mysql_errno)
 {
   --error 0,1297
-  insert into t1 select * from t1 limit 8192;
+  insert into t1 select * from t1_8192;
 
   if ($mysql_errno)
   {
     if (!$counter)
     {
-      die Failed waiting for redo log full;
+      die Failed waiting for redo log having space;
     }
     dec $counter;
     --sleep 0.1
@@ -90,3 +98,4 @@ while ($mysql_errno)
 --echo Redo had space again.
   
 drop table t1;
+drop table t1_8192;

=== modified file 'mysql-test/suite/ndb/t/ndb_native_default_support.test'
--- a/mysql-test/suite/ndb/t/ndb_native_default_support.test	2011-05-06 14:11:46 +0000
+++ b/mysql-test/suite/ndb/t/ndb_native_default_support.test	2013-04-04 13:00:11 +0000
@@ -3,7 +3,6 @@
 # Date: 2008-12
 # Purpose: ndb native default support test
 ##############################################################
-
 -- source include/have_ndb.inc
 -- source include/ndb_default_cluster.inc
 
@@ -153,9 +152,9 @@ DROP TABLE IF EXISTS t1, bit1;
 
 --sorted_result
 SHOW TABLES;
---let ndb_desc_opts= -d mysqltest t1
+--let $ndb_desc_opts= -d mysqltest t1
 --source suite/ndb/include/ndb_desc_print.inc
---let ndb_desc_opts= -d mysqltest bit1
+--let $ndb_desc_opts= -d mysqltest bit1
 --source suite/ndb/include/ndb_desc_print.inc
 SELECT pk,BIN(b1),BIN(b2),BIN(b3),BIN(b4),BIN(b5) FROM bit1 ORDER BY pk;
 --replace_column 12 CURRENT_TIMESTAMP
@@ -202,10 +201,10 @@ DROP DATABASE mysqltest;
 #
 
 # Show that restored tables have no native defaults
---let ndb_desc_opts= -d test t1
+--let $ndb_desc_opts= -d test t1
 --source suite/ndb/include/ndb_desc_print.inc
 
---let ndb_desc_opts= -d test bit1
+--let $ndb_desc_opts= -d test bit1
 --source suite/ndb/include/ndb_desc_print.inc
 
 USE test;
@@ -227,7 +226,7 @@ ALTER TABLE t1 CHANGE COLUMN j j INT DEF
 SHOW CREATE TABLE t1;
 
 # Show that the defaults are now native
---let ndb_desc_opts= -d test t1
+--let $ndb_desc_opts= -d test t1
 --source suite/ndb/include/ndb_desc_print.inc
 
 --disable_warnings
@@ -254,12 +253,12 @@ SELECT pk,BIN(b1),BIN(b2),BIN(b3),BIN(b4
 #--echo ********************************************************************************
 #--echo * Alter table restoring from 6.3 backup to new table with native default support
 #--echo ********************************************************************************
-#--let ndb_desc_opts= -d test t1
+#--let $ndb_desc_opts= -d test t1
 #--source suite/ndb/include/ndb_desc_print.inc
 #
 #ALTER TABLE t1 CHANGE COLUMN j j INT DEFAULT 6;
 #
-#--let ndb_desc_opts= -d test t1
+#--let $ndb_desc_opts= -d test t1
 #--source suite/ndb/include/ndb_desc_print.inc
 
 --disable_warnings
@@ -290,7 +289,7 @@ SELECT * FROM t2 ORDER BY i;
 --echo *************************************************************
 ALTER TABLE t2 MODIFY COLUMN j INT DEFAULT 666;
 
---let ndb_desc_opts= -d test t2
+--let $ndb_desc_opts= -d test t2
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO t2 VALUES();
 SELECT * FROM t2 ORDER BY i;
@@ -308,7 +307,7 @@ DROP TABLE IF EXISTS t2;
 --echo **************************************************************
 
 CREATE TABLE t1 (a int primary key, b int default 12, c char not null) engine=ndb;
---let ndb_desc_opts= -d test t1
+--let $ndb_desc_opts= -d test t1
 --source suite/ndb/include/ndb_desc_print.inc
 
 DROP TABLE t1;
@@ -326,7 +325,7 @@ CREATE TABLE t1 (a int primary key,
                  g set('Chips','Pie','Fish') default 'Fish,Chips',
                  h enum('Pig','Lion') not null,
                  i char(2) default '66') engine=ndb;
---let ndb_desc_opts= -d test t1
+--let $ndb_desc_opts= -d test t1
 --source suite/ndb/include/ndb_desc_print.inc
 
 DROP TABLE t1;
@@ -341,7 +340,7 @@ CREATE TABLE t1 (a int primary key,
 
 SHOW CREATE TABLE t1;
 
---let ndb_desc_opts= -d test t1
+--let $ndb_desc_opts= -d test t1
 --source suite/ndb/include/ndb_desc_print.inc
 
 DROP TABLE t1;
@@ -355,7 +354,7 @@ DROP TABLE t1;
 CREATE TABLE variant (a int primary key,
                       b timestamp) engine =ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 --replace_column 2 CURRENT_TIMESTAMP
@@ -366,7 +365,7 @@ DROP TABLE variant;
 CREATE TABLE variant (a int primary key,
                       b timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP) engine =ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 --replace_column 2 CURRENT_TIMESTAMP
@@ -377,7 +376,7 @@ DROP TABLE variant;
 CREATE TABLE variant (a int primary key,
                       b timestamp DEFAULT CURRENT_TIMESTAMP) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 --replace_column 2 CURRENT_TIMESTAMP
@@ -389,7 +388,7 @@ CREATE TABLE variant (a int primary key,
                       b timestamp DEFAULT 0 ON UPDATE CURRENT_TIMESTAMP,
                       c int) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a,c) VALUES (1,1);
 SELECT * from variant;
@@ -402,7 +401,7 @@ DROP TABLE variant;
 CREATE TABLE variant (a int primary key,
                       b timestamp DEFAULT 0) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 SELECT * from variant;
@@ -412,7 +411,7 @@ DROP TABLE variant;
 CREATE TABLE variant (a int primary key,
                       b timestamp DEFAULT 19770623000001) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 SELECT * from variant;
@@ -423,7 +422,7 @@ CREATE TABLE variant (a int primary key,
                       b timestamp DEFAULT 19770623000001,
                       c timestamp DEFAULT CURRENT_TIMESTAMP) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 --replace_column 3 CURRENT_TIMESTAMP
@@ -435,7 +434,7 @@ CREATE TABLE variant (a int primary key,
                       b timestamp DEFAULT 19770623000001,
                       c timestamp ON UPDATE CURRENT_TIMESTAMP) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 SELECT * from variant;
@@ -449,7 +448,7 @@ CREATE TABLE variant (a int primary key,
                       b timestamp DEFAULT 19770623000001,
                       c timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 --replace_column 3 CURRENT_TIMESTAMP
@@ -460,7 +459,7 @@ DROP TABLE variant;
 CREATE TABLE variant (a int primary key,
                       b timestamp NULL) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 SELECT * from variant;
@@ -470,7 +469,7 @@ DROP TABLE variant;
 CREATE TABLE variant (a int primary key,
                       b timestamp NULL DEFAULT 0) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 SELECT * from variant;
@@ -480,7 +479,7 @@ DROP TABLE variant;
 CREATE TABLE variant (a int primary key,
                       b timestamp NULL DEFAULT 19770623000001) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 SELECT * from variant;
@@ -490,7 +489,7 @@ DROP TABLE variant;
 CREATE TABLE variant (a int primary key,
                       b timestamp NULL DEFAULT CURRENT_TIMESTAMP) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 --replace_column 2 CURRENT_TIMESTAMP
@@ -502,7 +501,7 @@ CREATE TABLE variant (a int primary key,
                       b timestamp NULL ON UPDATE CURRENT_TIMESTAMP,
                       c int) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a,c) VALUES (1,1);
 SELECT * from variant;
@@ -515,7 +514,7 @@ DROP TABLE variant;
 CREATE TABLE variant (a int primary key,
                       b timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP) engine = ndb;
 SHOW CREATE TABLE variant;
---let ndb_desc_opts= -d test variant
+--let $ndb_desc_opts= -d test variant
 --source suite/ndb/include/ndb_desc_print.inc
 INSERT INTO variant (a) VALUES (1);
 --replace_column 2 CURRENT_TIMESTAMP
@@ -569,7 +568,7 @@ CREATE TABLE bit1 (
 
 SHOW CREATE TABLE t1;
 
---let ndb_desc_opts= -d test t1
+--let $ndb_desc_opts= -d test t1
 --source suite/ndb/include/ndb_desc_print.inc
 
 --exec $NDB_RESTORE --no-defaults -b 1 -n 1 -r --promote-attribute --exclude-missing-columns $backup_data_dir/before_native_default >> $NDB_TOOLS_OUTPUT
@@ -664,4 +663,4 @@ insert into t1(fid) value(100);
 
 select fid, isnull(f01), isnull(f02), isnull(f03) from t1;
 
-drop table t1;
\ No newline at end of file
+drop table t1;

=== modified file 'storage/ndb/test/src/NDBT_ReturnCodes.cpp'
--- a/storage/ndb/test/src/NDBT_ReturnCodes.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/src/NDBT_ReturnCodes.cpp	2013-04-08 08:34:01 +0000
@@ -24,6 +24,7 @@
 /* Ndb include files */
 #include <NdbOut.hpp>
 
+static
 const char* rcodeToChar(int rcode){
   switch (rcode){
   case NDBT_OK:

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:5108 to 5109) magnus.blaudd20 May