Portability fixes

Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning


client/mysqldump.c:
  Cleanup
  Ensure we free allocated memory
  Portability fixes
client/mysqltest.c:
  Cleanup of code during review
  Portability fixes (Don't use 'bool')
mysql-test/r/func_encrypt.result:
  NULL as argument to encrypt/decrypt should return NULL without a warning
mysql-test/r/func_encrypt_nossl.result:
  Added test of NULL argument
mysql-test/t/func_encrypt_nossl.test:
  Added test of NULL argument
sql/handler.cc:
  Cleanup during code review
sql/item_strfunc.cc:
  NULL as argument to encrypt/decrypt should return NULL without a warning
sql/sql_parse.cc:
  Fix wrong merge (fix was not needed as the previous code was reverted)
sql/sql_table.cc:
  Removed extra new line

3 files changed, 5 insertions, 12 deletions

diff --git a/mysql-test/r/func_encrypt.result b/mysql-test/r/func_encrypt.result
index 992d01c66cd..3eb8ec4354c 100644
--- a/mysql-test/r/func_encrypt.result
+++ b/mysql-test/r/func_encrypt.result
@@ -128,18 +128,12 @@ Error	1108	Incorrect parameters to procedure 'des_encrypt'
 select des_encrypt(NULL);
 des_encrypt(NULL)
 NULL
-Warnings:
-Error	1108	Incorrect parameters to procedure 'des_encrypt'
 select des_encrypt(NULL, 10);
 des_encrypt(NULL, 10)
 NULL
-Warnings:
-Error	1108	Incorrect parameters to procedure 'des_encrypt'
 select des_encrypt(NULL, NULL);
 des_encrypt(NULL, NULL)
 NULL
-Warnings:
-Error	1108	Incorrect parameters to procedure 'des_encrypt'
 select des_encrypt(10, NULL);
 des_encrypt(10, NULL)
 NULL
@@ -156,18 +150,12 @@ hello
 select des_decrypt(NULL);
 des_decrypt(NULL)
 NULL
-Warnings:
-Error	1108	Incorrect parameters to procedure 'des_decrypt'
 select des_decrypt(NULL, 10);
 des_decrypt(NULL, 10)
 NULL
-Warnings:
-Error	1108	Incorrect parameters to procedure 'des_decrypt'
 select des_decrypt(NULL, NULL);
 des_decrypt(NULL, NULL)
 NULL
-Warnings:
-Error	1108	Incorrect parameters to procedure 'des_decrypt'
 select des_decrypt(10, NULL);
 des_decrypt(10, NULL)
 10
diff --git a/mysql-test/r/func_encrypt_nossl.result b/mysql-test/r/func_encrypt_nossl.result
index fea752f4a4a..e3ae6a5192a 100644
--- a/mysql-test/r/func_encrypt_nossl.result
+++ b/mysql-test/r/func_encrypt_nossl.result
@@ -23,6 +23,10 @@ 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
+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
 select des_decrypt("test", 'anotherkeystr');
 des_decrypt("test", 'anotherkeystr')
 NULL
diff --git a/mysql-test/t/func_encrypt_nossl.test b/mysql-test/t/func_encrypt_nossl.test
index 0e9d93f5968..95c104ce046 100644
--- a/mysql-test/t/func_encrypt_nossl.test
+++ b/mysql-test/t/func_encrypt_nossl.test
@@ -9,6 +9,7 @@ select des_encrypt("test", 1);
 select des_encrypt("test", 9);
 select des_encrypt("test", 100);
 select des_encrypt("test", NULL);
+select des_encrypt(NULL, NULL);
 select des_decrypt("test", 'anotherkeystr');
 select des_decrypt(1, 1);
 select des_decrypt(des_encrypt("test", 'thekey'));