Commit 36405216 authored by unknown's avatar unknown
Browse files

Merge 


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/log_event.cc:
  Auto merged
mysql-test/r/user_var.result:
  SCCS merged
ndb/docs/Makefile.am:
  Auto merged
parents f33566b5 30cddcc1

client/mysql.cc

+4 −4
Original line number Diff line number Diff line
@@ -1520,7 +1520,7 @@ You can turn off this feature to get a quicker startup with -A\n\n"); 
      j=0;

      while ((sql_field=mysql_fetch_field(fields)))

      {

	sprintf(buf,"%s.%s",table_row[0],sql_field->name);

	sprintf(buf,"%.64s.%.64s",table_row[0],sql_field->name);

	field_names[i][j] = strdup_root(&hash_mem_root,buf);

	add_word(&ht,field_names[i][j]);

	field_names[i][num_fields+j] = strdup_root(&hash_mem_root,
@@ -2526,7 +2526,7 @@ com_connect(String *buffer, char *line) 
  {

    sprintf(buff,"Connection id:    %lu",mysql_thread_id(&mysql));

    put_info(buff,INFO_INFO);

    sprintf(buff,"Current database: %s\n",

    sprintf(buff,"Current database: %.128s\n",

	    current_db ? current_db : "*** NONE ***");

    put_info(buff,INFO_INFO);

  }

client/mysqldump.c

+7 −0
Original line number Diff line number Diff line
@@ -2308,8 +2308,15 @@ static int start_transaction(MYSQL *mysql_con, my_bool consistent_read_now) 
    We use BEGIN for old servers. --single-transaction --master-data will fail

    on old servers, but that's ok as it was already silently broken (it didn't

    do a consistent read, so better tell people frankly, with the error).



    We want the first consistent read to be used for all tables to dump so we

    need the REPEATABLE READ level (not anything lower, for example READ

    COMMITTED would give one new consistent read per dumped table).

  */

  return (mysql_query_with_error_report(mysql_con, 0,

                                        "SET SESSION TRANSACTION ISOLATION "

                                        "LEVEL REPEATABLE READ") ||

          mysql_query_with_error_report(mysql_con, 0,

                                        consistent_read_now ?

                                        "START TRANSACTION "

                                        "WITH CONSISTENT SNAPSHOT" :

myisam/mi_open.c

+2 −3
Original line number Diff line number Diff line
@@ -148,9 +148,8 @@ 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))

      (void) my_readlink(index_name, org_name, MYF(0));

    else

    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_ucs.result

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ Log_name Pos Event_type Server_id End_log_pos Info 
master-bin.000001	95	User var	1	135	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

master-bin.000001	135	Query	1	218	use `test`; insert into t2 values (@v)

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci;

SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`;

use test;

SET TIMESTAMP=10000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

mysql-test/t/user_var.test

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ SET TIMESTAMP=10000; 
SET @`a b`='hello';

INSERT INTO t1 VALUES(@`a b`);

set @var1= "';aaa";

insert into t1 values (@var1);

SET @var2=char(ascii('a'));

insert into t1 values (@var1),(@var2);

show binlog events from 95;

# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we

# absolutely need variables names to be quoted and strings to be