bk commit into 5.1 tree (tomas:1.2539)

[tomas]

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-06-14 12:54:18+02:00, tomas@stripped +7 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco
  MERGE: 1.2506.1.41

  mysql-test/r/ndb_restore.result@stripped, 2007-06-14 12:53:20+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.23.1.1

  mysql-test/t/ndb_restore.test@stripped, 2007-06-14 12:53:20+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.26.1.1

  storage/ndb/include/mgmapi/mgmapi.h@stripped, 2007-06-14 12:53:20+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.59.1.8

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@stripped, 2007-06-14 12:53:20+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.113.4.4

  storage/ndb/src/mgmsrv/MgmtSrvr.hpp@stripped, 2007-06-14 12:53:20+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.49.1.7

  storage/ndb/src/ndbapi/ndberror.c@stripped, 2007-06-14 12:54:15+02:00,
tomas@stripped +18 -18
    manual merge
    MERGE: 1.81.4.9

  storage/ndb/tools/restore/consumer_restore.cpp@stripped, 2007-06-14 12:53:20+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.41.1.7

# 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/mysql-5.1-telco/RESYNC

--- 1.65/storage/ndb/include/mgmapi/mgmapi.h	2007-05-23 08:06:23 +02:00
+++ 1.66/storage/ndb/include/mgmapi/mgmapi.h	2007-06-14 12:53:20 +02:00
@@ -18,6 +18,7 @@
 
 #include "mgmapi_config_parameters.h"
 #include "ndb_logevent.h"
+#include "mgmapi_error.h"
 
 #define MGM_LOGLEVELS CFG_MAX_LOGLEVEL - CFG_MIN_LOGLEVEL + 1
 #define NDB_MGM_MAX_LOGLEVEL 15
@@ -210,105 +211,6 @@
     NDB_MGM_NODE_STATUS_MAX           = 8
 #endif
   };
