diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
| commit | fa3b2dcb838a05f5c07b78c2fc518018c473a47f (patch) | |
| tree | b055b8d1c4471f9f8daad623d14e1af7b793f04c /sql/field_conv.cc | |
| parent | 199f2ce47eb508aa62e9b2fcf80c6536cb14f4f5 (diff) | |
| parent | fe0828b3b8193e086abe740572c9b0cb2b7da671 (diff) | |
| download | mariadb-git-fa3b2dcb838a05f5c07b78c2fc518018c473a47f.tar.gz | |
Manual merge of mysql-5.1-bugteam to
mysql-trunk-merge.
Conflicts:
Text conflict in sql/sql_priv.h
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 0bffde9671a..299865e6114 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -24,7 +24,8 @@ gives much more speed. */ -#include "mysql_priv.h" +#include "sql_priv.h" +#include "sql_class.h" // THD #include <m_ctype.h> static void do_field_eq(Copy_field *copy) |