Commit b32b2ce7 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/tmp_reg 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1


client/mysql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
server-tools/instance-manager/messages.cc:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents 0073d9be 90b069ed

client/mysql.cc

+4 −2
Original line number Diff line number Diff line
@@ -3665,12 +3665,14 @@ static const char* construct_prompt() 
      case 'U':

	if (!full_username)

	  init_username();

	processed_prompt.append(full_username);

        processed_prompt.append(full_username ? full_username :

                                (current_user ?  current_user : "(unknown)"));

	break;

      case 'u':

	if (!full_username)

	  init_username();

	processed_prompt.append(part_username);

        processed_prompt.append(part_username ? part_username :

                                (current_user ?  current_user : "(unknown)"));

	break;

      case PROMPT_CHAR:

	processed_prompt.append(PROMPT_CHAR);

client/mysql_upgrade.c

+12 −3
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ 
#include "client_priv.h"

#include <my_dir.h>



#ifdef __WIN__

const char *mysqlcheck_name= "mysqlcheck.exe";

const char *mysql_name= "mysql.exe";

#else

const char *mysqlcheck_name= "mysqlcheck";

const char *mysql_name= "mysql";

#endif /*__WIN__*/



static my_bool opt_force= 0, opt_verbose= 0, tty_password= 0;

static char *user= (char*) "root", *basedir= 0, *datadir= 0, *opt_password= 0;

static my_bool upgrade_defaults_created= 0;
@@ -65,7 +73,7 @@ static struct my_option my_long_options[]= 
};

static const char *load_default_groups[]=

{

  "mysql_upgrade", "client", 0

  "mysql_upgrade", 0

};



#include <help_end.h>
@@ -272,7 +280,7 @@ int main(int argc, char **argv) 
  strmake(bindir_end, "/bin", sizeof(bindir) - (int) (bindir_end - bindir)-1);



  if (!test_file_exists_res

      (bindir, "mysqlcheck", mysqlcheck_line, &mysqlcheck_end))

      (bindir, mysqlcheck_name, mysqlcheck_line, &mysqlcheck_end))

  {

    printf("Can't find program '%s'\n", mysqlcheck_line);

    puts("Please restart with --basedir=mysql-install-directory");
@@ -342,7 +350,8 @@ int main(int argc, char **argv) 
    goto err_exit;



fix_priv_tables:

  if (!test_file_exists_res(bindir, "mysql", fix_priv_tables_cmd, &fix_cmd_end))

  if (!test_file_exists_res(bindir, mysql_name,

                            fix_priv_tables_cmd, &fix_cmd_end))

  {

    puts("Could not find MySQL command-line client (mysql).");

    puts

mysql-test/r/ctype_utf8.result

+12 −0
Original line number Diff line number Diff line
@@ -1066,6 +1066,18 @@ LENGTH(bug) 
100

DROP TABLE t2;

DROP TABLE t1;

CREATE TABLE t1 (item varchar(255)) default character set utf8;

INSERT INTO t1 VALUES (N'\\');

INSERT INTO t1 VALUES (_utf8'\\');

INSERT INTO t1 VALUES (N'Cote d\'Ivoire');

INSERT INTO t1 VALUES (_utf8'Cote d\'Ivoire');

SELECT item FROM t1 ORDER BY item;

item

Cote d'Ivoire

Cote d'Ivoire

\

\

DROP TABLE t1;

SET NAMES utf8;

DROP TABLE IF EXISTS t1;

Warnings:

mysql-test/r/gis.result

+7 −2
Original line number Diff line number Diff line
@@ -574,11 +574,11 @@ INSERT INTO t1 VALUES(GeomFromText('POINT(367894677 368542487)')); 
INSERT INTO t1 VALUES(GeomFromText('POINT(580848489 219587743)'));

INSERT INTO t1 VALUES(GeomFromText('POINT(11247614 782797569)'));

drop table t1;

create table t1 select POINT(1,3);

create table t1 select GeomFromWKB(POINT(1,3));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `POINT(1,3)` longblob NOT NULL

  `GeomFromWKB(POINT(1,3))` geometry NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

CREATE TABLE `t1` (`object_id` bigint(20) unsigned NOT NULL default '0', `geo`
@@ -706,3 +706,8 @@ Catalog Database Table Table_alias Column Column_alias Type Length Max length Is 
def					asbinary(g)	252	8192	0	Y	128	0	63

asbinary(g)

drop table t1;

create table t1 select GeomFromText('point(1 1)');

desc t1;

Field	Type	Null	Key	Default	Extra

GeomFromText('point(1 1)')	geometry	NO			

drop table t1;

mysql-test/r/grant.result

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ Db char(64) NO PRI 
User	char(16)	NO	PRI		

Table_name	char(64)	NO	PRI		

Grantor	char(77)	NO	MUL		

Timestamp	timestamp	YES		CURRENT_TIMESTAMP	

Timestamp	timestamp	NO		CURRENT_TIMESTAMP	

Table_priv	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')	NO			

Column_priv	set('Select','Insert','Update','References')	NO			

use test;