summaryrefslogtreecommitdiff
path: root/sql/sql_time.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-02-07 13:59:31 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2019-02-07 13:59:31 +0100
commit65c5ef9b495bac078ad2a502a75801c7cfe5b95a (patch)
tree266859fc4e22dcd18112a25e8a3e4f9d93a043a0 /sql/sql_time.cc
parent7293ce0ee81f05b1ec3ac9ddcc88bfbee4030e55 (diff)
parent625994b7cc4ebd0bc2652ae80b93386aa4b766ac (diff)
downloadmariadb-git-65c5ef9b495bac078ad2a502a75801c7cfe5b95a.tar.gz
dirty merge
Diffstat (limited to 'sql/sql_time.cc')
-rw-r--r--sql/sql_time.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_time.cc b/sql/sql_time.cc
index 739a95ce9c8..73cf14650a1 100644
--- a/sql/sql_time.cc
+++ b/sql/sql_time.cc
@@ -954,7 +954,7 @@ void make_truncated_value_warning(THD *thd,
if (field_name)
{
const char *db_name= s->db.str;
- const char *table_name= s->error_table_name();
+ const char *table_name= s->table_name.str;
if (!db_name)
db_name= "";