-
-  /**
-   *    Error codes
-   */
-  enum ndb_mgm_error {
-    /** Not an error */
-    NDB_MGM_NO_ERROR = 0,
-
-    /* Request for service errors */
-    /** Supplied connectstring is illegal */
-    NDB_MGM_ILLEGAL_CONNECT_STRING = 1001,
-    /** Supplied NdbMgmHandle is illegal */
-    NDB_MGM_ILLEGAL_SERVER_HANDLE = 1005,
-    /** Illegal reply from server */
-    NDB_MGM_ILLEGAL_SERVER_REPLY = 1006,
-    /** Illegal number of nodes */
-    NDB_MGM_ILLEGAL_NUMBER_OF_NODES = 1007,
-    /** Illegal node status */
-    NDB_MGM_ILLEGAL_NODE_STATUS = 1008,
-    /** Memory allocation error */
-    NDB_MGM_OUT_OF_MEMORY = 1009,
-    /** Management server not connected */
-    NDB_MGM_SERVER_NOT_CONNECTED = 1010,
-    /** Could not connect to socker */
-    NDB_MGM_COULD_NOT_CONNECT_TO_SOCKET = 1011,
-    /** Could not bind local address */
-    NDB_MGM_BIND_ADDRESS = 1012,
-    
-    /* Alloc node id failures */
-    /** Generic error, retry may succeed */
-    NDB_MGM_ALLOCID_ERROR = 1101,
-    /** Non retriable error */
-    NDB_MGM_ALLOCID_CONFIG_MISMATCH = 1102,
-
-    /* Service errors - Start/Stop Node or System */
-    /** Start failed */
-    NDB_MGM_START_FAILED = 2001,
-    /** Stop failed */
-    NDB_MGM_STOP_FAILED = 2002,
-    /** Restart failed */
-    NDB_MGM_RESTART_FAILED = 2003,
-
-    /* Service errors - Backup */
-    /** Unable to start backup */
-    NDB_MGM_COULD_NOT_START_BACKUP = 3001,
-    /** Unable to abort backup */
-    NDB_MGM_COULD_NOT_ABORT_BACKUP = 3002,
-
-    /* Service errors - Single User Mode */
-    /** Unable to enter single user mode */
-    NDB_MGM_COULD_NOT_ENTER_SINGLE_USER_MODE = 4001,
-    /** Unable to exit single user mode */
-    NDB_MGM_COULD_NOT_EXIT_SINGLE_USER_MODE = 4002,
-
-    /* Usage errors */
-    /** Usage error */
-    NDB_MGM_USAGE_ERROR = 5001
-  };
-
-#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
-  struct Ndb_Mgm_Error_Msg {
-    enum ndb_mgm_error  code;
-    const char *        msg;
-  };
-  const struct Ndb_Mgm_Error_Msg ndb_mgm_error_msgs[] = {
-    { NDB_MGM_NO_ERROR, "No error" },
-
-    /* Request for service errors */
-    { NDB_MGM_ILLEGAL_CONNECT_STRING, "Illegal connect string" },
-    { NDB_MGM_ILLEGAL_SERVER_HANDLE, "Illegal server handle" },
-    { NDB_MGM_ILLEGAL_SERVER_REPLY, "Illegal reply from server" },
-    { NDB_MGM_ILLEGAL_NUMBER_OF_NODES, "Illegal number of nodes" },
-    { NDB_MGM_ILLEGAL_NODE_STATUS, "Illegal node status" },
-    { NDB_MGM_OUT_OF_MEMORY, "Out of memory" },
-    { NDB_MGM_SERVER_NOT_CONNECTED, "Management server not connected" },
-    { NDB_MGM_COULD_NOT_CONNECT_TO_SOCKET, "Could not connect to socket" },
-
-    /* Service errors - Start/Stop Node or System */
-    { NDB_MGM_START_FAILED, "Start failed" },
-    { NDB_MGM_STOP_FAILED, "Stop failed" },
-    { NDB_MGM_RESTART_FAILED, "Restart failed" },
-
-    /* Service errors - Backup */
-    { NDB_MGM_COULD_NOT_START_BACKUP, "Could not start backup" },
-    { NDB_MGM_COULD_NOT_ABORT_BACKUP, "Could not abort backup" },
-
-    /* Service errors - Single User Mode */
-    { NDB_MGM_COULD_NOT_ENTER_SINGLE_USER_MODE,
-      "Could not enter single user mode" },
-    { NDB_MGM_COULD_NOT_EXIT_SINGLE_USER_MODE,
-      "Could not exit single user mode" },
-
-    /* Usage errors */
-    { NDB_MGM_USAGE_ERROR,
-      "Usage error" }
-  };
-  const int ndb_mgm_noOfErrorMsgs =
-  sizeof(ndb_mgm_error_msgs)/sizeof(struct Ndb_Mgm_Error_Msg);
-#endif
 
   /**
    *   Status of a node in the cluster.

--- 1.136/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2007-05-09 16:31:12 +02:00
+++ 1.137/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2007-06-14 12:53:20 +02:00
@@ -18,6 +18,7 @@
 
 #include "MgmtSrvr.hpp"
 #include "MgmtErrorReporter.hpp"
+#include "ndb_mgmd_error.h"
 #include <ConfigRetriever.hpp>
 
 #include <NdbOut.hpp>
@@ -239,13 +240,6 @@
   // Nothing yet
 }
 
-class ErrorItem 
-{
-public:
-  int _errorCode;
-  const char * _errorText;
-};
-
 bool
 MgmtSrvr::setEventLogFilter(int severity, int enable)
 {
@@ -268,62 +262,6 @@
   return g_eventLogger.isEnable((Logger::LoggerLevel)severity);
 }
 
-static ErrorItem errorTable[] = 
-{
-  {MgmtSrvr::NO_CONTACT_WITH_PROCESS, "No contact with the process (dead ?)."},
-  {MgmtSrvr::PROCESS_NOT_CONFIGURED, "The process is not configured."},
-  {MgmtSrvr::WRONG_PROCESS_TYPE, 
-   "The process has wrong type. Expected a DB process."},
-  {MgmtSrvr::COULD_NOT_ALLOCATE_MEMORY, "Could not allocate memory."},
-  {MgmtSrvr::SEND_OR_RECEIVE_FAILED, "Send to process or receive failed."},
-  {MgmtSrvr::INVALID_LEVEL, "Invalid level. Should be between 1 and 30."},
-  {MgmtSrvr::INVALID_ERROR_NUMBER, "Invalid error number. Should be >= 0."},
-  {MgmtSrvr::INVALID_TRACE_NUMBER, "Invalid trace number."},
-  {MgmtSrvr::NOT_IMPLEMENTED, "Not implemented."},
-  {MgmtSrvr::INVALID_BLOCK_NAME, "Invalid block name"},
-
-  {MgmtSrvr::CONFIG_PARAM_NOT_EXIST, 
-   "The configuration parameter does not exist for the process type."},
-  {MgmtSrvr::CONFIG_PARAM_NOT_UPDATEABLE, 
-   "The configuration parameter is not possible to update."},
-  {MgmtSrvr::VALUE_WRONG_FORMAT_INT_EXPECTED, 
-   "Incorrect value. Expected integer."},
-  {MgmtSrvr::VALUE_TOO_LOW, "Value is too low."},
-  {MgmtSrvr::VALUE_TOO_HIGH, "Value is too high."},
-  {MgmtSrvr::VALUE_WRONG_FORMAT_BOOL_EXPECTED, 
-   "Incorrect value. Expected TRUE or FALSE."},
-
-  {MgmtSrvr::CONFIG_FILE_OPEN_WRITE_ERROR, 
-   "Could not open configuration file for writing."},
-  {MgmtSrvr::CONFIG_FILE_OPEN_READ_ERROR, 
-   "Could not open configuration file for reading."},
-  {MgmtSrvr::CONFIG_FILE_WRITE_ERROR, 
-   "Write error when writing configuration file."},
-  {MgmtSrvr::CONFIG_FILE_READ_ERROR, 
-   "Read error when reading configuration file."},
-  {MgmtSrvr::CONFIG_FILE_CLOSE_ERROR, "Could not close configuration file."},
-
-  {MgmtSrvr::CONFIG_CHANGE_REFUSED_BY_RECEIVER, 
-   "The change was refused by the receiving process."},
-  {MgmtSrvr::COULD_NOT_SYNC_CONFIG_CHANGE_AGAINST_PHYSICAL_MEDIUM, 
-   "The change could not be synced against physical medium."},
-  {MgmtSrvr::CONFIG_FILE_CHECKSUM_ERROR, 
-   "The config file is corrupt. Checksum error."},
-  {MgmtSrvr::NOT_POSSIBLE_TO_SEND_CONFIG_UPDATE_TO_PROCESS_TYPE, 
-   "It is not possible to send an update of a configuration variable "
-   "to this kind of process."},
-  {MgmtSrvr::NODE_SHUTDOWN_IN_PROGESS, "Node shutdown in progress" },
-  {MgmtSrvr::SYSTEM_SHUTDOWN_IN_PROGRESS, "System shutdown in progress" },
-  {MgmtSrvr::NODE_SHUTDOWN_WOULD_CAUSE_SYSTEM_CRASH,
-   "Node shutdown would cause system crash" },
-  {MgmtSrvr::UNSUPPORTED_NODE_SHUTDOWN,
-   "Unsupported multi node shutdown. Abort option required." },
-  {MgmtSrvr::NODE_NOT_API_NODE, "The specified node is not an API node." },
-  {MgmtSrvr::OPERATION_NOT_ALLOWED_START_STOP, 
-   "Operation not allowed while nodes are starting or stopping."},
-  {MgmtSrvr::NO_CONTACT_WITH_DB_NODES, "No contact with database nodes" }
-};
-
 int MgmtSrvr::translateStopRef(Uint32 errCode)
 {
   switch(errCode){
@@ -343,8 +281,6 @@
   return 4999;
 }
 
-static int noOfErrorCodes = sizeof(errorTable) / sizeof(ErrorItem);
-
 int 
 MgmtSrvr::getNodeCount(enum ndb_mgm_node_type type) const 
 {
@@ -1985,18 +1921,8 @@
 
 const char* MgmtSrvr::getErrorText(int errorCode, char *buf, int buf_sz)
 {
-
-  for (int i = 0; i < noOfErrorCodes; ++i) {
-    if (errorCode == errorTable[i]._errorCode) {
-      BaseString::snprintf(buf, buf_sz, errorTable[i]._errorText);
-      buf[buf_sz-1]= 0;
-      return buf;
-    }
-  }
-
   ndb_error_string(errorCode, buf, buf_sz);
   buf[buf_sz-1]= 0;
-
   return buf;
 }
 

--- 1.58/storage/ndb/src/mgmsrv/MgmtSrvr.hpp	2007-03-22 14:02:27 +01:00
+++ 1.59/storage/ndb/src/mgmsrv/MgmtSrvr.hpp	2007-06-14 12:53:20 +02:00
@@ -148,45 +148,6 @@
    */
   bool isEventLogFilterEnabled(int severity);
 
