diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
| commit | 4f435bddfd44d40999f88685c61cc04e319d8d6c (patch) | |
| tree | f9d0655a0d901b87f918a736741144b502cba3f6 /storage/example | |
| parent | 8c2bcdf85ff753bceeb5b235f3605e348e6f9e1d (diff) | |
| parent | 6ca4ca7d37fed3b3da18666768de6a2f8c34bc7b (diff) | |
| download | mariadb-git-4f435bddfd44d40999f88685c61cc04e319d8d6c.tar.gz | |
5.3 merge
Diffstat (limited to 'storage/example')
| -rw-r--r-- | storage/example/ha_example.cc | 8 | ||||
| -rw-r--r-- | storage/example/ha_example.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index 8566b013851..5101d73d23c 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -1,4 +1,5 @@ -/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +/* + Copyright (c) 2004, 2010, Oracle and/or its affiliates This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -991,7 +992,6 @@ bool ha_example::check_if_incompatible_data(HA_CREATE_INFO *info, uint table_changes) { ha_table_option_struct *param_old, *param_new; - uint i; DBUG_ENTER("ha_example::check_if_incompatible_data"); /* This example shows how custom engine specific table and field @@ -1021,7 +1021,8 @@ bool ha_example::check_if_incompatible_data(HA_CREATE_INFO *info, param_new->boolparam != param_old->boolparam) DBUG_RETURN(COMPATIBLE_DATA_NO); - for (i= 0; i < table->s->fields; i++) +#ifndef DBUG_OFF + for (uint i= 0; i < table->s->fields; i++) { ha_field_option_struct *f_old, *f_new; f_old= table->s->field[i]->option_struct; @@ -1041,6 +1042,7 @@ bool ha_example::check_if_incompatible_data(HA_CREATE_INFO *info, else DBUG_PRINT("info", ("old field %i did not changed", i)); } +#endif DBUG_RETURN(COMPATIBLE_DATA_YES); } diff --git a/storage/example/ha_example.h b/storage/example/ha_example.h index 08af1922662..ca8ca5ff293 100644 --- a/storage/example/ha_example.h +++ b/storage/example/ha_example.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +/* + Copyright (c) 2004, 2010, Oracle and/or its affiliates This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |