• unknown's avatar
    Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92 · 2d35684e
    unknown authored
    into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss92
    
    
    mysql-test/t/ndb_read_multi_range.test:
      Auto merged
    configure.in:
      Merged
    mysql-test/r/innodb.result:
      Null merge
    mysql-test/t/innodb.test:
      Null merge
    sql/ha_innodb.cc:
      Null merge
    storage/innobase/btr/btr0sea.c:
      Null merge
    storage/innobase/dict/dict0dict.c:
      Null merge
    storage/innobase/dict/dict0load.c:
      Null merge
    storage/innobase/include/buf0buf.h:
      Null merge
    storage/innobase/include/dict0dict.h:
      Null merge
    storage/innobase/include/dict0load.h:
      Null merge
    storage/innobase/include/os0file.h:
      Null merge
    storage/innobase/include/rem0cmp.h:
      Null merge
    storage/innobase/include/srv0srv.h:
      Null merge
    storage/innobase/rem/rem0cmp.c:
      Null merge
    storage/innobase/row/row0ins.c:
      Null merge
    storage/innobase/row/row0mysql.c:
      Null merge
    storage/innobase/srv/srv0srv.c:
      Null merge
    storage/innobase/srv/srv0start.c:
      Null merge
    storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
      Auto-merge
    storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
      Auto-merge
    support-files/mysql.spec.sh:
      Auto-merge
    2d35684e
mysql.spec.sh 35.6 KB