• unknown's avatar
    Merge mysql.com:/home/jimw/my/mysql-4.1-clean · d6e5fdf0
    unknown authored
    into  mysql.com:/home/jimw/my/mysql-5.0-clean
    
    
    mysql-test/r/bdb.result:
      Resolve conflicts
    mysql-test/t/bdb.test:
      Resolve conflicts
    sql/sql_delete.cc:
      Resolve conflicts
    sql/sql_insert.cc:
      Resolve conflicts
    sql/sql_update.cc:
      Resolve conflicts
    d6e5fdf0
sql_insert.cc 75.8 KB