Commit 26f0d13d authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/federated.result:
  Manual merge.
mysql-test/t/federated.test:
  Manual merge.
sql/sql_insert.cc:
  Manual merge.
parents e8699b56 fe4ed244

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ extern gptr _my_memdup(const byte *from,uint length, 
		       const char *sFile, uint uLine,myf MyFlag);

extern my_string _my_strdup(const char *from, const char *sFile, uint uLine,

			    myf MyFlag);

extern char *_my_strndup(const byte *from, uint length,

extern char *_my_strndup(const char *from, uint length,

				    const char *sFile, uint uLine,

				    myf MyFlag);

include/sql_common.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ extern const char *not_error_sqlstate; 
extern "C" {

#endif



extern CHARSET_INFO *default_client_charset_info;

MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,

			   my_bool default_value, uint server_capabilities);

void free_rows(MYSQL_DATA *cur);

libmysqld/lib_sql.cc

+7 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ extern "C" 
int check_user(THD *thd, enum enum_server_command command, 

	       const char *passwd, uint passwd_len, const char *db,

	       bool check_count);

void thd_init_client_charset(THD *thd, uint cs_number);



C_MODE_START



#include <mysql.h>
@@ -604,11 +606,14 @@ void *create_embedded_thd(int client_flag, char *db) 
  return NULL;

}





#ifdef NO_EMBEDDED_ACCESS_CHECKS

int check_embedded_connection(MYSQL *mysql)

{

  int result;

  THD *thd= (THD*)mysql->thd;

  thd_init_client_charset(thd, mysql->charset->number);

  thd->update_charset();

  Security_context *sctx= thd->security_ctx;

  sctx->host_or_ip= sctx->host= (char*) my_localhost;

  strmake(sctx->priv_host, (char*) my_localhost,  MAX_HOSTNAME-1);
@@ -627,6 +632,8 @@ int check_embedded_connection(MYSQL *mysql) 
  char scramble_buff[SCRAMBLE_LENGTH];

  int passwd_len;



  thd_init_client_charset(thd, mysql->charset->number);

  thd->update_charset();

  if (mysql->options.client_ip)

  {

    sctx->host= my_strdup(mysql->options.client_ip, MYF(0));

libmysqld/libmysqld.c

+3 −45
Original line number Diff line number Diff line
@@ -90,49 +90,7 @@ static void end_server(MYSQL *mysql) 
}





static int mysql_init_charset(MYSQL *mysql)

{

  char charset_name_buff[16], *charset_name;



  if ((charset_name=mysql->options.charset_name))

  {

    const char *save=charsets_dir;

    if (mysql->options.charset_dir)

      charsets_dir=mysql->options.charset_dir;

    mysql->charset=get_charset_by_name(mysql->options.charset_name,

                                       MYF(MY_WME));

    charsets_dir=save;

  }

  else if (mysql->server_language)

  {

    charset_name=charset_name_buff;

    sprintf(charset_name,"%d",mysql->server_language);	/* In case of errors */

    mysql->charset=get_charset((uint8) mysql->server_language, MYF(MY_WME));

  }

  else

    mysql->charset=default_charset_info;



  if (!mysql->charset)

  {

    mysql->net.last_errno=CR_CANT_READ_CHARSET;

    strmov(mysql->net.sqlstate, "HY0000");

    if (mysql->options.charset_dir)

      sprintf(mysql->net.last_error,ER(mysql->net.last_errno),

              charset_name ? charset_name : "unknown",

              mysql->options.charset_dir);

    else

    {

      char cs_dir_name[FN_REFLEN];

      get_charsets_dir(cs_dir_name);

      sprintf(mysql->net.last_error,ER(mysql->net.last_errno),

              charset_name ? charset_name : "unknown",

              cs_dir_name);

    }

    return mysql->net.last_errno;

  }

  return 0;

}



int mysql_init_character_set(MYSQL *mysql);



MYSQL * STDCALL

mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
@@ -222,10 +180,10 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, 


  init_embedded_mysql(mysql, client_flag, db_name);



  if (check_embedded_connection(mysql))

  if (mysql_init_character_set(mysql))

    goto error;



  if (mysql_init_charset(mysql))

  if (check_embedded_connection(mysql))

    goto error;



  mysql->server_status= SERVER_STATUS_AUTOCOMMIT;

mysql-test/extra/binlog_tests/binlog.test

+32 −0
Original line number Diff line number Diff line
@@ -49,3 +49,35 @@ show binlog events in 'master-bin.000001' from 102; 
--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events in 'master-bin.000002' from 102;



# Test of a too big SET INSERT_ID: see if the truncated value goes

# into binlog (right), or the too big value (wrong); we look at the

# binlog further down with SHOW BINLOG EVENTS.

reset master;

create table t1 (id tinyint auto_increment primary key);

set insert_id=128;

insert into t1 values(null);

select * from t1;

drop table t1;



# Test of binlogging of INSERT_ID with INSERT DELAYED

create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;

# First, avoid BUG#20627:

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;

# Verify that only one INSERT_ID event is binlogged.

insert delayed into t1 values (207);



# We use sleeps between statements, that's the only way to get a

# repeatable binlog in a normal test run and under Valgrind.

# It may be that the "binlog missing rows" of BUG#20821 shows up

# here.

sleep 2;

insert delayed into t1 values (null);

sleep 2;

insert delayed into t1 values (300);

sleep 2; # time for the delayed queries to reach disk

select * from t1;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events from 102;

drop table t1;