• Sergey Glukhov's avatar
    5.0->5.1 bugteam merge · de175698
    Sergey Glukhov authored
    mysql-test/r/create.result:
      automerge
    mysql-test/t/create.test:
      automerge
    sql/mysql_priv.h:
      manual merge
    sql/sql_parse.cc:
      manual merge
    sql/sql_yacc.yy:
      manual merge
    de175698
sql_yacc.yy 398 KB