diff options
author | igor@rurik.mysql.com <> | 2006-09-20 09:47:36 -0700 |
---|---|---|
committer | igor@rurik.mysql.com <> | 2006-09-20 09:47:36 -0700 |
commit | 2e2c5a20c0329ddf432435db25255a8fc047dbd2 (patch) | |
tree | d2f8ab56ede9c4ab30a543b216cb72e1fb56d4d7 /sql/field.h | |
parent | 20b3e8a2f83fc8458d651d97b92c92068ca16f15 (diff) | |
parent | d957636471fd05cc1af47d78ba199d253ae244b6 (diff) | |
download | mariadb-git-2e2c5a20c0329ddf432435db25255a8fc047dbd2.tar.gz |
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt
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; |