diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-12-20 07:15:49 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-12-20 07:15:49 -0700 |
| commit | 3f1a5f8bfc3c6238f24b70ff45f73aa67b6b240f (patch) | |
| tree | b14f5a3f11e555c145a890d7d6a2859be133e88d | |
| parent | 33ae32174c403ea1c6e38dd348e6bad9a608fe53 (diff) | |
| download | mariadb-git-3f1a5f8bfc3c6238f24b70ff45f73aa67b6b240f.tar.gz | |
fixed up rpl000014
undid bug in ENCRYPT() - will push this now
added a test case for ENCRYPT()
mysql-test/r/rpl000014.result:
fixed result
mysql-test/t/rpl000014.test:
fixed timing ambiguity
sql/item_strfunc.cc:
undid SEGV bug in ENCRYPT()
| -rw-r--r-- | mysql-test/r/crypt.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl000014.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/crypt.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl000014.test | 5 | ||||
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/mysql-test/r/crypt.result b/mysql-test/r/crypt.result new file mode 100644 index 00000000000..fe3f80dc90d --- /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 862d7b56bf2..25082dcc60f 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 00000000000..4a499f3d5b7 --- /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 e47933b140a..200decf5201 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 8ccea40cdc7..103d82f36aa 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); |