Change to new (after merge) error numbers

mysql-test/r/create.result:
  Fixed error number
mysql-test/r/rpl_sp.result:
  Fixed error number
mysql-test/r/sp.result:
  Fixed error number
mysql-test/r/view.result:
  Better fix for now() handling
mysql-test/t/ndb_basic.test:
  Use error names instead of numbers
mysql-test/t/ndb_index_unique.test:
  Use error names instead of numbers
mysql-test/t/rpl_skip_error-slave.opt:
  Change to new error number
mysql-test/t/sp.test:
  Change to new error number
mysql-test/t/view.test:
  Better fix for now() handling

1 files changed, 2 insertions, 2 deletions

diff --git a/mysql-test/r/rpl_sp.result b/mysql-test/r/rpl_sp.result
index e4c7336aabc..ea07a86d009 100644
--- a/mysql-test/r/rpl_sp.result
+++ b/mysql-test/r/rpl_sp.result
@@ -107,7 +107,7 @@ call foo4();
 ERROR 23000: Duplicate entry '20' for key 'a'
 show warnings;
 Level	Code	Message
-Error	1579	Duplicate entry '20' for key 'a'
+Error	1582	Duplicate entry '20' for key 'a'
 select * from t2;
 a
 20
@@ -241,7 +241,7 @@ return 10;
 end|
 do fn1(100);
 Warnings:
-Error	1579	Duplicate entry '100' for key 'a'
+Error	1582	Duplicate entry '100' for key 'a'
 select fn1(20);
 ERROR 23000: Duplicate entry '20' for key 'a'
 select * from t2;