diff options
| author | unknown <istruewing@stella.local> | 2008-03-14 12:02:11 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-14 12:02:11 +0100 |
| commit | e79249f81bbb7158fb263455e531bda4117b5fc9 (patch) | |
| tree | b52789d6b0503cf1a56ee2fea977be99a7287207 /sql/field.h | |
| parent | 28eb7e60d50795d110d4fe2d6477acdeb4c725d5 (diff) | |
| parent | 269ebe54211cf96c4e64fa7268a1414588ca1de8 (diff) | |
| download | mariadb-git-e79249f81bbb7158fb263455e531bda4117b5fc9.tar.gz | |
Manual merge
configure.in:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/partition_symlink.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/partition_info.cc:
Auto merged
sql/partition_info.h:
Auto merged
sql/rpl_rli.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_parse.cc:
Manual merge. Needs later fix. New code in create table was not
accepted. Needs to be added to mysql_create_table_no_lock().
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 2e8a27e579a..5457b7284e9 100644 --- a/sql/field.h +++ b/sql/field.h @@ -593,6 +593,8 @@ public: class Field_longstr :public Field_str { +protected: + int report_if_important_data(const char *ptr, const char *end); public: Field_longstr(uchar *ptr_arg, uint32 len_arg, uchar *null_ptr_arg, uchar null_bit_arg, utype unireg_check_arg, |