List:Commits« Previous MessageNext Message »
From:Konstantin Osipov Date:April 25 2008 9:22pm
Subject:Re: bk commit into 6.1 tree (dlenev:1.2610) BUG#35533
View as plain text  
* dlenev@stripped <dlenev@stripped> [08/04/23 09:27]:
> --- a/sql/fk_dd.h	2008-03-20 19:46:47 +03:00
> +++ b/sql/fk_dd.h	2008-04-23 09:18:36 +04:00
> @@ -41,4 +41,7 @@ bool fk_drop_all_constraint_names_for_ta
>  bool fk_check_constraint_added(Foreign_key *fkey, List<Foreign_key>
> &fkey_list,
>                                 const char *db);
>  
> +
> +extern const char * const CNS_EXT;
> +

Maybe you should forward-declare it in mysql_priv.h, to avoid yet
another file-header dependency?
TRN_EXT is declared there.

>  #endif
> diff -Nrup a/sql/handler.cc b/sql/handler.cc
> --- a/sql/handler.cc	2008-03-13 12:07:32 +03:00
> +++ b/sql/handler.cc	2008-04-23 09:18:36 +04:00
> @@ -28,6 +28,7 @@
>  #include <myisampack.h>
>  #include <errno.h>
>  #include "backup/debug.h"
> +#include "fk_dd.h"
>  
>  #ifdef WITH_PARTITION_STORAGE_ENGINE
>  #include "ha_partition.h"
> @@ -5042,6 +5043,7 @@ TYPELIB *ha_known_exts(void)
>      known_extensions_id= mysys_usage_id;
>      found_exts.push_back((char*) TRG_EXT);
>      found_exts.push_back((char*) TRN_EXT);
> +    found_exts.push_back((char*) CNS_EXT);
>  
>      plugin_foreach(NULL, exts_handlerton,
>                     MYSQL_STORAGE_ENGINE_PLUGIN, &found_exts);

OK to push.

-- 
Konstantin Osipov                    Moscow, Russia
MySQL Server Runtime Team Lead       Database Group, Sun Microsystems
Thread
bk commit into 6.1 tree (dlenev:1.2610) BUG#35533dlenev23 Apr
  • Re: bk commit into 6.1 tree (dlenev:1.2610) BUG#35533Konstantin Osipov25 Apr