bk commit into 5.0 tree (bell:1.2005) BUG#7024

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2005 05/06/24 00:24:11 bell@stripped +3 -0
  fixed encrypt() print (BUG#7024)

  sql/item_strfunc.h
    1.93 05/06/24 00:24:08 bell@stripped +1 -1
    fixed encrypt() print

  mysql-test/t/view.test
    1.74 05/06/24 00:24:08 bell@stripped +12 -0
    using encrypt & substring_index in view

  mysql-test/r/view.result
    1.86 05/06/24 00:24:08 bell@stripped +8 -0
    using encrypt & substring_index in view

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-bug3-5.0

--- 1.92/sql/item_strfunc.h	Fri Jun 17 17:27:43 2005
+++ 1.93/sql/item_strfunc.h	Fri Jun 24 00:24:08 2005
@@ -322,7 +322,7 @@
   Item_func_encrypt(Item *a, Item *b): Item_str_func(a,b) {}
   String *val_str(String *);
   void fix_length_and_dec() { maybe_null=1; max_length = 13; }
-  const char *func_name() const { return "ecrypt"; }
+  const char *func_name() const { return "encrypt"; }
 };
 
 #include "sql_crypt.h"

--- 1.85/mysql-test/r/view.result	Wed Jun 22 08:52:02 2005
+++ 1.86/mysql-test/r/view.result	Fri Jun 24 00:24:08 2005
@@ -1831,3 +1831,11 @@
 t
 01:00
 drop view v1;
+CREATE VIEW v1 AS SELECT ENCRYPT("dhgdhgd");
+SELECT * FROM v1;
+drop view v1;
+CREATE VIEW v1 AS SELECT SUBSTRING_INDEX("dkjhgd:kjhdjh", ":", 1);
+SELECT * FROM v1;
+SUBSTRING_INDEX("dkjhgd:kjhdjh", ":", 1)
+dkjhgd
+drop view v1;

--- 1.73/mysql-test/t/view.test	Wed Jun 22 08:42:00 2005
+++ 1.74/mysql-test/t/view.test	Fri Jun 24 00:24:08 2005
@@ -1673,3 +1673,15 @@
 create view v1 as SELECT TIME_FORMAT(SEC_TO_TIME(3600),'%H:%i') as t;
 select * from v1;
 drop view v1;
+
+#
+# using encrypt & substring_index in view (BUG#7024)
+#
+CREATE VIEW v1 AS SELECT ENCRYPT("dhgdhgd");
+disable_result_log;
+SELECT * FROM v1;
+enable_result_log;
+drop view v1;
+CREATE VIEW v1 AS SELECT SUBSTRING_INDEX("dkjhgd:kjhdjh", ":", 1);
+SELECT * FROM v1;
+drop view v1;