• unknown's avatar
    Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 · 8c342365
    unknown authored
    into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
    
    
    mysql-test/r/temp_table.result:
      Auto merged
    mysql-test/r/warnings.result:
      Auto merged
    sql/sql_db.cc:
      Auto merged
    client/mysqltest.c:
      Auto merged
    mysql-test/t/innodb.test:
      Auto merged
    sql/filesort.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    mysql-test/r/create.result:
      Merged from 4.1 to 5.0
    mysql-test/r/innodb.result:
      Merged from 4.1 to 5.0
    mysql-test/t/create.test:
      Merged from 4.1 to 5.0
    sql/item_cmpfunc.cc:
      Merged from 4.1 to 5.0
    sql/sql_table.cc:
      Merged from 4.1 to 5.0
    8c342365
temp_table.result 3.94 KB