Commit 4d861dad authored by unknown's avatar unknown
Browse files

Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


client/mysql.cc:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
parents 6a278824 97b4446a

client/mysql.cc

+9 −1
Original line number Diff line number Diff line
@@ -448,6 +448,14 @@ int main(int argc,char *argv[]) 
				 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 @@ sig_handler mysql_end(int sig) 
{

  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)

include/sslopt-longopts.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
   0, 0, 0, 0, 0, 0},

#ifdef MYSQL_CLIENT

  {"ssl-verify-server-cert", OPT_SSL_VERIFY_SERVER_CERT,

   "Verify servers \"Common Name\" in it's cert against hostname used when connecting. This option is disabled by default.",

   "Verify server's \"Common Name\" in its cert against hostname used when connecting. This option is disabled by default.",

   (gptr*) &opt_ssl_verify_server_cert, (gptr*) &opt_ssl_verify_server_cert,

    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

mysql-test/r/func_str.result

+7 −0
Original line number Diff line number Diff line
@@ -1017,6 +1017,13 @@ t 
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;

mysql-test/r/outfile.result

+29 B (1.13 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

mysql-test/r/rpl_temporary.result

+0 −2
Original line number Diff line number Diff line
@@ -94,8 +94,6 @@ create temporary table t102 (id int); 
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 */;