Commit 5c8c2ab4 authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0


BitKeeper/deleted/.del-mysql_client.result:
  Auto merged
BitKeeper/deleted/.del-mysql_client.test:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
parents 860c3853 1c28a068

config/ac-macros/openssl.m4

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 
        OPENSSL_INCLUDE=-I$incs

      fi

      # Test for libssl using all known library file endings

      if test -f $d/libssl.a || test -f $d/libssl.so || \

         test -f $d/libssl.sl || test -f $d/libssl.dylib ; then

      if test -f $libs/libssl.a || test -f $libs/libssl.so || \

         test -f $libs/libssl.sl || test -f $libs/libssl.dylib ; then

        OPENSSL_LIB=$libs

      fi

      ;;

mysql-test/mysql-test-run.pl

+17 −12
Original line number Diff line number Diff line
@@ -1178,28 +1178,33 @@ sub executable_setup () { 


sub environment_setup () {



  my $extra_ld_library_paths;



  # --------------------------------------------------------------------------

  # We might not use a standard installation directory, like /usr/lib.

  # Set LD_LIBRARY_PATH to make sure we find our installed libraries.

  # Setup LD_LIBRARY_PATH so the libraries from this distro/clone

  # are used in favor of the system installed ones

  # --------------------------------------------------------------------------



  unless ( $opt_source_dist )

  if ( $opt_source_dist )

  {

    $ENV{'LD_LIBRARY_PATH'}=

      "$glob_basedir/lib" .

        ($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : "");

    $ENV{'DYLD_LIBRARY_PATH'}=

      "$glob_basedir/lib" .

        ($ENV{'DYLD_LIBRARY_PATH'} ? ":$ENV{'DYLD_LIBRARY_PATH'}" : "");

    $extra_ld_library_paths= "$glob_basedir/libmysql/.libs/";

  }

  else

  {

    $extra_ld_library_paths= "$glob_basedir/lib";

  }



  # --------------------------------------------------------------------------

  # Add the path where mysqld will find udf_example.so

  # --------------------------------------------------------------------------

  $extra_ld_library_paths .= ":" .

    ($lib_udf_example ?  dirname($lib_udf_example) : "");



  $ENV{'LD_LIBRARY_PATH'}=

    ($lib_udf_example ?  dirname($lib_udf_example) : "") .

    "$extra_ld_library_paths" .

      ($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : "");



  $ENV{'DYLD_LIBRARY_PATH'}=

    "$extra_ld_library_paths" .

      ($ENV{'DYLD_LIBRARY_PATH'} ? ":$ENV{'DYLD_LIBRARY_PATH'}" : "");



  # --------------------------------------------------------------------------

  # Also command lines in .opt files may contain env vars

mysql-test/r/mysql.result

+8 −0
Original line number Diff line number Diff line
@@ -114,4 +114,12 @@ a int(11) YES NULL 
b	varchar(255)	YES		NULL	

c	int(11)	YES		NULL	

drop table t1;

1

1

ERROR 1064 (42000) at line 3: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

ERROR at line 1: USE must be followed by a database name

\

\\

';

';

End of 5.0 tests

mysql-test/r/mysql_client.result

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
1

1

ERROR 1064 (42000) at line 3: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

ERROR at line 1: USE must be followed by a database name

\

\\

';

';

mysql-test/t/mysql.test

+45 −1
Original line number Diff line number Diff line
@@ -94,6 +94,50 @@ drop table t1; 
--exec $MYSQL test -e "connect verylongdatabasenamethatshouldblowthe256byteslongbufferincom_connectfunctionxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxendcccccccdxxxxxxxxxxxxxxxxxkskskskskkskskskskskskskskskskkskskskskkskskskskskskskskskend" 2>&1

--enable_parsing



--echo End of 5.0 tests



#

# Bug #20432: mysql client interprets commands in comments

#



# if the client sees the 'use' within the comment, we haven't fixed

--exec echo "/*"          >  $MYSQLTEST_VARDIR/tmp/bug20432.sql

--exec echo "use"         >> $MYSQLTEST_VARDIR/tmp/bug20432.sql

--exec echo "*/"          >> $MYSQLTEST_VARDIR/tmp/bug20432.sql

--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1



# SQL can have embedded comments => workie

--exec echo "select /*"   >  $MYSQLTEST_VARDIR/tmp/bug20432.sql

--exec echo "use"         >> $MYSQLTEST_VARDIR/tmp/bug20432.sql

--exec echo "*/ 1"        >> $MYSQLTEST_VARDIR/tmp/bug20432.sql

--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1



# client commands on the other hand must be at BOL => error

--exec echo "/*"          >  $MYSQLTEST_VARDIR/tmp/bug20432.sql

--exec echo "xxx"         >> $MYSQLTEST_VARDIR/tmp/bug20432.sql

--exec echo "*/ use"      >> $MYSQLTEST_VARDIR/tmp/bug20432.sql

--error 1

--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1



# client comment recognized, but parameter missing => error

--exec echo "use"         >  $MYSQLTEST_VARDIR/tmp/bug20432.sql

--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1



#

# Bug #20328: mysql client interprets commands in comments

#

--exec $MYSQL -e 'help' > $MYSQLTEST_VARDIR/tmp/bug20328_1.result

--exec $MYSQL -e 'help ' > $MYSQLTEST_VARDIR/tmp/bug20328_2.result

--exec diff $MYSQLTEST_VARDIR/tmp/bug20328_1.result $MYSQLTEST_VARDIR/tmp/bug20328_2.result



#

# Bug #20103: Escaping with backslash does not work

#

--exec echo "SET SQL_MODE = 'NO_BACKSLASH_ESCAPES';"  > $MYSQLTEST_VARDIR/tmp/bug20103.sql

--exec echo "SELECT '\';" >> $MYSQLTEST_VARDIR/tmp/bug20103.sql

--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20103.sql 2>&1



--exec echo "SET SQL_MODE = '';"  > $MYSQLTEST_VARDIR/tmp/bug20103.sql

--exec echo "SELECT '\';';" >> $MYSQLTEST_VARDIR/tmp/bug20103.sql

--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20103.sql 2>&1



--echo End of 5.0 tests