• unknown's avatar
    Merge mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.0-engines · b3aaae1c
    unknown authored
    into  mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.1-engines
    
    
    BitKeeper/deleted/.del-index_merge.result:
      Auto merged
    BitKeeper/deleted/.del-index_merge_ror.result:
      Auto merged
    mysql-test/include/index_merge_ror.inc:
      Auto merged
    sql/opt_range.cc:
      Use local
    b3aaae1c
index_merge_ror.inc 9.73 KB