BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysqladmin.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_lex.cc:
  SCCS merged