From a3e3b04f2a253f5b2171904d56414634808f6893 Mon Sep 17 00:00:00 2001
From: "sasha@mysql.sashanet.com" <>
Date: Wed, 20 Dec 2000 07:15:49 -0700
Subject: [PATCH] fixed up rpl000014 undid bug in ENCRYPT() - will push this
now added a test case for ENCRYPT()
---
mysql-test/r/crypt.result | 2 ++
mysql-test/r/rpl000014.result | 2 +-
mysql-test/t/crypt.test | 1 +
mysql-test/t/rpl000014.test | 5 +++--
sql/item_strfunc.cc | 2 --
5 files changed, 7 insertions(+), 5 deletions(-)
create mode 100644 mysql-test/r/crypt.result
create mode 100644 mysql-test/t/crypt.test
diff --git a/mysql-test/r/crypt.result b/mysql-test/r/crypt.result
new file mode 100644
index 0000000000..fe3f80dc90
--- /dev/null
+++ b/mysql-test/r/crypt.result
@@ -0,0 +1,2 @@
+encrypt('foo', 'ff')
+ffTU0fyIP09Z.
diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result
index 862d7b56bf..25082dcc60 100644
--- a/mysql-test/r/rpl000014.result
+++ b/mysql-test/r/rpl000014.result
@@ -1,7 +1,7 @@
File Position Binlog_do_db Binlog_ignore_db
master-bin.001 73
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db
-127.0.0.1 root 9306 1 4 Yes
+127.0.0.1 root 9306 1 73 Yes
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db
127.0.0.1 root 9306 1 73 No
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db
diff --git a/mysql-test/t/crypt.test b/mysql-test/t/crypt.test
new file mode 100644
index 0000000000..4a499f3d5b
--- /dev/null
+++ b/mysql-test/t/crypt.test
@@ -0,0 +1 @@
+select encrypt('foo', 'ff');
diff --git a/mysql-test/t/rpl000014.test b/mysql-test/t/rpl000014.test
index e47933b140..200decf520 100644
--- a/mysql-test/t/rpl000014.test
+++ b/mysql-test/t/rpl000014.test
@@ -2,9 +2,10 @@ source include/master-slave.inc;
connection master;
show master status;
connection slave;
+sleep 0.2;
show slave status;
change master to master_log_pos=73;
-sleep 1;
+sleep 0.2;
slave stop;
change master to master_log_pos=73;
show slave status;
@@ -19,5 +20,5 @@ create table foo (n int);
insert into foo values (1),(2),(3);
connection slave;
change master to master_log_pos=73;
-sleep 0.3;
+sleep 0.2;
select * from foo;
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 8ccea40cdc..103d82f36a 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1007,8 +1007,6 @@ String *Item_func_encrypt::val_str(String *str)
}
pthread_mutex_lock(&LOCK_crypt);
char *tmp=crypt(res->c_ptr(),salt_ptr);
- tmp = 0;
- *tmp = 0;
str->set(tmp,(uint) strlen(tmp));
str->copy();
pthread_mutex_unlock(&LOCK_crypt);
--
2.30.9