Commit 2c6b02ca authored by unknown's avatar unknown
Browse files

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

into mysql.com:/space/my/mysql-4.1
parents 3392ee95 ec0daa74

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ ram@mysql.r18.ru 
ram@ram.(none)

ranger@regul.home.lan

rburnett@build.mysql.com

reggie@bob.(none)

root@home.(none)

root@mc04.(none)

root@x3.internalnet

client/mysql.cc

+9 −1
Original line number Diff line number Diff line
@@ -3232,13 +3232,20 @@ static const char* construct_prompt() 
	break;

      }

      case 'p':

      {

#ifndef EMBEDDED_LIBRARY

	if (!connected)

	{

	  processed_prompt.append("not_connected");

	  break;

	}

	if (strstr(mysql_get_host_info(&mysql),"TCP/IP") ||



	const char *host_info = mysql_get_host_info(&mysql);

	if (strstr(host_info, "memory")) 

	{

		processed_prompt.append( mysql.host );

	}

	else if (strstr(host_info,"TCP/IP") ||

	    !mysql.unix_socket)

	  add_int_to_prompt(mysql.port);

	else
@@ -3247,6 +3254,7 @@ static const char* construct_prompt() 
 	  processed_prompt.append(pos ? pos+1 : mysql.unix_socket);

	}

#endif

      }

	break;

      case 'U':

	if (!full_username)

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;