Commit 23c03677 authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


client/mysql.cc:
  Auto merged
myisam/mi_open.c:
  Auto merged
ndb/docs/Makefile.am:
  Auto merged
sql-common/client.c:
  Auto merged
parents 1c6977e6 36405216

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" :

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

sql/log_event.cc

+1 −1
Original line number Diff line number Diff line
@@ -3201,7 +3201,7 @@ void User_var_log_event::print(FILE* file, bool short_form, LAST_EVENT_INFO* las 
        */

        fprintf(file, ":=???;\n");

      else

        fprintf(file, ":=_%s %s COLLATE %s;\n", cs->csname, hex_str, cs->name);

        fprintf(file, ":=_%s %s COLLATE `%s`;\n", cs->csname, hex_str, cs->name);

      my_afree(hex_str);

    }

      break;