SCRUM

Add optional second parameter to password() function. It can be used to force password()
to return fixed values. 


mysql-test/r/func_crypt.result:
  New test results
mysql-test/t/func_crypt.test:
  new tests
sql/item_strfunc.cc:
  Add optional second argument to password() function
sql/item_strfunc.h:
  New method
sql/sql_yacc.yy:
  Handling of password with 2 arguments

1 files changed, 6 insertions, 1 deletions

diff --git a/mysql-test/t/func_crypt.test b/mysql-test/t/func_crypt.test
index 812bdade39f..af0ef661d06 100644
--- a/mysql-test/t/func_crypt.test
+++ b/mysql-test/t/func_crypt.test
@@ -1,3 +1,8 @@
 select length(encrypt('foo', 'ff')) <> 0;
 --replace_result $1$aa$4OSUA5cjdx0RUQ08opV27/ aaqPiZY5xR5l.
-select old_password('test'),length(password("1")),length(encrypt('test')),encrypt('test','aa');
+
+# Test new and old password handling functions 
+select password("a",""), password("a",NULL), password("","a"), password(NULL,"a");
+select password("aaaaaaaaaaaaaaaa","a"), password("a","aaaaaaaaaaaaaaaa");
+select old_password('test'), length(password("1")), length(encrypt('test')), encrypt('test','aa');
+select old_password(""), old_password(NULL), password(""), password(NULL);