• unknown's avatar
    Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · 7443227b
    unknown authored
    into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
    
    
    sql/sql_load.cc:
      Auto merged
    mysql-test/r/rpl_user_variables.result:
      Manual merge
    mysql-test/t/rpl_user_variables.test:
      Manual merge
    sql/item_func.cc:
      Manual merge
    sql/log.cc:
      Manual merge
    sql/sp_head.cc:
      Manual merge
    sql/sql_class.cc:
      Manual merge
    sql/sql_class.h:
      Manual merge
    7443227b
sql_class.cc 79.1 KB