• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · eef5f17b
    unknown authored
    into  mysql.com:/home/dlenev/src/mysql-5.0-bg8406
    
    
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/r/trigger.result:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    mysql-test/t/trigger.test:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sp_head.h:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_trigger.cc:
      Auto merged
    mysql-test/r/sp-error.result:
      Manual merge.
    mysql-test/t/sp-error.test:
      Manual merge.
    sql/sp_head.cc:
      Manual merge.
    sql/sql_yacc.yy:
      Manual merge.
    eef5f17b
sql_lex.cc 51.8 KB