diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-06-11 18:08:51 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-06-11 18:08:51 -0600 |
| commit | 7afb6b58907754697908be4edeee311c56d5f944 (patch) | |
| tree | 49d6f993a717a356063abcfcad8d1193cf26adc9 /sql/field.h | |
| parent | 9ab7ce8dcba5f1a34eac9b2be468d511dd666542 (diff) | |
| download | mariadb-git-7afb6b58907754697908be4edeee311c56d5f944.tar.gz | |
Resolved merge conflicts
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 34ba540d2ea..7a64b04d5e5 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1563,7 +1563,7 @@ public: bit_ptr == ((Field_bit *)field)->bit_ptr && bit_ofs == ((Field_bit *)field)->bit_ofs); } - uint is_equal(create_field *new_field); + uint is_equal(Create_field *new_field); void move_field_offset(my_ptrdiff_t ptr_diff) { Field::move_field_offset(ptr_diff); |