diff options
| author | <Li-Bing.Song@sun.com> | 2010-07-29 11:24:35 +0800 |
|---|---|---|
| committer | <Li-Bing.Song@sun.com> | 2010-07-29 11:24:35 +0800 |
| commit | c61ce4143c144765e4134490adc1e18f4cc600fc (patch) | |
| tree | 1cb3a7a9fbd34fa79c77f469bbe557f689c64a68 /sql/table.h | |
| parent | a0d5be1fd3d23174b62bafbb3ea838d4799fcdc4 (diff) | |
| parent | 2ad690fdf8a1141be8439a7e2d53974a0d3ec923 (diff) | |
| download | mariadb-git-c61ce4143c144765e4134490adc1e18f4cc600fc.tar.gz | |
Manual merge
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index 2bf390aee4d..7579a8a6df3 100644 --- a/sql/table.h +++ b/sql/table.h @@ -629,7 +629,7 @@ struct TABLE_SHARE #ifdef WITH_PARTITION_STORAGE_ENGINE /* filled in when reading from frm */ bool auto_partitioned; - const char *partition_info_str; + char *partition_info_str; uint partition_info_str_len; uint partition_info_buffer_size; handlerton *default_part_db_type; |