diff options
| author | Michael Widenius <monty@mysql.com> | 2010-07-19 21:53:28 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2010-07-19 21:53:28 +0300 |
| commit | a35b48632363dbc13edf4ca6d694a630909cf92e (patch) | |
| tree | 522304e12b1d69fb406d1675cc5adc3777753eb8 /storage/example | |
| parent | ad18f1d6a2b7f4f0358f3b372529dcc19f9e90b3 (diff) | |
| download | mariadb-git-a35b48632363dbc13edf4ca6d694a630909cf92e.tar.gz | |
Fixed compiler and valgrind warnings
mysql-test/valgrind.supp:
Added suppression for memory leak in dlsym() on work-amd64
plugin/auth/auth_socket.c:
Fixed compiler warning (wrong macro usage)
storage/example/ha_example.cc:
Fixed compiler warnings
storage/sphinx/ha_sphinx.cc:
Fixed compiler warnings
Diffstat (limited to 'storage/example')
| -rw-r--r-- | storage/example/ha_example.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index 6b9725dfde4..5ad6a45a744 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -367,8 +367,10 @@ int ha_example::open(const char *name, int mode, uint test_if_locked) DBUG_RETURN(1); thr_lock_data_init(&share->lock,&lock,NULL); +#ifndef DBUG_OFF example_table_options_struct *options= (example_table_options_struct *)table->s->option_struct; +#endif DBUG_ASSERT(options); DBUG_PRINT("info", ("strparam: '%-.64s' ullparam: %llu enumparam: %u "\ @@ -896,6 +898,7 @@ ha_rows ha_example::records_in_range(uint inx, key_range *min_key, int ha_example::create(const char *name, TABLE *table_arg, HA_CREATE_INFO *create_info) { +#ifndef DBUG_OFF example_table_options_struct *options= (example_table_options_struct *)table_arg->s->option_struct; DBUG_ENTER("ha_example::create"); @@ -918,10 +921,10 @@ int ha_example::create(const char *name, TABLE *table_arg, (field_options->compex_param_to_parse_it_in_engine ? field_options->compex_param_to_parse_it_in_engine : "<NULL>"))); - } DBUG_RETURN(0); +#endif } |