Commit ab266824 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_parse.cc:
  Auto merged
parents ba2c213b eec84895

include/my_sys.h

+2 −1
Original line number Diff line number Diff line
@@ -845,7 +845,8 @@ extern char *get_charsets_dir(char *buf); 
extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);

extern my_bool init_compiled_charsets(myf flags);

extern void add_compiled_collation(CHARSET_INFO *cs);

extern ulong escape_string_for_mysql(CHARSET_INFO *charset_info, char *to,

extern ulong escape_string_for_mysql(CHARSET_INFO *charset_info,

                                     char *to, ulong to_length,

                                     const char *from, ulong length);



extern void thd_increment_bytes_sent(ulong length);

innobase/include/trx0trx.h

+3 −2
Original line number Diff line number Diff line
@@ -390,8 +390,9 @@ struct trx_struct{ 
	dulint		table_id;	/* table id if the preceding field is

					TRUE */

	/*------------------------------*/

	int		active_trans;	/* whether a transaction in MySQL

					is active */

	int		active_trans;	/* 1 - if a transaction in MySQL

					is active. 2 - if prepare_commit_mutex

                                        was taken */

	void*           mysql_thd;      /* MySQL thread handle corresponding

					to this trx, or NULL */

	char**		mysql_query_str;/* pointer to the field in mysqld_thd

libmysql/libmysql.c

+2 −2
Original line number Diff line number Diff line
@@ -1575,14 +1575,14 @@ mysql_hex_string(char *to, const char *from, ulong length) 
ulong STDCALL

mysql_escape_string(char *to,const char *from,ulong length)

{

  return escape_string_for_mysql(default_charset_info, to, from, length);

  return escape_string_for_mysql(default_charset_info, to, 0, from, length);

}



ulong STDCALL

mysql_real_escape_string(MYSQL *mysql, char *to,const char *from,

			 ulong length)

{

  return escape_string_for_mysql(mysql->charset, to, from, length);

  return escape_string_for_mysql(mysql->charset, to, 0, from, length);

}

mysql-test/r/rpl_drop_temp.result

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ create temporary table mysqltest.t2 (n int); 
show status like 'Slave_open_temp_tables';

Variable_name	Value

Slave_open_temp_tables	0

drop database mysqltest;

mysql-test/t/rpl_drop_temp.test

+3 −0
Original line number Diff line number Diff line
@@ -11,3 +11,6 @@ disconnect master; 
connection slave;

--real_sleep 3; # time for DROP to be written

show status like 'Slave_open_temp_tables';

connection default;

drop database mysqltest;