bk commit into 5.1 tree (cmiller:1.2146)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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.2146 06/05/16 18:42:59 cmiller@zippy.(none) +6 -0
  Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
  into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

  sql/item_strfunc.cc
    1.270 06/05/16 18:42:54 cmiller@zippy.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_temporary.test
    1.21 06/05/16 18:42:53 cmiller@zippy.(none) +0 -0
    Auto merged

  mysql-test/r/select.result
    1.124 06/05/16 18:42:53 cmiller@zippy.(none) +0 -0
    Auto merged

  mysql-test/r/rpl_temporary.result
    1.26 06/05/16 18:42:53 cmiller@zippy.(none) +0 -0
    Auto merged

  mysql-test/r/func_str.result
    1.114 06/05/16 18:42:53 cmiller@zippy.(none) +0 -0
    Auto merged

  client/mysql.cc
    1.210 06/05/16 18:42:53 cmiller@zippy.(none) +0 -0
    Auto merged

# 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:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/merge/mysql-5.1-new/RESYNC

--- 1.209/client/mysql.cc	2006-05-15 19:26:43 -04:00
+++ 1.210/client/mysql.cc	2006-05-16 18:42:53 -04:00
@@ -448,6 +448,14 @@
 				 MYF(MY_WME));
       if (histfile)
 	sprintf(histfile,"%s/.mysql_history",getenv("HOME"));
+      char link_name[FN_REFLEN];
+      if (my_readlink(link_name, histfile, 0) == 0 &&
+          strncmp(link_name, "/dev/null", 10) == 0)
+      {
+        /* The .mysql_history file is a symlink to /dev/null, don't use it */
+        my_free(histfile, MYF(MY_ALLOW_ZERO_PTR));
+        histfile= 0;
+      }
     }
     if (histfile)
     {
@@ -484,7 +492,7 @@
 {
   mysql_close(&mysql);
 #ifdef HAVE_READLINE
-  if (!status.batch && !quick && !opt_html && !opt_xml)
+  if (!status.batch && !quick && !opt_html && !opt_xml &&
histfile)
   {
     /* write-history */
     if (verbose)

--- 1.269/sql/item_strfunc.cc	2006-04-25 13:00:08 -04:00
+++ 1.270/sql/item_strfunc.cc	2006-05-16 18:42:54 -04:00
@@ -2579,7 +2579,7 @@
   (void) fn_format(path, file_name->c_ptr(), mysql_real_data_home, "",
 		   MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
 
-  if (!my_stat(path, &stat_info, MYF(MY_WME)))
+  if (!my_stat(path, &stat_info, MYF(0)))
     goto err;
 
   if (!(stat_info.st_mode & S_IROTH))

--- 1.123/mysql-test/r/select.result	2006-05-13 14:39:04 -04:00
+++ 1.124/mysql-test/r/select.result	2006-05-16 18:42:53 -04:00
@@ -3427,3 +3427,22 @@
 1	SIMPLE	A	range	PRIMARY	PRIMARY	12	NULL	3	Using where
 1	SIMPLE	B	ref	PRIMARY	PRIMARY	8	const,test.A.e	10	
 drop table t1, t2;
+CREATE TABLE t1 (a int PRIMARY KEY, b int, INDEX(b));
+INSERT INTO t1 VALUES (1, 3), (9,4), (7,5), (4,5), (6,2),
+(3,1), (5,1), (8,9), (2,2), (0,9);
+CREATE TABLE t2 (c int, d int, f int, INDEX(c,f));
+INSERT INTO t2 VALUES
+(1,0,0), (1,0,1), (2,0,0), (2,0,1), (3,0,0), (4,0,1),
+(5,0,0), (5,0,1), (6,0,0), (0,0,1), (7,0,0), (7,0,1),
+(0,0,0), (0,0,1), (8,0,0), (8,0,1), (9,0,0), (9,0,1);
+EXPLAIN
+SELECT a, c, d, f FROM t1,t2 WHERE a=c AND b BETWEEN 4 AND 6;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	PRIMARY,b	b	5	NULL	3	Using where
+1	SIMPLE	t2	ref	c	c	5	test.t1.a	2	Using where
+EXPLAIN
+SELECT a, c, d, f FROM t1,t2 WHERE a=c AND b BETWEEN 4 AND 6 AND a > 0;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	PRIMARY,b	b	5	NULL	3	Using where
+1	SIMPLE	t2	ref	c	c	5	test.t1.a	2	Using where
+DROP TABLE t1, t2;

--- 1.113/mysql-test/r/func_str.result	2006-04-24 16:17:44 -04:00
+++ 1.114/mysql-test/r/func_str.result	2006-05-16 18:42:53 -04:00
@@ -1017,6 +1017,13 @@
 1000000
 1      
 drop table t1;
+select load_file("lkjlkj");
+load_file("lkjlkj")
+NULL
+select ifnull(load_file("lkjlkj"),"it's null");
+ifnull(load_file("lkjlkj"),"it's null")
+it's null
+End of 4.1 tests
 create table t1 (d decimal default null);
 insert into t1 values (null);
 select format(d, 2) from t1;

--- 1.25/mysql-test/r/rpl_temporary.result	2006-04-25 13:00:08 -04:00
+++ 1.26/mysql-test/r/rpl_temporary.result	2006-05-16 18:42:53 -04:00
@@ -94,8 +94,6 @@
 set @session.pseudo_thread_id=200;
 create temporary table t201 (id int);
 create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);
-set @con1_id=connection_id();
-kill @con1_id;
 create table t1(f int);
 insert into t1 values (1);
 select * from t1 /* must be 1 */;

--- 1.20/mysql-test/t/rpl_temporary.test	2006-04-25 13:00:08 -04:00
+++ 1.21/mysql-test/t/rpl_temporary.test	2006-05-16 18:42:53 -04:00
@@ -171,8 +171,18 @@
 set @session.pseudo_thread_id=200;
 create temporary table t201 (id int);
 create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);
-set @con1_id=connection_id();
-kill @con1_id;
+
+#
+# Don't kill our own connection to the server as
+# the result code differs depending on platform.
+#
+# Select the id to kill into a variable of mysqltest
+let $con1_id= `select connection_id()`;
+# Switch connection to avoid killing our own connection
+connection master;
+--disable_query_log
+eval kill $con1_id;
+--enable_query_log
 
 #now do something to show that slave is ok after DROP temp tables
 connection master;