Commit d42545fb authored by kostja@bodhi.(none)'s avatar kostja@bodhi.(none)
Browse files

Fix create.test in --ps-protocol broken by the previous push.

parent 7289eccf

sql/sql_table.cc

+0 −3
Original line number Diff line number Diff line
@@ -4775,9 +4775,6 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table, 
  DBUG_ENTER("mysql_create_like_table");





  /* CREATE TABLE ... LIKE is not allowed for views. */

  src_table->required_type= FRMTYPE_TABLE;



  /*

    By opening source table we guarantee that it exists and no concurrent

    DDL operation will mess with it. Later we also take an exclusive

sql/sql_yacc.yy

+12 −2
Original line number Diff line number Diff line
@@ -3577,20 +3577,30 @@ create2: 
        | LIKE table_ident

          {

            THD *thd= YYTHD;

            TABLE_LIST *src_table;

            LEX *lex= thd->lex;



            lex->create_info.options|= HA_LEX_CREATE_TABLE_LIKE;

            if (!lex->select_lex.add_table_to_list(thd, $2, NULL, 0, TL_READ))

            src_table= lex->select_lex.add_table_to_list(thd, $2, NULL, 0,

                                                         TL_READ);

            if (! src_table)

              MYSQL_YYABORT;

            /* CREATE TABLE ... LIKE is not allowed for views. */

            src_table->required_type= FRMTYPE_TABLE;

          }

        | '(' LIKE table_ident ')'

          {

            THD *thd= YYTHD;

            TABLE_LIST *src_table;

            LEX *lex= thd->lex;



            lex->create_info.options|= HA_LEX_CREATE_TABLE_LIKE;

            if (!lex->select_lex.add_table_to_list(thd, $3, NULL, 0, TL_READ))

            src_table= lex->select_lex.add_table_to_list(thd, $3, NULL, 0,

                                                         TL_READ);

            if (! src_table)

              MYSQL_YYABORT;

            /* CREATE TABLE ... LIKE is not allowed for views. */

            src_table->required_type= FRMTYPE_TABLE;

          }

        ;