Commit 813e748d authored by unknown's avatar unknown
Browse files

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/mysql_src/mysql-4.1-clean
parents 608729f7 ec0daa74

myisam/mi_open.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) 
      goto err;

    }

    /* Don't call realpath() if the name can't be a link */

    if (strcmp(name_buff, org_name)  ||

    if (!strcmp(name_buff, org_name) ||

        my_readlink(index_name, org_name, MYF(0)) == -1)

      (void) strmov(index_name, org_name);

    (void) fn_format(data_name,org_name,"",MI_NAME_DEXT,2+4+16);

mysql-test/r/ctype_utf8.result

+12 −0
Original line number Diff line number Diff line
@@ -849,3 +849,15 @@ utf8_bin 6109 
utf8_bin	61

utf8_bin	6120

drop table t1;

CREATE TABLE t1 (

user varchar(255) NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

INSERT INTO t1 VALUES ('one'),('two');

SELECT CHARSET('a');

CHARSET('a')

utf8

SELECT user, CONCAT('<', user, '>') AS c FROM t1;

user	c

one	<one>

two	<two>

DROP TABLE t1;

mysql-test/t/ctype_utf8.test

+12 −0
Original line number Diff line number Diff line
@@ -681,3 +681,15 @@ SET collation_connection='utf8_general_ci'; 
-- source include/ctype_filesort.inc

SET collation_connection='utf8_bin';

-- source include/ctype_filesort.inc



#

# Bug #7874 CONCAT() gives wrong results mixing

# latin1 field and utf8 string literals

#

CREATE TABLE t1 (

	user varchar(255) NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

INSERT INTO t1 VALUES ('one'),('two');

SELECT CHARSET('a');

SELECT user, CONCAT('<', user, '>') AS c FROM t1;

DROP TABLE t1;

mysys/my_symlink.c

+6 −3
Original line number Diff line number Diff line
@@ -26,8 +26,10 @@ 
/*

  Reads the content of a symbolic link

  If the file is not a symbolic link, return the original file name in to.

  Returns: 0 if table was a symlink,

           1 if table was a normal file



  RETURN

    0  If filename was a symlink,    (to will be set to value of symlink)

    1  If filename was a normal file (to will be set to filename)

   -1  on error.

*/
@@ -58,6 +60,7 @@ int my_readlink(char *to, const char *filename, myf MyFlags) 
  }

  else

    to[length]=0;

  DBUG_PRINT("exit" ,("result: %d", result));

  DBUG_RETURN(result);

#endif /* HAVE_READLINK */

}

sql/filesort.cc

+3 −0
Original line number Diff line number Diff line
@@ -809,7 +809,10 @@ int merge_many_buff(SORTPARAM *param, uchar *sort_buffer, 
  }

  close_cached_file(to_file);			// This holds old result

  if (to_file == t_file)

  {

    *t_file=t_file2;				// Copy result file

    setup_io_cache(t_file);

  }



  DBUG_RETURN(*maxbuffer >= MERGEBUFF2);	/* Return 1 if interrupted */

} /* merge_many_buff */