• unknown's avatar
    Merge dl145k.mysql.com:/tmp/andrei/MERGE/mysql-4.1 · 8c7209e5
    unknown authored
    into  dl145k.mysql.com:/tmp/andrei/MERGE/5.0
    
    
    BitKeeper/deleted/.del-config.guess~fd94a91a69a8ce8:
      Auto merged
    BitKeeper/deleted/.del-config.sub~d18f703b655db258:
      Auto merged
    BitKeeper/deleted/.del-ltmain.sh~9b8b907df176f96e:
      Auto merged
    mysql-test/t/mysqlbinlog.test:
      manual merge, accepting 4.1 mods
    sql/sql_class.cc:
      use local, Ramil explained it's a backport
    8c7209e5
mysqlbinlog.test 5.36 KB