diff options
| author | peter@mysql.com <> | 2002-11-25 13:34:52 +0300 |
|---|---|---|
| committer | peter@mysql.com <> | 2002-11-25 13:34:52 +0300 |
| commit | c47ef7450f8de0fa74edd74c057f9fdd04f01a0d (patch) | |
| tree | dc664d19cc5b2d87c9111047d715ad2c63e9a4c1 /sql/field.h | |
| parent | d2aa1fb8e76bcb439dd09597f9d85a165634d599 (diff) | |
| parent | 4601322e2de70a706599f48b8c3c425d767f4238 (diff) | |
| download | mariadb-git-c47ef7450f8de0fa74edd74c057f9fdd04f01a0d.tar.gz | |
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/field.h b/sql/field.h index 8c4c48968c4..9fc72cf56ec 100644 --- a/sql/field.h +++ b/sql/field.h @@ -126,10 +126,12 @@ public: Field *tmp= (Field*) memdup_root(root,(char*) this,size_of()); if (tmp) { - tmp->table=new_table; - tmp->key_start=tmp->part_of_key=tmp->part_of_sortkey=0; + tmp->table= new_table; + tmp->key_start= tmp->part_of_key= tmp->part_of_sortkey= 0; tmp->unireg_check=Field::NONE; - tmp->flags&= (NOT_NULL_FLAG | BLOB_FLAG | UNSIGNED_FLAG | ZEROFILL_FLAG | ENUM_FLAG | SET_FLAG); + tmp->flags&= (NOT_NULL_FLAG | BLOB_FLAG | UNSIGNED_FLAG | + ZEROFILL_FLAG | ENUM_FLAG | SET_FLAG); + tmp->table_name= new_table->table_name; tmp->reset_fields(); } return tmp; |