• unknown's avatar
    Merge mysql.com:/opt/local/work/tmp_merge · 38c4f0b7
    unknown authored
    into  mysql.com:/opt/local/work/mysql-5.1-merge
    
    
    mysql-test/r/trigger.result:
      Auto merged
    mysql-test/t/trigger.test:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item.h:
      Auto merged
    sql/item_create.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/sp_head.h:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/mysqld.cc:
      Manual merge.
    sql/sp_head.cc:
      Manual merge.
    sql/sql_parse.cc:
      Manual merge.
    38c4f0b7
sql_parse.cc 221 KB