diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-15 22:44:41 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-15 22:44:41 +0200 |
| commit | d95cbe369c2a5d617884f795936ccbeb3c06ce6c (patch) | |
| tree | 7f9701cc92d16eacdb72de0f20e8ae618207b987 /sql/sql_show.cc | |
| parent | 9d68ccdeb8692b05d9cc0479d8d3757edbc49368 (diff) | |
| download | mariadb-git-d95cbe369c2a5d617884f795936ccbeb3c06ce6c.tar.gz | |
Fixed bug discovered by testcase for LP#618558 (original bug seams to be fixed):
- Fixed bug in pagecache_delete_internal() when deleting block that was flushed by another thread (fixed bug when block->next_used was unexpectedly null)
Fixed some using uninitialized memory warnings found by valgrind.
mysql-test/t/information_schema_all_engines-master.opt:
Added options to make slow test run faster
sql/sp.cc:
Fixed valgrind warning.
sql/sql_show.cc:
Fixed valgrind warning.
storage/maria/ma_bitmap.c:
Fixed wrong call parameter to pagecache_unlock_by_link() that caused assert crash in pagecache
storage/maria/ma_pagecache.c:
Fixed possible error in pagecache_wait_lock() when hash_link was not set. (We never hit this issue, but could be possible when two threads updates the same page.
Fixed bug in pagecache_delete_internal() when deleting block that was flushed by another thread (fixed bug when block->next_used was unexpectedly null)
Cleanup: moved pagecache_pthread_mutex_unlock() over comments and asserts to be just before pagecache_fwrite()
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 8266594081c..653428fa793 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3944,7 +3944,7 @@ static int get_schema_column_record(THD *thd, TABLE_LIST *tables, base_type [(dimension)] [unsigned] [zerofill]. For DATA_TYPE column we extract only base type. */ - tmp_buff= strchr(type.ptr(), '('); + tmp_buff= strchr(type.c_ptr_safe(), '('); if (!tmp_buff) /* if there is no dimention part then check the presence of |