database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-02-19 17:41:13 +02:00
parent a4cd91c526 88b6dc4db5
commit fc124778ea
211 changed files with 6240 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/field.cc
View File

@ -8945,7 +8945,7 @@ int Field_geom::store(const char *from, size_t length, CHARSET_INFO *cs)
(uint32) geom_type != wkb_type)
{
const char *db= table->s->db.str;
const char *tab_name= table->s->error_table_name();
const char *tab_name= table->s->table_name.str;
if (!db)
db= "";
@ -11251,7 +11251,7 @@ void Field::set_warning_truncated_wrong_value(const char *type_arg,
{
THD *thd= get_thd();
const char *db_name= table->s->db.str;
const char *table_name= table->s->error_table_name();
const char *table_name= table->s->table_name.str;
if (!db_name)
db_name= "";