Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/field.cc:
  Auto merged

mysql-test/suite/rpl_ndb/t/disabled.def

@@ -14,10 +14,10 @@
 rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
 rpl_ndb_2myisam          : BUG#19227 Seems to pass currently
 rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD
-#rpl_ndb_innodb2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
-#rpl_ndb_myisam2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
+rpl_ndb_innodb2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
+rpl_ndb_myisam2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
 rpl_ndb_ddl              : BUG#28798 2007-05-31  lars  Valgrind failure in NDB
-#rpl_ndb_mix_innodb       : BUG#28123 rpl_ndb_mix_innodb.test casue slave to core on sol10-sparc-a
+rpl_ndb_mix_innodb       : BUG#28123 rpl_ndb_mix_innodb.test casue slave to core on sol10-sparc-a
 rpl_ndb_ctype_ucs2_def   : BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset
 
 

sql/field.cc

@@ -7619,12 +7619,6 @@ uchar *Field_blob::pack(uchar *to, const uchar *from, uint max_length)
     length=max_length;
     store_length(to,packlength,length,TRUE);
   }
-#ifdef WORDS_BIGENDIAN
-  else if (!table->s->db_low_byte_first)
-  {
-    store_length(to,packlength,length,TRUE);
-  }
-#endif
   else
     memcpy(to,from,packlength);			// Copy length
   if (length)
@@ -7662,17 +7656,8 @@ const uchar *Field_blob::unpack(uchar *to,
 
 const uchar *Field_blob::unpack(uchar *to, const uchar *from)
 {
-  uint32 length=get_length(from,TRUE);
-#ifdef WORDS_BIGENDIAN
-  if (!table->s->db_low_byte_first)
-  {
-    store_length(to,packlength,length,FALSE);
-  }
-  else
-#endif
-  {
+  uint32 length=get_length(from);
   memcpy(to,from,packlength);
-  }
   from+=packlength;
   if (length)
     memcpy_fixed(to+packlength, &from, sizeof(from));

storage/innobase/handler/ha_innodb.cc

@@ -7324,7 +7324,7 @@ ha_innobase::get_auto_increment(
 		/* Called for the first time ? */
 		if (prebuilt->trx->n_autoinc_rows == 0) {
 
-			prebuilt->trx->n_autoinc_rows = nb_desired_values;
+			prebuilt->trx->n_autoinc_rows = (ulint) nb_desired_values;
 
 			/* It's possible for nb_desired_values to be 0:
 			e.g., INSERT INTO T1(C) SELECT C FROM T2; */