• unknown's avatar
    Merge updates. · 12eb42ac
    unknown authored
    
    mysql-test/r/grant2.result:
      Merge update:  Change between versions, it appears.
    mysql-test/r/heap_btree.result:
      Merge update:  Add deterministic ordering of data, as the order is different 
      between versions.
    mysql-test/r/mysql_client.result:
      Merge update: Help options changed between versions.
    mysql-test/t/heap_btree.test:
      Merge update:  Add deterministic ordering of data, as the order is different 
      between versions.
    BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
      Delete: mysql-test/t/bug20328.test
    BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
      Delete: mysql-test/r/bug20328.result
    12eb42ac
grant2.result 17 KB