-
unknown authored
into mysql.com:/home/ram/work/b32676/b32676.5.1 sql/sql_insert.cc: Auto merged mysql-test/r/delayed.result: manual merge. mysql-test/t/delayed.test: manual merge.
b908c222
into mysql.com:/home/ram/work/b32676/b32676.5.1 sql/sql_insert.cc: Auto merged mysql-test/r/delayed.result: manual merge. mysql-test/t/delayed.test: manual merge.