diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-26 22:44:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-26 22:45:46 +0300 |
| commit | 8c81f24d1bedb11364288d42d5492e76816fe20a (patch) | |
| tree | aade13bca6207b89634b2b87db16e18301e9ec0e /sql/item_func.h | |
| parent | 8f643e2063c9890a353149f39ef85b2cf3151fd0 (diff) | |
| parent | 808f18c748a98dcc7df0b8154563153c8527d3f0 (diff) | |
| download | mariadb-git-8c81f24d1bedb11364288d42d5492e76816fe20a.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 133074122dd..7ee4b67b097 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1835,7 +1835,7 @@ public: Item_master_gtid_wait(THD *thd, Item *a, Item *b): Item_int_func(thd, a, b) {} longlong val_int(); const char *func_name() const { return "master_gtid_wait"; } - void fix_length_and_dec() { max_length=10+1+10+1+20+1; maybe_null=0;} + void fix_length_and_dec() { max_length=2; } bool check_vcol_func_processor(void *arg) { return mark_unsupported_function(func_name(), "()", arg, VCOL_IMPOSSIBLE); |