• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · cf119987
    unknown authored
    into  mysql.com:/opt/local/work/mysql-5.0-17199
    
    
    mysql-test/r/create.result:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sp_head.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_db.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    mysql-test/r/sp.result:
      SCCS merged
    mysql-test/t/sp.test:
      SCCS merged
    cf119987
slave.cc 167 KB