• unknown's avatar
    Manual merge. · b0156f1f
    unknown authored
    
    client/mysqltest.c:
      Auto merged
    mysql-test/r/grant.result:
      Auto merged
    mysql-test/r/information_schema.result:
      Auto merged
    sql/lex.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    b0156f1f
information_schema.result 25.2 KB