From b430133bb9549681147f806ba3048c382837a595 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 23 May 2017 15:35:32 +0200 Subject: [PATCH] MDEV-12844 numerous issues in MASTER_GTID_WAIT() --- sql/item_func.cc | 2 +- sql/item_func.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/item_func.cc b/sql/item_func.cc index 5ad55e99b5b..b544f78fc12 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3959,6 +3959,7 @@ longlong Item_master_gtid_wait::val_int() { DBUG_ASSERT(fixed == 1); longlong result= 0; + String *gtid_pos = args[0]->val_str(&value); if (args[0]->null_value) { @@ -3970,7 +3971,6 @@ longlong Item_master_gtid_wait::val_int() #ifdef HAVE_REPLICATION THD* thd= current_thd; longlong timeout_us; - String *gtid_pos = args[0]->val_str(&value); if (arg_count==2 && !args[1]->null_value) timeout_us= (longlong)(1e6*args[1]->val_real()); diff --git a/sql/item_func.h b/sql/item_func.h index 4d58e974a75..f44c5d14cda 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1669,7 +1669,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(uchar *int_arg) { return trace_unsupported_by_check_vcol_func_processor(func_name());