Commit 86833140 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/mysql_src/mysql-5.0-clean


mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
parents 888c2118 7636b12f

client/mysqlbinlog.cc

+9 −0
Original line number Diff line number Diff line
@@ -488,6 +488,15 @@ Create_file event for file_id: %u\n",exv->file_id); 


static struct my_option my_long_options[] =

{

  /*

    mysqlbinlog needs charsets knowledge, to be able to convert a charset

    number found in binlog to a charset name (to be able to print things

    like this:

    SET @`a`:=_cp850 0x4DFC6C6C6572 COLLATE `cp850_general_ci`;

  */

  {"character-sets-dir", OPT_CHARSETS_DIR,

   "Directory where character sets are.", (gptr*) &charsets_dir,

   (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#ifndef DBUG_OFF

  {"debug", '#', "Output debug log.", (gptr*) &default_dbug_option,

   (gptr*) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ fi 


MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST --no-defaults --testcase --user=root --socket=$MASTER_MYSOCK --port=$MYSQL_TCP_PORT --silent"

MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"

MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYSQLBINLOG_OPT"

MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR  --character-sets-dir=$CHARSETSDIR $EXTRA_MYSQLBINLOG_OPT"

MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"

MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"

export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES

mysql-test/r/ctype_ucs.result

+2 −1
Original line number Diff line number Diff line
@@ -526,13 +526,14 @@ insert into t2 values (@v); 
show binlog events from 95;

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)

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

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

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;

SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t2 values (@v);

drop table t2;

set names latin1;

mysql-test/r/drop_temp_table.result

+4 −4
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ get_lock("a",10) 
show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	4	Format_desc	1	95	Server ver: VERSION, Binlog ver: 4

master-bin.000001	95	Query	1	206	create database `drop-temp+table-test`

master-bin.000001	206	Query	1	322	use `drop-temp+table-test`; create temporary table `table:name` (a int)

master-bin.000001	322	Query	1	473	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name`

master-bin.000001	473	Query	1	566	use `drop-temp+table-test`; DO RELEASE_LOCK("a")

master-bin.000001	95	Query	1	213	create database `drop-temp+table-test`

master-bin.000001	213	Query	1	336	use `drop-temp+table-test`; create temporary table `table:name` (a int)

master-bin.000001	336	Query	1	494	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name`

master-bin.000001	494	Query	1	594	use `drop-temp+table-test`; DO RELEASE_LOCK("a")

drop database `drop-temp+table-test`;

mysql-test/r/insert_select.result

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ ERROR 23000: Duplicate entry '2' for key 1 
show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	4	Format_desc	1	95	Server ver: VERSION, Binlog ver: 4

master-bin.000001	95	Query	1	183	use `test`; insert into t1 select * from t2

master-bin.000001	95	Query	1	190	use `test`; insert into t1 select * from t2

select * from t1;

a

1