bk commit into 5.1 tree (gni:1.2489) BUG#22240

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of root. When root 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-04-12 18:41:08+08:00, gni@stripped +4 -0
  BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected. With
--no-upgrade (-u) option, user can decide if ignore the upgrade, the default action is to
upgrade them.

  storage/ndb/tools/restore/Restore.cpp@stripped, 2007-04-12 18:41:05+08:00,
gni@stripped +7 -2
    Replace the max length define with  the real length used for var data

  storage/ndb/tools/restore/consumer_restore.cpp@stripped, 2007-04-12 18:41:05+08:00,
gni@stripped +16 -1
    Assign the correct array type for varchar and varbinary type when creating them in NDB
kernel

  storage/ndb/tools/restore/consumer_restore.hpp@stripped, 2007-04-12 18:41:05+08:00,
gni@stripped +2 -0
    Add the "m_no_upgrade" member variable to decide if upgrading array type for var type

  storage/ndb/tools/restore/restore_main.cpp@stripped, 2007-04-12 18:41:05+08:00,
gni@stripped +12 -1
    Add --no-upgrade(-u) option for ndb_restore to decide if upgrade array type for var
data.
    The default is false, it should be used with --skip-table-check(-s) option when -u
option is unused.

# 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:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240

--- 1.47/storage/ndb/tools/restore/Restore.cpp	2007-04-12 18:41:15 +08:00
+++ 1.48/storage/ndb/tools/restore/Restore.cpp	2007-04-12 18:41:15 +08:00
@@ -647,10 +647,15 @@
       sz *= 4;
     }
     
+    Uint32 vardata_real_len = 0;
+    NdbColumnImpl & col = NdbColumnImpl::getImpl(*attr_desc->m_column);
+    if (!col.get_var_length((void *)&data->Data[0],vardata_real_len))
+	return NULL;
+
     attr_data->null = false;
     attr_data->void_value = &data->Data[0];
-    attr_data->size = sz;
-
+    attr_data->size = vardata_real_len;
+    
     //if (m_currentTable->getTableId() >= 2) { ndbout << "var off=" <<
ptr-buf_ptr << " attrId=" << attrId << endl; }
 
     /**

--- 1.53/storage/ndb/tools/restore/restore_main.cpp	2007-04-12 18:41:15 +08:00
+++ 1.54/storage/ndb/tools/restore/restore_main.cpp	2007-04-12 18:41:15 +08:00
@@ -33,6 +33,7 @@
 static int ga_nParallelism = 128;
 static int ga_backupId = 0;
 static bool ga_dont_ignore_systab_0 = false;
+static bool ga_no_upgrade = false;
 static Vector<class BackupConsumer *> g_consumers;
 
 static const char* ga_backupPath = "." DIR_SEPARATOR;
@@ -82,6 +83,10 @@
     "Restore meta data into NDB Cluster using NDBAPI",
     (gptr*) &_restore_meta, (gptr*) &_restore_meta,  0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
+  { "no-upgrade", 'u',
+    "Don't upgrade array type for var attributes, which don't resize VAR data and don't
change column attributes",
+    (gptr*) &ga_no_upgrade, (gptr*) &ga_no_upgrade, 0,
+    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "no-restore-disk-objects", 'd',
     "Dont restore disk objects (tablespace/logfilegroups etc)",
     (gptr*) &_no_restore_disk, (gptr*) &_no_restore_disk,  0,
@@ -388,6 +393,11 @@
     restore->m_no_restore_disk = true;
   }
   
+  if (ga_no_upgrade)
+  {
+     restore->m_no_upgrade = true;
+  }
+
   if (ga_restore_epoch)
   {
     restore->m_restore_epoch = true;
@@ -463,6 +473,8 @@
   g_options.appfmt(" -n %d", ga_nodeId);
   if (_restore_meta)
     g_options.appfmt(" -m");
+  if (ga_no_upgrade)
+    g_options.appfmt(" -u");
   if (ga_skip_table_check)
     g_options.appfmt(" -s");
   if (_restore_data)
@@ -474,7 +486,6 @@
   g_options.appfmt(" -p %d", ga_nParallelism);
 
   g_connect_string = opt_connect_str;
-
   /**
    * we must always load meta data, even if we will only print it to stdout
    */

--- 1.41/storage/ndb/tools/restore/consumer_restore.cpp	2007-04-12 18:41:15 +08:00
+++ 1.42/storage/ndb/tools/restore/consumer_restore.cpp	2007-04-12 18:41:15 +08:00
@@ -839,6 +839,21 @@
     {
       copy.setMaxRows(table.getNoOfRecords());
     }
+    
+    NdbTableImpl &tableImpl = NdbTableImpl::getImpl(copy);
+    for(int i= 0; i < copy.getNoOfColumns(); i++)
+    {
+      NdbDictionary::Column::Type t = copy.getColumn(i)->getType();
+
+      if (!m_no_upgrade){
+        if (t == NdbDictionary::Column::Varchar ||
+          t == NdbDictionary::Column::Varbinary)
+         
tableImpl.getColumn(i)->setArrayType(NdbDictionary::Column::ArrayTypeShortVar);
+        if (t == NdbDictionary::Column::Longvarchar ||
+          t == NdbDictionary::Column::Longvarbinary)
+         
tableImpl.getColumn(i)->setArrayType(NdbDictionary::Column::ArrayTypeMediumVar);
+      }
+    }
 
     if (dict->createTable(copy) == -1) 
     {
@@ -1081,7 +1096,7 @@
 	int arraySize = attr_desc->arraySize;
 	char * dataPtr = attr_data->string_value;
 	Uint32 length = attr_data->size;
-	
+        
 	if (j == 0 && tup.getTable()->have_auto_inc(i))
 	  tup.getTable()->update_max_auto_val(dataPtr,size);
 	

--- 1.17/storage/ndb/tools/restore/consumer_restore.hpp	2007-04-12 18:41:15 +08:00
+++ 1.18/storage/ndb/tools/restore/consumer_restore.hpp	2007-04-12 18:41:15 +08:00
@@ -51,6 +51,7 @@
     m_callback = 0;
     m_free_callback = 0;
     m_temp_error = false;
+    m_no_upgrade = false;
     m_transactions = 0;
     m_cache.m_old_table = 0;
   }
@@ -91,6 +92,7 @@
   bool m_restore_meta;
   bool m_no_restore_disk;
   bool m_restore_epoch;
+  bool m_no_upgrade; // for upgrade ArrayType from 5.0 backup file.
   Uint32 m_logCount;
   Uint32 m_dataCount;