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

Copy arguments given to mysql_server_init()

Browse Source 
Made keybuff_size longlong (To make show variables work similar on 32
and 64 bit systems)
Fixed some 'not initalized variable errors' in multi-table-update.
Fixed memory leak in multi-table-update.
Now all tests works under valgrind without any errors.


libmysqld/lib_sql.cc:
  Copy arguments given to mysql_server_init()
mysql-test/r/temp_table.result:
  Update test results (after merge form 3.23)
sql/handler.cc:
  Made keybuff_size longlong
sql/mysql_priv.h:
  Made keybuff_size longlong
sql/mysqld.cc:
  Made keybuff_size longlong
sql/set_var.cc:
  Made keybuff_size longlong
sql/set_var.h:
  Made keybuff_size longlong
sql/sql_select.cc:
  Simple cleanup
sql/sql_select.h:
  Make TMP_TABLE_PARAM to be allocated through Sql_alloc
sql/sql_update.cc:
  Fixed some 'not initalized variable errors' in multi-table-update.
  Fixed memory leak in multi-table-update
This commit is contained in:
unknown
2002-12-05 16:38:49 +02:00
parent 5fdd9f878f
commit fdb093fc47
10 changed files with 109 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_select.cc
View File

@ -2848,9 +2848,7 @@ join_free(JOIN *join)
}
join->group_fields.delete_elements();
join->tmp_table_param.copy_funcs.delete_elements();
if (join->tmp_table_param.copy_field) // Because of bug in ecc
delete [] join->tmp_table_param.copy_field;
join->tmp_table_param.copy_field=0;
join->tmp_table_param.cleanup();
DBUG_VOID_RETURN;
}
@ -3699,13 +3697,13 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
NullS))
{
bitmap_clear_bit(&temp_pool, temp_pool_slot);
DBUG_RETURN(NULL); /* purecov: inspected */
DBUG_RETURN(NULL); /* purecov: inspected */
}
if (!(param->copy_field=copy=new Copy_field[field_count]))
{
bitmap_clear_bit(&temp_pool, temp_pool_slot);
my_free((gptr) table,MYF(0)); /* purecov: inspected */
DBUG_RETURN(NULL); /* purecov: inspected */
my_free((gptr) table,MYF(0)); /* purecov: inspected */
DBUG_RETURN(NULL); /* purecov: inspected */
}
param->funcs=copy_func;
strmov(tmpname,path);