diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-13 13:30:03 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-13 13:30:03 +0300 |
| commit | db0cfba638383569b1e30765e2d36e0707bfb930 (patch) | |
| tree | d56bf3ec5c5804b2bd15a5eceddb14b5520b3d2e /sql/sql_base.cc | |
| parent | 0a9216835f406947fb4d492616da4cda75e5e113 (diff) | |
| parent | a057b504904c3e6ab1e3006c081b4fb23faaf1d4 (diff) | |
| download | mariadb-git-db0cfba638383569b1e30765e2d36e0707bfb930.tar.gz | |
Merged with lp:maria revision #3766
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index c9630aef126..931fb07f70c 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -6864,7 +6864,7 @@ find_field_in_tables(THD *thd, Item_ident *item, We can't do this in Item_field as this would change the 'name' of the item which may be used in the select list */ - strmake(name_buff, db, sizeof(name_buff)-1); + strmake_buf(name_buff, db); my_casedn_str(files_charset_info, name_buff); db= name_buff; } @@ -8437,7 +8437,7 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name, We can't do this in Item_field as this would change the 'name' of the item which may be used in the select list */ - strmake(name_buff, db_name, sizeof(name_buff)-1); + strmake_buf(name_buff, db_name); my_casedn_str(files_charset_info, name_buff); db_name= name_buff; } |