Re: bk commit into 5.1 tree (gluh:1.2569)

[Sergei Golubchik]

Hi!

Great, thanks!
Ok to push, with a couple of changes, see below.

On Aug 02, gluh@stripped wrote:
> diff -Nrup a/sql/table.h b/sql/table.h
> --- a/sql/table.h	2007-07-23 21:09:45 +05:00
> +++ b/sql/table.h	2007-08-02 19:01:19 +05:00
> @@ -995,6 +1000,10 @@ struct TABLE_LIST
>    */
>    uint8 trg_event_map;
>  
> +  uint i_s_requested_object;
> +  bool has_db_lookup_value;
> +  bool has_table_lookup_value;
> +  uint table_open_method;

that's much more clear, thanks :)

>    enum enum_schema_table_state schema_table_state;
>    void calc_md5(char *buffer);
>    void set_underlying_merge();
> diff -Nrup a/sql/sql_show.cc b/sql/sql_show.cc
> --- a/sql/sql_show.cc	2007-07-18 22:37:54 +05:00
> +++ b/sql/sql_show.cc	2007-08-02 19:01:18 +05:00
.....
> +
> +/**
> +  @brief          Fill I_S tables whose data is retrieved from
> +                  FRM, data and index files 
> +

you had "from FRM, MYD, and MYI files" and I asked to change it, to
remove MyISAM specifics. "data and index files" is not much better.
Change, for example, to
... whose data are retrieved from frm files and storage engine

> +  @details        The information schema tables are internally represented as
> +                  temporary tables that are filled at query execution time.
> +                  Those I_S tables whose data is retrieved from
> +                  FRM, data and index files are filled by the function
> +                  get_all_tables().
> +
> @@ -5305,479 +5815,537 @@ int fill_schema_files(THD *thd, TABLE_LI
.....
>    {"CHECKSUM", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
> -   (MY_I_S_MAYBE_NULL | MY_I_S_UNSIGNED), "Checksum"},
> -  {"CREATE_OPTIONS", 255, MYSQL_TYPE_STRING, 0, 1, "Create_options"},
> -  {"TABLE_COMMENT", 80, MYSQL_TYPE_STRING, 0, 0, "Comment"},
> -  {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
> +   (MY_I_S_MAYBE_NULL | MY_I_S_UNSIGNED), "Checksum", OPEN_FULL_TABLE},
> +  {"CREATE_OPTIONS", 255, MYSQL_TYPE_STRING, 0, 1, "Create_options",
> +   OPEN_FRM_ONLY},
> +  {"TABLE_COMMENT", 80, MYSQL_TYPE_STRING, 0, 0, "Comment", OPEN_FULL_TABLE},

I believed we agreed to use OPEN_FRM_ONLY for TABLE_COMMENT field.

> +  {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}
>  };

Regards / Mit vielen GrЭssen,
Sergei

-- 
   __  ___     ___ ____  __
  /  |/  /_ __/ __/ __ \/ /   Sergei Golubchik <serg@stripped>
 / /|_/ / // /\ \/ /_/ / /__  Principal Software Developer
/_/  /_/\_, /___/\___\_\___/  MySQL GmbH, Radlkoferstr. 2, D-81373 MЭnchen
       <___/                  GeschДftsfЭhrer: Kaj ArnЖ - HRB MЭnchen 162140