Commit ee686641 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/space/my/mysql-5.0


tests/mysql_client_test.c:
  Auto merged
parents d2e6f23b 0d0aa7a4

BUILD/SETUP.sh

+3 −4
Original line number Diff line number Diff line
@@ -48,10 +48,9 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"



base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-big-tables"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-embedded-server --with-big-tables"

max_no_es_configs="$max_leave_isam_configs --without-isam"

max_configs="$max_no_es_configs --with-embedded-server"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-openssl --with-embedded-server --with-big-tables"

max_configs="$base_max_configs --with-embedded-server"



path=`dirname $0`

. "$path/check-cpu"

BUILD/compile-pentium-debug-max-no-embedded

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ path=`dirname $0` 
extra_flags="$pentium_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $max_no_es_configs"

extra_configs="$pentium_configs $debug_configs $base_max_configs"



. "$path/FINISH.sh"

include/mysql.h

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ unsigned int STDCALL mysql_warning_count(MYSQL *mysql); 
const char * STDCALL mysql_info(MYSQL *mysql);

unsigned long STDCALL mysql_thread_id(MYSQL *mysql);

const char * STDCALL mysql_character_set_name(MYSQL *mysql);

int          STDCALL mysql_set_character_set(MYSQL *mysql, char *csname);

int          STDCALL mysql_set_character_set(MYSQL *mysql, const char *csname);



MYSQL *		STDCALL mysql_init(MYSQL *mysql);

my_bool		STDCALL mysql_ssl_set(MYSQL *mysql, const char *key,

libmysql/libmysql.c

+0 −33
Original line number Diff line number Diff line
@@ -1511,39 +1511,6 @@ void STDCALL mysql_get_character_set_info(MYSQL *mysql, MY_CHARSET_INFO *csinfo) 
    csinfo->dir = charsets_dir;

}



int STDCALL mysql_set_character_set(MYSQL *mysql, char *cs_name)

{

  struct charset_info_st *cs;

  const char *save_csdir= charsets_dir;



  if (mysql->options.charset_dir)

    charsets_dir= mysql->options.charset_dir;



  if ((cs= get_charset_by_csname(cs_name, MY_CS_PRIMARY, MYF(0))))

  {

    char buff[MY_CS_NAME_SIZE + 10];

    charsets_dir= save_csdir;

    sprintf(buff, "SET NAMES %s", cs_name);

    if (!mysql_query(mysql, buff))

    {

      mysql->charset= cs;

    }

  }

  else

  {

    char cs_dir_name[FN_REFLEN];

    get_charsets_dir(cs_dir_name);

    mysql->net.last_errno= CR_CANT_READ_CHARSET;

    strmov(mysql->net.sqlstate, unknown_sqlstate);

    my_snprintf(mysql->net.last_error, sizeof(mysql->net.last_error) - 1,

		ER(mysql->net.last_errno), cs_name, cs_dir_name);



  }

  charsets_dir= save_csdir;

  return mysql->net.last_errno;

}





uint STDCALL mysql_thread_safe(void)

{

#ifdef THREAD

mysql-test/include/federated.inc

0 → 100644
+21 −0
Original line number Diff line number Diff line 
--source ./include/have_federated_db.inc



source ./include/master-slave.inc;



# remote table creation



connection slave;

--replicate-ignore-db=federated

stop slave;



--disable_warnings

# at this point, we are connected to master

DROP DATABASE IF EXISTS federated;

--enable_warnings

CREATE DATABASE federated;



connection master;

--disable_warnings

DROP DATABASE IF EXISTS federated;

--enable_warnings

CREATE DATABASE federated;