From 06df6fc1378b5f3e9ef520aef015c019f972942f Mon Sep 17 00:00:00 2001
From: "cbell/Chuck@mysql_cab_desk." <>
Date: Fri, 27 Jul 2007 23:11:36 -0400
Subject: [PATCH] WL#3915 : (NDB) master's cols > slave

Patch corrects minor test anomolies and build warnings.
---
 .../extra/rpl_tests/rpl_extraMaster_Col.test  |   4 ++--
 mysql-test/r/rpl_extraColmaster_innodb.result | Bin 24444 -> 24418 bytes
 mysql-test/r/rpl_extraColmaster_myisam.result | Bin 24444 -> 24418 bytes
 .../r/rpl_row_extraColmaster_ndb.result       | Bin 12256 -> 12243 bytes
 sql/field.cc                                  |   3 ++-
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
index 696bb74ec47..29ff93986d5 100644
--- a/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
+++ b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
@@ -99,7 +99,7 @@ connection master;
 
 #connection slave;
    sync_slave_with_master;
---replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
 --query_vertical show slave status;
    select * from t1 order by f3;
 
@@ -373,7 +373,7 @@ connection master;
    select * from t31;
 
 --replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
 --query_vertical show slave status;
 
 #### Clean Up ####
diff --git a/mysql-test/r/rpl_extraColmaster_innodb.result b/mysql-test/r/rpl_extraColmaster_innodb.result
index 231732de7e062e6cd4ef2cc6909b0eae2384f390..27d6592a7ad79b6c3fb6c62a1071a720e92d7ed1 100644
GIT binary patch
delta 47
lcmeyfkMYqy#tkP~7?n3q)GcS)yvxi<4a{E0h9OkS1OUrJ5n%uT

delta 78
zcmaE~kMYkw#tkP~SS*bV%r?J`DP`Jh&+eke?dupE;u;hm;2#tM5&fxeNl+00g}@vp

diff --git a/mysql-test/r/rpl_extraColmaster_myisam.result b/mysql-test/r/rpl_extraColmaster_myisam.result
index f4c258cd9eac1ca5863c0ad2988a15020f640117..9a77ae6ca195834d9decf422c054230dc783f3b5 100644
GIT binary patch
delta 47
lcmeyfkMYqy#tkP~7?n3q)GcS)yvxi<4a{E0h9OkS1OUrJ5n%uT

delta 78
zcmaE~kMYkw#tkP~SS*bV%r?J`DP`Jh&+eke?dupE;u;hm;2#tM5&fxeNl+00g}@vp

diff --git a/mysql-test/r/rpl_row_extraColmaster_ndb.result b/mysql-test/r/rpl_row_extraColmaster_ndb.result
index 30332e9e7c8d3ee8084ec8aa2d8b8a9d3e1df72c..230b880e46f76449988aeb95120343d4606e376d 100644
GIT binary patch
delta 26
ccmaD5e>r}`dKO0I&Dpx8Oq(^>E!3cF0F8YJ;Q#;t

delta 34
ocmcZ{{~&(DdKMN-V*|6z8(7wAaQiw2hqwmC2lxkt00l~!0O)iKKmY&$

diff --git a/sql/field.cc b/sql/field.cc
index d9aa822b93f..0d081f45dbf 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -6404,7 +6404,8 @@ const char *Field_string::unpack(char *to,
 {
   uint from_len= param_data & 0x00ff;                 // length.
   uint length= 0;
-  uint f_length= (from_len < field_length) ? from_len : field_length;
+  uint f_length;
+  f_length= (from_len < field_length) ? from_len : field_length;
   DBUG_ASSERT(f_length <= 255);
   length= (uint) *from++;
   bitmap_set_bit(table->write_set,field_index);