Cleanup after last merge

client/mysqltest.c:
  Don't write error message to log if there is more than one possible error message
include/mysqld_error.h:
  Made error messages more general
libmysqld/Makefile.am:
  md5 is now in mysys
mysql-test/include/have_isam.inc:
  Update to new result format
mysql-test/include/not_embedded.inc:
  Update to new result format
mysql-test/mysql-test-run.sh:
  Update to new result format
mysql-test/r/auto_increment.result:
  Update to new result format
mysql-test/r/count_distinct2.result:
  Update to new result format
mysql-test/r/create.result:
  Update to new result format
mysql-test/r/func_system.result:
  Update to new result format
mysql-test/r/isam.result:
  Update to new result format
mysql-test/r/lock.result:
  Update to new result format
mysql-test/r/lock_multi.result:
  Update to new result format
mysql-test/r/rename.result:
  Update to new result format
mysql-test/r/rpl000001.result:
  Fix wrong test
mysql-test/r/tablelock.result:
  Update to new result format
mysql-test/t/rename.test:
  Update to new result format
sql/share/czech/errmsg.txt:
  Made error messages more general
sql/share/danish/errmsg.txt:
  Made error messages more general
sql/share/dutch/errmsg.txt:
  Made error messages more general
sql/share/english/errmsg.txt:
  Made error messages more general
sql/share/estonian/errmsg.txt:
  Made error messages more general
sql/share/french/errmsg.txt:
  Made error messages more general
sql/share/german/errmsg.txt:
  Made error messages more general
sql/share/greek/errmsg.txt:
  Made error messages more general
sql/share/hungarian/errmsg.txt:
  Made error messages more general
sql/share/italian/errmsg.txt:
  Made error messages more general
sql/share/japanese/errmsg.txt:
  Made error messages more general
sql/share/korean/errmsg.txt:
  Made error messages more general
sql/share/norwegian-ny/errmsg.txt:
  Made error messages more general
sql/share/norwegian/errmsg.txt:
  Made error messages more general
sql/share/polish/errmsg.txt:
  Made error messages more general
sql/share/portuguese/errmsg.txt:
  Made error messages more general
sql/share/romanian/errmsg.txt:
  Made error messages more general
sql/share/russian/errmsg.txt:
  Made error messages more general
sql/share/slovak/errmsg.txt:
  Made error messages more general
sql/share/spanish/errmsg.txt:
  Made error messages more general
sql/share/swedish/errmsg.txt:
  Made error messages more general
sql/share/ukrainian/errmsg.txt:
  Made error messages more general
sql/sql_lex.cc:
  We can't remove lex->thd because sql_yacc uses it.
sql/sql_lex.h:
  We can't remove lex->thd because sql_yacc uses it.
sql/sql_yacc.yy:
  Cleanup
support-files/mysql.spec.sh:
  Create MySQL-embedded rpm
tools/mysqlmanager.c:
  Fix bug in merge

1 files changed, 2 insertions, 2 deletions

diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result
index a13bd93e46a..9cd0496d16e 100644
--- a/mysql-test/r/rpl000001.result
+++ b/mysql-test/r/rpl000001.result
@@ -37,8 +37,8 @@ create table t1(n int);
 create table t2(id int);
 insert into t2 values(connection_id());
 create temporary table t1_temp(n int);
-insert into t1_temp select get_lock('crash_lock', 1) from t2;
- update t1 set n = n + get_lock('crash_lock', 2);
+insert into t1_temp select get_lock('crash_lock%20C', 1) from t2;
+ update t1 set n = n + get_lock('crash_lock%20C', 2);
 select (@id := id) - id from t2;
 (@id := id) - id
 0