-
unknown authored
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 mysql-test/r/myisam.result: Manual merge. mysql-test/t/myisam.test: Manual merge. sql/sql_update.cc: Manual merge.
774aad61
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 mysql-test/r/myisam.result: Manual merge. mysql-test/t/myisam.test: Manual merge. sql/sql_update.cc: Manual merge.