Commit d166ede9 authored by unknown's avatar unknown
Browse files

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

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


client/mysql.cc:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
parents 6017f911 cc10958f

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1296,3 +1296,4 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

ndb/src/common/util/testBitmask.cpp

VC++Files/mysys/mysys.dsp

+4 −0
Original line number Diff line number Diff line
@@ -457,6 +457,10 @@ SOURCE=.\my_malloc.c 
# End Source File

# Begin Source File



SOURCE=.\my_memmem.c

# End Source File

# Begin Source File



SOURCE=.\my_messnc.c

# End Source File

# Begin Source File

VC++Files/sql/mysqld.dsp

+1 −1
Original line number Diff line number Diff line
@@ -1639,7 +1639,7 @@ SOURCE=.\sql_load.cpp 
# End Source File

# Begin Source File



SOURCE=.\sql\sql_locale.cpp

SOURCE=.\sql_locale.cpp

# End Source File

# Begin Source File

client/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -47,7 +47,9 @@ mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c 
mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)

mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)

mysqlshow_SOURCES=              mysqlshow.c $(yassl_dummy_link_fix)

mysqldump_SOURCES=              mysqldump.c my_user.c $(yassl_dummy_link_fix)

mysqldump_SOURCES=              mysqldump.c my_user.c \

	                        $(top_srcdir)/mysys/mf_getdate.c \

                                $(yassl_dummy_link_fix)

mysqlimport_SOURCES=            mysqlimport.c $(yassl_dummy_link_fix)

mysql_upgrade_SOURCES=          mysql_upgrade.c $(yassl_dummy_link_fix)

sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

client/mysql.cc

+4 −1
Original line number Diff line number Diff line
@@ -2859,7 +2859,7 @@ com_connect(String *buffer, char *line) 
  bzero(buff, sizeof(buff));

  if (buffer)

  {

    strmov(buff, line);

    strmake(buff, line, sizeof(buff));

    tmp= get_arg(buff, 0);

    if (tmp && *tmp)

    {
@@ -3727,6 +3727,9 @@ static const char* construct_prompt() 
      case 't':

	processed_prompt.append('\t');

	break;

      case 'l':

	processed_prompt.append(delimiter_str);

	break;

      default:

	processed_prompt.append(c);

      }