• unknown's avatar
    Merge mysql.com:/home/mydev/mysql-4.1-4100 · a3c014ca
    unknown authored
    into  mysql.com:/home/mydev/mysql-5.0-5000
    
    
    mysql-test/r/merge.result:
      Auto merged
    mysql-test/t/merge.test:
      Auto merged
    mysql-test/t/sql_mode.test:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    mysql-test/r/sql_mode.result:
      SCCS merged
    a3c014ca
merge.test 12 KB