diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 10:25:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 10:25:34 +0300 |
| commit | c016ea660ede8b7ff75f8ca65f73e2958262263a (patch) | |
| tree | c8bc8579c738792f0769ea70f49348dc1baf51b3 /sql/field.h | |
| parent | 1bbe8c5e0f6823acd4780d7563e8c02f8b4c5a01 (diff) | |
| parent | 2931fd2917cc130e34e5f3d9d6c571a2b013e49c (diff) | |
| download | mariadb-git-c016ea660ede8b7ff75f8ca65f73e2958262263a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 053236133d0..35f531ac4ab 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1254,7 +1254,6 @@ public: uchar *new_null_ptr, uint new_null_bit); Field *clone(MEM_ROOT *mem_root, TABLE *new_table); Field *clone(MEM_ROOT *mem_root, TABLE *new_table, my_ptrdiff_t diff); - Field *clone(MEM_ROOT *mem_root, my_ptrdiff_t diff); inline void move_field(uchar *ptr_arg,uchar *null_ptr_arg,uchar null_bit_arg) { ptr=ptr_arg; null_ptr=null_ptr_arg; null_bit=null_bit_arg; |