3597 Tor Didriksen 2011-02-03
Bug #59111 gis crashes when server is compiled without performance schema
The crash was due to pointer aliasing, nothing to do with perf.schema.
@ sql/gcalc_slicescan.cc
Use proper type for result_hook in new_slice().
Then static_cast<> before returning result (this was the bug).
Cleanup some C-style casts, use reinterpret_cast instead.
Move declarations closer to where they are actually needed.
Remove the recursion between alloc_new_block() and new_item()
@ sql/gcalc_slicescan.h
Remove the recursion between alloc_new_block() and new_item()
(it looked suspicious)
modified:
sql/gcalc_slicescan.cc
sql/gcalc_slicescan.h
3596 Magne Mahre 2011-02-03
Bug#58915 Valgrind warning in MYSQLparse()
Under execution of a CHANGE MASTER command,
a dynamic array (lex.bi.repl_ignore_server_ids)
in the LEX replication information structure is
allocated.
Under normal operation, this array was deallocated
at the end of execution (end of change_master() ).
Certain error conditions (most notable if the
client thread is killed) would abort the execution
before change_master() is called, resulting in
memory block being lost.
The deallocation has been moved to
THD::cleanup_after_query() to ensure that correct
deallocation happens in all situations.
@ sql/rpl_slave.cc
Moved deallocation to THD::cleanup_after_query
@ sql/sql_class.cc
Moved cleanup code here (from change_master())
@ sql/sql_lex.cc
Initialize replication information structure
to a known (0) value.
modified:
sql/rpl_slave.cc
sql/sql_class.cc
sql/sql_lex.cc
sql/sql_yacc.yy
=== modified file 'sql/gcalc_slicescan.cc'
--- a/sql/gcalc_slicescan.cc 2010-11-08 11:34:12 +0000
+++ b/sql/gcalc_slicescan.cc 2011-02-03 13:51:02 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2011 Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -62,15 +62,15 @@ void Gcalc_dyn_list::format_blk(void* bl
}
-Gcalc_dyn_list::Item *Gcalc_dyn_list::alloc_new_blk()
+bool Gcalc_dyn_list::alloc_new_blk()
{
void *new_block= my_malloc(m_blk_size, MYF(MY_WME));
if (!new_block)
- return NULL;
+ return true;
*m_blk_hook= new_block;
m_blk_hook= (void**)new_block;
format_blk(new_block);
- return new_item();
+ return false;
}
@@ -260,8 +260,8 @@ Gcalc_scan_iterator::Gcalc_scan_iterator
Gcalc_scan_iterator::point
*Gcalc_scan_iterator::new_slice(Gcalc_scan_iterator::point *example)
{
- point *result= NULL;
- Gcalc_dyn_list::Item **result_hook= (Gcalc_dyn_list::Item **)&result;
+ Gcalc_dyn_list::Item *item_result= NULL;
+ Gcalc_dyn_list::Item **result_hook= &item_result;
while (example)
{
*result_hook= new_slice_point();
@@ -269,6 +269,7 @@ Gcalc_scan_iterator::point
example= example->get_next();
}
*result_hook= NULL;
+ point *result= static_cast<point*>(item_result);
return result;
}
@@ -321,13 +322,10 @@ static inline bool slice_first(const Gca
int Gcalc_scan_iterator::insert_top_point()
{
- point *sp= m_slice1;
- Gcalc_dyn_list::Item **prev_hook= (Gcalc_dyn_list::Item **)&m_slice1;
- point *sp1;
point *sp0= new_slice_point();
-
if (!sp0)
return 1;
+
sp0->pi= m_cur_pi;
sp0->next_pi= m_cur_pi->left;
sp0->thread= m_cur_thread++;
@@ -338,7 +336,8 @@ int Gcalc_scan_iterator::insert_top_poin
m_event1= scev_thread;
/*Now just to increase the size of m_slice0 to be same*/
- if (!(sp1= new_slice_point()))
+ point *sp1= new_slice_point();
+ if (!sp1)
return 1;
sp1->next= m_slice0;
m_slice0= sp1;
@@ -354,15 +353,18 @@ int Gcalc_scan_iterator::insert_top_poin
Binary search could probably make things faster here,
but structures used aren't suitable, and the
scan is usually not really long */
- for (; sp && slice_first(sp, sp0);
- prev_hook= &sp->next, sp=sp->get_next())
- {}
+ point *sp= m_slice1;
+ point **prev_hook= &m_slice1;
+ for (; sp && slice_first(sp, sp0); sp=sp->get_next())
+ {
+ prev_hook= reinterpret_cast<point**>(&(sp->next));
+ }
if (m_cur_pi->right)
{
m_event1= scev_two_threads;
/*We have two threads so should decide which one will be first*/
- sp1= new_slice_point();
+ point *sp1= new_slice_point();
if (!sp1)
return 1;
sp1->pi= m_cur_pi;
@@ -549,7 +551,6 @@ int Gcalc_scan_iterator::add_intersectio
int Gcalc_scan_iterator::find_intersections()
{
point *sp1= m_slice1;
- Gcalc_dyn_list::Item **hook;
m_n_intersections= 0;
{
@@ -564,7 +565,8 @@ int Gcalc_scan_iterator::find_intersecti
}
}
- hook= (Gcalc_dyn_list::Item **)&m_intersections;
+ Gcalc_dyn_list::Item **hook=
+ reinterpret_cast<Gcalc_dyn_list::Item **>(&m_intersections);
bool intersections_found;
point *last_possible_isc= NULL;
=== modified file 'sql/gcalc_slicescan.h'
--- a/sql/gcalc_slicescan.h 2010-11-05 09:34:03 +0000
+++ b/sql/gcalc_slicescan.h 2011-02-03 13:51:02 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2011 Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -42,14 +42,14 @@ public:
Item *new_item()
{
Item *result;
- if (m_free)
- {
- result= m_free;
- m_free= m_free->next;
- }
- else
- result= alloc_new_blk();
+ if (!m_free && alloc_new_blk())
+ return NULL;
+
+ DBUG_ASSERT(m_free);
+ result= m_free;
+ m_free= m_free->next;
+ result->next= NULL;
return result;
}
inline void free_item(Item *item)
@@ -83,7 +83,7 @@ protected:
Item *m_free;
Item *m_keep;
- Item *alloc_new_blk();
+ bool alloc_new_blk();
void format_blk(void* block);
inline Item *ptr_add(Item *ptr, int n_items)
{
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (tor.didriksen:3596 to 3597) Bug#59111 | Tor Didriksen | 3 Feb |
