diff options
| author | unknown <igor@rurik.mysql.com> | 2006-09-20 09:47:36 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-09-20 09:47:36 -0700 |
| commit | 54bb1045ca5fdcba99c3f8f8dfcb6a7139917614 (patch) | |
| tree | d2f8ab56ede9c4ab30a543b216cb72e1fb56d4d7 /sql/field.h | |
| parent | c358e322f8e63037154927ef168212857ff52629 (diff) | |
| parent | 0f50a8a7fea053127f236ca4956bba58370a8d81 (diff) | |
| download | mariadb-git-54bb1045ca5fdcba99c3f8f8dfcb6a7139917614.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
sql/field.h:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index 65e747e9d2f..b79c2bf77a8 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1432,6 +1432,8 @@ public: uint decimals, flags, pack_length, key_length; Field::utype unireg_check; TYPELIB *interval; // Which interval to use + TYPELIB *save_interval; // Temporary copy for the above + // Used only for UCS2 intervals List<String> interval_list; CHARSET_INFO *charset; Field::geometry_type geom_type; |