diff options
| author | Monty <monty@mariadb.org> | 2015-08-27 10:07:32 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-08-27 22:29:11 +0300 |
| commit | 3bca8db4f90cd9a505b99009c44594c0fb1ec353 (patch) | |
| tree | a96ef13450eeb6a9b420e592534044b44872f97e /sql/sql_db.cc | |
| parent | 3cb578c001b2feabd2410f281d20eb6566371453 (diff) | |
| download | mariadb-git-3bca8db4f90cd9a505b99009c44594c0fb1ec353.tar.gz | |
MDEV-6152: Remove calls to current_thd while creating Item
- Part 4: Removing calls to sql_alloc() and sql_calloc()
Other things:
- Added current_thd in some places to make it clear that it's called (easier to remove later)
- Move memory allocation from Item_func_case::fix_length_and_dec() to Item_func_case::fix_fields()
- Added mem_root to some new calls
- Fixed some wrong UNINIT_VAR() calls
- Fixed a bug in generate_partition_syntax() in case of errors
- Added mem_root to argument to new thread_info
- Simplified my_parse_error() call in sql_yacc.yy
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 74cbc336896..2ba67cb1b00 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -1721,7 +1721,7 @@ bool mysql_upgrade_db(THD *thd, LEX_STRING *old_db) table_str.length= filename_to_tablename(file->name, tname, sizeof(tname)-1); - table_str.str= (char*) sql_memdup(tname, table_str.length + 1); + table_str.str= (char*) thd->memdup(tname, table_str.length + 1); Table_ident *old_ident= new Table_ident(thd, *old_db, table_str, 0); Table_ident *new_ident= new Table_ident(thd, new_db, table_str, 0); if (!old_ident || !new_ident || |