• unknown's avatar
    Merge mysql.com:/home/mydev/mysql-4.1-4100 · 2f0d1f34
    unknown authored
    into  mysql.com:/home/mydev/mysql-5.0-5000
    
    
    myisam/mi_search.c:
      Auto merged
    mysql-test/r/alter_table.result:
      Auto merged
    mysql-test/t/alter_table.test:
      Auto merged
    mysql-test/t/innodb.test:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    mysql-test/r/innodb.result:
      Hand merged.
    mysql-test/r/key.result:
      Hand merged.
    mysql-test/r/myisam.result:
      Hand merged.
    mysql-test/t/key.test:
      Hand merged.
    mysql-test/t/myisam.test:
      Hand merged.
    sql/sql_delete.cc:
      Hand merged.
    sql/sql_parse.cc:
      Hand merged.
    2f0d1f34
sql_delete.cc 23.8 KB