Post merge fixes

mysql-test/r/func_encrypt_nossl.result

@@ -2,83 +2,83 @@ select des_encrypt("test", 'akeystr');
 des_encrypt("test", 'akeystr')
 NULL
 Warnings:
-Error	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select des_encrypt("test", 1);
 des_encrypt("test", 1)
 NULL
 Warnings:
-Error	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select des_encrypt("test", 9);
 des_encrypt("test", 9)
 NULL
 Warnings:
-Error	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select des_encrypt("test", 100);
 des_encrypt("test", 100)
 NULL
 Warnings:
-Error	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select des_encrypt("test", NULL);
 des_encrypt("test", NULL)
 NULL
 Warnings:
-Error	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select des_encrypt(NULL, NULL);
 des_encrypt(NULL, NULL)
 NULL
 Warnings:
-Error	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select des_decrypt("test", 'anotherkeystr');
 des_decrypt("test", 'anotherkeystr')
 NULL
 Warnings:
-Error	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select des_decrypt(1, 1);
 des_decrypt(1, 1)
 NULL
 Warnings:
-Error	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select des_decrypt(des_encrypt("test", 'thekey'));
 des_decrypt(des_encrypt("test", 'thekey'))
 NULL
 Warnings:
-Error	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select hex(des_encrypt("hello")),des_decrypt(des_encrypt("hello"));
 hex(des_encrypt("hello"))	des_decrypt(des_encrypt("hello"))
 NULL	NULL
 Warnings:
-Error	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
-Error	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select des_decrypt(des_encrypt("hello",4));
 des_decrypt(des_encrypt("hello",4))
 NULL
 Warnings:
-Error	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select des_decrypt(des_encrypt("hello",'test'),'test');
 des_decrypt(des_encrypt("hello",'test'),'test')
 NULL
 Warnings:
-Error	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select hex(des_encrypt("hello")),hex(des_encrypt("hello",5)),hex(des_encrypt("hello",'default_password'));
 hex(des_encrypt("hello"))	hex(des_encrypt("hello",5))	hex(des_encrypt("hello",'default_password'))
 NULL	NULL	NULL
 Warnings:
-Error	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
-Error	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
-Error	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_encrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select des_decrypt(des_encrypt("hello"),'default_password');
 des_decrypt(des_encrypt("hello"),'default_password')
 NULL
 Warnings:
-Error	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select des_decrypt(des_encrypt("hello",4),'password4');
 des_decrypt(des_encrypt("hello",4),'password4')
 NULL
 Warnings:
-Error	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 SET @a=des_decrypt(des_encrypt("hello"));
 Warnings:
-Error	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 flush des_key_file;
 select @a = des_decrypt(des_encrypt("hello"));
 @a = des_decrypt(des_encrypt("hello"))
@@ -90,9 +90,9 @@ select hex(des_decrypt(des_encrypt("hello",4),'password2'));
 hex(des_decrypt(des_encrypt("hello",4),'password2'))
 NULL
 Warnings:
-Error	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
 select hex(des_decrypt(des_encrypt("hello","hidden")));
 hex(des_decrypt(des_encrypt("hello","hidden")))
 NULL
 Warnings:
-Error	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working
+Warning	1289	The 'des_decrypt' feature is disabled; you need MySQL built with '--with-openssl' to have it working

mysql-test/suite/funcs_1/r/innodb_storedproc_02.result

@@ -550,9 +550,6 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
-Warnings:
-Note	1051	Unknown table 'tqq'
-Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()

mysql-test/suite/funcs_1/r/memory_storedproc_02.result

@@ -551,9 +551,6 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
-Warnings:
-Note	1051	Unknown table 'tqq'
-Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()

mysql-test/suite/funcs_1/r/myisam_storedproc_02.result

@@ -551,9 +551,6 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
-Warnings:
-Note	1051	Unknown table 'tqq'
-Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()

mysql-test/suite/funcs_1/r/ndb_storedproc_02.result

@@ -550,9 +550,6 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
-Warnings:
-Note	1051	Unknown table 'tqq'
-Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()

mysql-test/suite/ndb/r/ndb_multi_row.result

@@ -63,6 +63,6 @@ t4
 drop table t1, t2, t3, t4;
 drop table if exists t1, t3, t4;
 Warnings:
-Error	155	Table 'test.t1' doesn't exist
-Error	155	Table 'test.t3' doesn't exist
-Error	155	Table 'test.t4' doesn't exist
+Warning	155	Table 'test.t1' doesn't exist
+Warning	155	Table 'test.t3' doesn't exist
+Warning	155	Table 'test.t4' doesn't exist