• unknown's avatar
    Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 95754006
    unknown authored
    into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
    
    
    BitKeeper/deleted/.del-disabled.def:
      Delete: mysql-test/t/disabled.def
    libmysqld/lib_sql.cc:
      Auto merged
    mysql-test/t/innodb.test:
      Auto merged
    sql/ha_innodb.cc:
      Auto merged
    mysql-test/r/innodb.result:
      Manual merge from 4.1 to 5.0
    mysql-test/r/select.result:
      Manual merge from 4.1 to 5.0
    mysql-test/t/select.test:
      Manual merge from 4.1 to 5.0
    sql/item.cc:
      Manual merge from 4.1 to 5.0
    95754006
lib_sql.cc 20.5 KB