From 2219ada7f63f6e528a646864d5e6633857bec801 Mon Sep 17 00:00:00 2001
From: "sergefp@mysql.com" <>
Date: Wed, 26 Oct 2005 00:56:17 +0400
Subject: [PATCH] BUG#14139: When handling "CREATE TABLE(field_X type_spec,...)
 SELECT smth AS field_X, ...." avoid multiplying length of field_X by
 charset->mbmaxlen twice when calculating space required for field_X in the
 new table.

---
 mysql-test/r/create.result | 11 +++++++++++
 mysql-test/t/create.test   |  8 ++++++++
 sql/field.cc               | 12 ++++++++++++
 sql/field.h                |  8 ++++++++
 sql/sql_table.cc           |  4 ++--
 5 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 6edd4cbc48f..55ad6e3304a 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -621,3 +621,14 @@ create table if not exists t1 (a int);
 Warnings:
 Note	1050	Table 't1' already exists
 drop table t1;
+create table t1 (
+a varchar(112) charset utf8 collate utf8_bin not null,
+primary key (a)
+) select 'test' as a ;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` varchar(112) character set utf8 collate utf8_bin NOT NULL default '',
+  PRIMARY KEY  (`a`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 73184853d1a..966be8b58a3 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -526,4 +526,12 @@ create table t1 (a int);
 create table if not exists t1 (a int);
 drop table t1;
 
+# BUG#14139
+create table t1 (
+  a varchar(112) charset utf8 collate utf8_bin not null,
+  primary key (a)
+) select 'test' as a ;
+show create table t1;
+drop table t1;
+
 # End of 4.1 tests
diff --git a/sql/field.cc b/sql/field.cc
index 6d2f92e27ea..35dfa4cac18 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -6511,8 +6511,20 @@ bool Field_num::eq_def(Field *field)
 ** Handling of field and create_field
 *****************************************************************************/
 
+/*
+  Convert create_field::length from number of characters to number of bytes
+
+  SYNOPSIS
+    create_field::create_length_to_internal_length()
+  
+  DESCRIPTION
+    Convert create_field::length from number of characters to number of bytes,
+    save original value in chars_length.
+*/
+
 void create_field::create_length_to_internal_length(void)
 {
+  chars_length= length;
   switch (sql_type) {
   case MYSQL_TYPE_TINY_BLOB:
   case MYSQL_TYPE_MEDIUM_BLOB:
diff --git a/sql/field.h b/sql/field.h
index ba963418c7a..04f1bd68c7a 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1180,7 +1180,15 @@ public:
   LEX_STRING comment;			// Comment for field
   Item	*def;				// Default value
   enum	enum_field_types sql_type;
+  /*
+    At various stages in execution this can be length of field in bytes or
+    max number of characters. 
+  */
   uint32 length;
+  /*
+    The value of 'length' before a call to create_length_to_internal_length
+  */
+  uint32 chars_length;
   uint decimals,flags,pack_length;
   Field::utype unireg_check;
   TYPELIB *interval;			// Which interval to use
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 01126043764..dcbc2018b49 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -643,8 +643,8 @@ int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
 	  sql_field->charset=		(dup_field->charset ?
 					 dup_field->charset :
 					 create_info->default_table_charset);
-	  sql_field->length=		dup_field->length;
-	  sql_field->pack_length=	dup_field->pack_length;
+	  sql_field->length=		dup_field->chars_length;
+          sql_field->pack_length=	dup_field->pack_length;
 	  sql_field->create_length_to_internal_length();
 	  sql_field->decimals=		dup_field->decimals;
 	  sql_field->flags=		dup_field->flags;