-  STATIC_CONST( NO_CONTACT_WITH_PROCESS = 5000 );
-  STATIC_CONST( PROCESS_NOT_CONFIGURED = 5001 );
-  STATIC_CONST( WRONG_PROCESS_TYPE = 5002 );
-  STATIC_CONST( COULD_NOT_ALLOCATE_MEMORY = 5003 );
-  STATIC_CONST( SEND_OR_RECEIVE_FAILED = 5005 );
-  STATIC_CONST( INVALID_LEVEL = 5006 );
-  STATIC_CONST( INVALID_ERROR_NUMBER = 5007 );
-  STATIC_CONST( INVALID_TRACE_NUMBER = 5008 );
-  STATIC_CONST( NOT_IMPLEMENTED = 5009 );
-  STATIC_CONST( INVALID_BLOCK_NAME = 5010 );
-
-  STATIC_CONST( CONFIG_PARAM_NOT_EXIST = 5011 );
-  STATIC_CONST( CONFIG_PARAM_NOT_UPDATEABLE = 5012 );
-  STATIC_CONST( VALUE_WRONG_FORMAT_INT_EXPECTED = 5013 );
-  STATIC_CONST( VALUE_TOO_LOW = 5014 );
-  STATIC_CONST( VALUE_TOO_HIGH = 5015 );
-  STATIC_CONST( VALUE_WRONG_FORMAT_BOOL_EXPECTED = 5016 );
-
-  STATIC_CONST( CONFIG_FILE_OPEN_WRITE_ERROR = 5017 );
-  STATIC_CONST( CONFIG_FILE_OPEN_READ_ERROR = 5018 );
-  STATIC_CONST( CONFIG_FILE_WRITE_ERROR = 5019 );
-  STATIC_CONST( CONFIG_FILE_READ_ERROR = 5020 );
-  STATIC_CONST( CONFIG_FILE_CLOSE_ERROR = 5021 );
-
-  STATIC_CONST( CONFIG_CHANGE_REFUSED_BY_RECEIVER = 5022 );
-  STATIC_CONST( COULD_NOT_SYNC_CONFIG_CHANGE_AGAINST_PHYSICAL_MEDIUM = 5023 );
-  STATIC_CONST( CONFIG_FILE_CHECKSUM_ERROR = 5024 );
-  STATIC_CONST( NOT_POSSIBLE_TO_SEND_CONFIG_UPDATE_TO_PROCESS_TYPE = 5025 );
-
-  STATIC_CONST( NODE_SHUTDOWN_IN_PROGESS = 5026 );
-  STATIC_CONST( SYSTEM_SHUTDOWN_IN_PROGRESS = 5027 );
-  STATIC_CONST( NODE_SHUTDOWN_WOULD_CAUSE_SYSTEM_CRASH = 5028 );
-
-  STATIC_CONST( NO_CONTACT_WITH_DB_NODES = 5030 );
-  STATIC_CONST( UNSUPPORTED_NODE_SHUTDOWN = 5031 );
-
-  STATIC_CONST( NODE_NOT_API_NODE = 5062 );
-  STATIC_CONST( OPERATION_NOT_ALLOWED_START_STOP = 5063 );
-
   /**
    *   This enum specifies the different signal loggig modes possible to set 
    *   with the setSignalLoggingMode method.

--- 1.94/storage/ndb/src/ndbapi/ndberror.c	2007-06-09 07:25:44 +02:00
+++ 1.95/storage/ndb/src/ndbapi/ndberror.c	2007-06-14 12:54:15 +02:00
@@ -19,6 +19,9 @@
 #include <ndberror.h>
 #include <m_string.h>
 
+#include "../mgmsrv/ndb_mgmd_error.h"
+
+
 typedef struct ErrorBundle {
   int code;
   int mysql_code;
@@ -636,7 +639,34 @@
   { 4290, DMEC, AE, "Missing column specification in NdbDictionary::RecordSpecification"
},
   { 4291, DMEC, AE, "Duplicate column specification in
NdbDictionary::RecordSpecification" },
   { 4292, DMEC, AE, "NdbRecord for tuple access is not an index key NdbRecord" },
-  { 4293, DMEC, AE, "Error returned from application scanIndex() callback" }
+  { 4293, DMEC, AE, "Error returned from application scanIndex() callback" },
+
+  { NO_CONTACT_WITH_PROCESS, DMEC, AE,
+    "No contact with the process (dead ?)."},
+  { WRONG_PROCESS_TYPE, DMEC, AE,
+   "The process has wrong type. Expected a DB process."},
+  { SEND_OR_RECEIVE_FAILED, DMEC, AE,
+    "Send to process or receive failed."},
+  { INVALID_ERROR_NUMBER, DMEC, AE,
+    "Invalid error number. Should be >= 0."},
+  { INVALID_TRACE_NUMBER, DMEC, AE,
+    "Invalid trace number."},
+  { INVALID_BLOCK_NAME, DMEC, AE,
+    "Invalid block name"},
+  { NODE_SHUTDOWN_IN_PROGESS, DMEC, AE,
+    "Node shutdown in progress" },
+  { SYSTEM_SHUTDOWN_IN_PROGRESS, DMEC, AE,
+    "System shutdown in progress" },
+  { NODE_SHUTDOWN_WOULD_CAUSE_SYSTEM_CRASH, DMEC, AE,
+   "Node shutdown would cause system crash" },
+  { UNSUPPORTED_NODE_SHUTDOWN, DMEC, AE,
+   "Unsupported multi node shutdown. Abort option required." },
+  { NODE_NOT_API_NODE, DMEC, AE,
+    "The specified node is not an API node." },
+  { OPERATION_NOT_ALLOWED_START_STOP, DMEC, AE,
+   "Operation not allowed while nodes are starting or stopping."},
+  { NO_CONTACT_WITH_DB_NODES, DMEC, AE,
+    "No contact with database nodes" }
 };
 
 static

--- 1.53/storage/ndb/tools/restore/consumer_restore.cpp	2007-06-12 07:03:32 +02:00
+++ 1.54/storage/ndb/tools/restore/consumer_restore.cpp	2007-06-14 12:53:20 +02:00
@@ -1255,19 +1255,22 @@
 	char * dataPtr = attr_data->string_value;
 	Uint32 length = 0;
        
-        const unsigned char * src = (const unsigned char *)dataPtr;
-        switch(attr_desc->m_column->getType()){
-        case NdbDictionary::Column::Varchar:
-        case NdbDictionary::Column::Varbinary:
-          length = src[0] + 1;
-          break;
-        case NdbDictionary::Column::Longvarchar:
-        case NdbDictionary::Column::Longvarbinary:
-          length = src[0] + (src[1] << 8) + 2;
-          break;
-        default:
-          length = attr_data->size;
-          break;
+        if (!attr_data->null)
+        {
+          const unsigned char * src = (const unsigned char *)dataPtr;
+          switch(attr_desc->m_column->getType()){
+          case NdbDictionary::Column::Varchar:
+          case NdbDictionary::Column::Varbinary:
+            length = src[0] + 1;
+            break;
+          case NdbDictionary::Column::Longvarchar:
+          case NdbDictionary::Column::Longvarbinary:
+            length = src[0] + (src[1] << 8) + 2;
+            break;
+          default:
+            length = attr_data->size;
+            break;
+          }
         }
 	if (j == 0 && tup.getTable()->have_auto_inc(i))
 	  tup.getTable()->update_max_auto_val(dataPtr,size*arraySize);

--- 1.24/mysql-test/r/ndb_restore.result	2007-04-30 12:13:29 +02:00
+++ 1.25/mysql-test/r/ndb_restore.result	2007-06-14 12:53:20 +02:00
@@ -18,7 +18,7 @@
 PRIMARY KEY  (`capgotod`),
 KEY `i quadaddsvr` (`gotod`)
 ) ENGINE=ndbcluster DEFAULT CHARSET=latin1;
-INSERT INTO `t2_c` VALUES (500,4,'','q3.net','addavp:MK_CASELECTOR=1','postorod
rattoaa'),(2,1,'4','','addavp:MK_BRANDTAD=345','REDS
Brandtad'),(3,2,'4','q3.net','execorder','fixedRatediPO
REDS'),(1,1,'3','','addavp:MK_BRANDTAD=123','TEST
Brandtad'),(6,5,'','told.q3.net','addavp:MK_BRANDTAD=123','Brandtad
Toldzone'),(4,3,'3','q3.net','addavp:MK_POOLHINT=2','ratedi PO TEST');
+INSERT INTO `t2_c` VALUES (500,4,'','q3.net','addavp:MK_CASELECTOR=1','postorod
rattoaa'),(2,1,'4','','addavp:MK_BRANDTAD=345','REDS
Brandtad'),(3,2,'4','q3.net','execorder','fixedRatediPO
REDS'),(1,1,'3','','addavp:MK_BRANDTAD=123','TEST
Brandtad'),(6,5,'','told.q3.net','addavp:MK_BRANDTAD=123','Brandtad
Toldzone'),(4,3,'3','q3.net','addavp:MK_POOLHINT=2','ratedi PO
TEST'),(5,0,'',NULL,NULL,'');
 CREATE TABLE `t3_c` (
 `CapGoaledatta` smallint(5) unsigned NOT NULL default '0',
 `capgotod` smallint(5) unsigned NOT NULL default '0',
@@ -154,15 +154,15 @@
 5
 select count(*) from t2;
 count(*)
-6
+7
 select count(*) from t2_c;
 count(*)
-6
+7
 select count(*)
 from (select * from t2 union 
 select * from t2_c) a;
 count(*)
-6
+7
 select count(*) from t3;
 count(*)
 4
@@ -286,15 +286,15 @@
 5
 select count(*) from t2;
 count(*)
-6
+7
 select count(*) from t2_c;
 count(*)
-6
+7
 select count(*)
 from (select * from t2 union 
 select * from t2_c) a;
 count(*)
-6
+7
 select count(*) from t3;
 count(*)
 4
@@ -386,15 +386,15 @@
 5
 select count(*) from t2;
 count(*)
-6
+7
 select count(*) from t2_c;
 count(*)
-6
+7
 select count(*)
 from (select * from t2 union 
 select * from t2_c) a;
 count(*)
-6
+7
 select count(*) from t3;
 count(*)
 4

--- 1.27/mysql-test/t/ndb_restore.test	2007-04-30 12:13:11 +02:00
+++ 1.28/mysql-test/t/ndb_restore.test	2007-06-14 12:53:20 +02:00
@@ -33,7 +33,7 @@
   PRIMARY KEY  (`capgotod`),
   KEY `i quadaddsvr` (`gotod`)
 ) ENGINE=ndbcluster DEFAULT CHARSET=latin1;
-INSERT INTO `t2_c` VALUES (500,4,'','q3.net','addavp:MK_CASELECTOR=1','postorod
rattoaa'),(2,1,'4','','addavp:MK_BRANDTAD=345','REDS
Brandtad'),(3,2,'4','q3.net','execorder','fixedRatediPO
REDS'),(1,1,'3','','addavp:MK_BRANDTAD=123','TEST
Brandtad'),(6,5,'','told.q3.net','addavp:MK_BRANDTAD=123','Brandtad
Toldzone'),(4,3,'3','q3.net','addavp:MK_POOLHINT=2','ratedi PO TEST');
+INSERT INTO `t2_c` VALUES (500,4,'','q3.net','addavp:MK_CASELECTOR=1','postorod
rattoaa'),(2,1,'4','','addavp:MK_BRANDTAD=345','REDS
Brandtad'),(3,2,'4','q3.net','execorder','fixedRatediPO
REDS'),(1,1,'3','','addavp:MK_BRANDTAD=123','TEST
Brandtad'),(6,5,'','told.q3.net','addavp:MK_BRANDTAD=123','Brandtad
Toldzone'),(4,3,'3','q3.net','addavp:MK_POOLHINT=2','ratedi PO
TEST'),(5,0,'',NULL,NULL,'');
 
 # Added ROW_FORMAT=FIXED to use below to see that setting is preserved
 # by restore