summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2006-06-23 10:35:45 +0300
committerunknown <monty@mysql.com>2006-06-23 10:35:45 +0300
commit1e4d1f9b29ce3d6f31cd60fa260454e3fa705919 (patch)
tree25eb60f257432a77d52178c9f99e70b092a109bc /sql/handler.cc
parentfeb578bebd40ba4696d43ee2970c1218074450fc (diff)
downloadmariadb-git-1e4d1f9b29ce3d6f31cd60fa260454e3fa705919.tar.gz
Fixed memory leak (found by rpl_row_inexist_tbl)
sql/handler.cc: Made code more portable
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index a98618172be..0dfb31fba8c 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -3268,10 +3268,11 @@ namespace
if (thd->get_binlog_table_maps() == 0)
{
- MYSQL_LOCK *const locks[] = {
- thd->extra_lock, thd->lock, thd->locked_tables
- };
- for (my_ptrdiff_t i= 0 ; i < sizeof(locks)/sizeof(*locks) ; ++i )
+ MYSQL_LOCK *locks[3];
+ locks[0]= thd->extra_lock;
+ locks[1]= thd->lock;
+ locks[2]= thd->locked_tables;
+ for (uint i= 0 ; i < sizeof(locks)/sizeof(*locks) ; ++i )
{
MYSQL_LOCK const *const lock= locks[i];
if (lock == NULL)