summaryrefslogtreecommitdiff
path: root/storage/xtradb/include/dict0mem.h
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-09-03 19:42:54 +0200
committerunknown <knielsen@knielsen-hq.org>2010-09-03 19:42:54 +0200
commitc21a7a6bb2bed5f159dfba64e7a5220a5ee78cab (patch)
treeaab22730a36718adb824289458f98b86006f5c32 /storage/xtradb/include/dict0mem.h
parent401c69e49babc293da30f833c18673f5f071eca3 (diff)
parent9ec2d5b6e510b9a3ad2fd54c37eb302c0121f9e3 (diff)
downloadmariadb-git-c21a7a6bb2bed5f159dfba64e7a5220a5ee78cab.tar.gz
Merge XtraDB from Percona server 5.1.49-12 into MariaDB.
Diffstat (limited to 'storage/xtradb/include/dict0mem.h')
-rw-r--r--storage/xtradb/include/dict0mem.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/include/dict0mem.h b/storage/xtradb/include/dict0mem.h
index ee3107a3be1..37c5a4a24fc 100644
--- a/storage/xtradb/include/dict0mem.h
+++ b/storage/xtradb/include/dict0mem.h
@@ -382,7 +382,7 @@ initialized to 0, NULL or FALSE in dict_mem_table_create(). */
struct dict_table_struct{
dulint id; /*!< id of the table */
mem_heap_t* heap; /*!< memory heap */
- const char* name; /*!< table name */
+ char* name; /*!< table name */
const char* dir_path_of_temp_table;/*!< NULL or the directory path
where a TEMPORARY table that was explicitly
created by a user should be placed if