typo/bad merge fixed
chmod a-x for man/*.1 files
man/isamchk.1:
Change mode to -rw-rw-r--
man/mysqlaccess.1:
Change mode to -rw-rw-r--
man/mysqladmin.1:
Change mode to -rw-rw-r--
man/mysqld.1:
Change mode to -rw-rw-r--
man/mysqldump.1:
Change mode to -rw-rw-r--
man/mysqlshow.1:
Change mode to -rw-rw-r--
man/perror.1:
Change mode to -rw-rw-r--
man/safe_mysqld.1:
Change mode to -rw-rw-r--
mysql-test/r/handler.result:
new tests added
client/mysqltest.c:
bug fixed: errors from handler.test (that is send_error()
after send_fields) weren't catched by expected_errno
mysql-test/t/handler.test:
typo fixed
sql/Makefile.am:
bad merge fixed
sql/sql_yacc.yy:
bad merge (?) fixed