diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-27 17:50:08 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-27 17:50:08 +0100 |
| commit | dfc1901e806bdda129b8943585f2ccfc8c207322 (patch) | |
| tree | 5f04d49beb42adafd5fb860d62831e5f3b3c643d /sql/create_options.cc | |
| parent | effed09bd7d8081704eaa017060da84c32e3bf29 (diff) | |
| download | mariadb-git-dfc1901e806bdda129b8943585f2ccfc8c207322.tar.gz | |
compilation fixes
cmake/maintainer.cmake:
don't do -Werror just yet
config.h.cmake:
according to MSDN PSAPI_VERSION should be 1 in a portable application
mysys/my_thr_init.c:
first, reset THR_KEY_mysys, and then free dbug data,
because dbug data are automacially created on the next dbug call,
unless THR_KEY_mysys is null.
Diffstat (limited to 'sql/create_options.cc')
| -rw-r--r-- | sql/create_options.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/create_options.cc b/sql/create_options.cc index 8e46bb583a5..9a6f6b5cf7c 100644 --- a/sql/create_options.cc +++ b/sql/create_options.cc @@ -547,7 +547,7 @@ my_bool engine_table_options_frm_read(const uchar *buff, uint length, TABLE_SHARE *share) { const uchar *buff_end= buff + length; - engine_option_value *end; + engine_option_value *UNINIT_VAR(end); MEM_ROOT *root= &share->mem_root; uint count; DBUG_ENTER("engine_table_options_frm_read"); |