• unknown's avatar
    Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 12327532
    unknown authored
    into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
    
    
    client/mysqldump.c:
      Auto merged
    mysql-test/include/have_lowercase0.inc:
      Auto merged
    mysql-test/t/lowercase_table3.test:
      Auto merged
    mysql-test/t/mysql_protocols.test:
      Auto merged
    mysql-test/t/rpl_change_master.test:
      Auto merged
    mysql-test/t/rpl_drop_db.test:
      Auto merged
    mysql-test/t/rpl_error_ignored_table.test:
      Auto merged
    mysql-test/t/rpl_loaddata.test:
      Auto merged
    mysql-test/t/rpl_log.test:
      Auto merged
    mysql-test/t/rpl_max_relay_size.test:
      Auto merged
    mysql-test/t/rpl_replicate_do.test:
      Auto merged
    mysys/my_read.c:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    mysql-test/r/rpl000015.result:
      C
    mysql-test/r/rpl_log.result:
      ul
    mysql-test/r/rpl_max_relay_size.result:
      ul
    mysql-test/r/rpl_replicate_do.result:
      ul
    mysql-test/t/rpl000015.test:
      ul
    12327532
sql_class.cc 58.5 KB