row0sel.c Removes now trailing spaces from varchars

srv0start.c	Removes now trailing spaces from varchars
row0mysql.ic	Removes now trailing spaces from varchars
ha_innobase.cc	Removes now trailing spaces from varchars


sql/ha_innobase.cc:
  Removes now trailing spaces from varchars
innobase/include/row0mysql.ic:
  Removes now trailing spaces from varchars
innobase/row/row0sel.c:
  Removes now trailing spaces from varchars
innobase/srv/srv0start.c:
  Removes now trailing spaces from varchars

1 files changed, 6 insertions, 1 deletions

diff --git a/innobase/include/row0mysql.ic b/innobase/include/row0mysql.ic
index 957a143008d..6096e5771f7 100644
--- a/innobase/include/row0mysql.ic
+++ b/innobase/include/row0mysql.ic
@@ -89,7 +89,12 @@ row_mysql_store_col_in_innobase_format(
 		}
 	} else if (type == DATA_VARCHAR || type == DATA_VARMYSQL
 						|| type == DATA_BINARY) {
-		ptr = row_mysql_read_var_ref(&col_len, mysql_data); 
+		ptr = row_mysql_read_var_ref(&col_len, mysql_data);
+		
+		/* Remove trailing spaces */
+		while (col_len > 0 && ptr[col_len - 1] == ' ') {
+			col_len--;
+		} 
 
 	} else if (type == DATA_BLOB) {
 		ptr = row_mysql_read_blob_ref(&col_len, mysql_data, col_len);