• unknown's avatar
    Merge mysql.com:/usr/home/bar/mysql-5.0 · f3a4f0af
    unknown authored
    into  mysql.com:/usr/home/bar/mysql-5.1-new
    
    
    mysql-test/r/information_schema.result:
      Auto merged
    mysql-test/t/information_schema.test:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/share/charsets/Index.xml:
      Auto merged
    storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
      Auto merged
    storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
      Auto merged
    f3a4f0af
information_schema.result 42.1 KB