Commit 4e31551b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-5.1-new 

into  mysql.com:/home/bk/w3023-mysql-5.1-new


configure.in:
  Auto merged
BitKeeper/deleted/.del-sp_notembedded.test:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged
parents 594ba86b d11aa834

configure.in

+7 −4
Original line number Diff line number Diff line
@@ -592,10 +592,10 @@ AC_ARG_WITH(named-curses-libs, 


# Make thread safe client

AC_ARG_ENABLE(thread-safe-client,

    [  --enable-thread-safe-client   

                          Compile the client with threads.],

    [  --disable-thread-safe-client   

                          Compile the client without threads.],

    [ THREAD_SAFE_CLIENT=$enableval ],

    [ THREAD_SAFE_CLIENT=no ]

    [ THREAD_SAFE_CLIENT=yes ]

    )



# compile with strings functions in assembler
@@ -1567,7 +1567,8 @@ then 
fi



AC_ARG_WITH(debug,

    [  --without-debug         Build a production version without debugging code],

    [  --with-debug            Add debug code

  --with-debug=full       Add debug code (adds memory checker, very slow)],

    [with_debug=$withval],

    [with_debug=no])

if test "$with_debug" = "yes"
@@ -2475,6 +2476,8 @@ dnl client is just using plain-old libs. 
sql_client_dirs="strings regex mysys libmysql client"

linked_client_targets="linked_libmysql_sources"



AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")



if test "$THREAD_SAFE_CLIENT" != "no"

then

  sql_client_dirs="libmysql_r $sql_client_dirs"

mysql-test/extra/binlog_tests/binlog.test

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ insert t2 values (5); 
commit;

# first COMMIT must be Query_log_event, second - Xid_log_event

--replace_column 2 # 5 #

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

show binlog events from 102;

drop table t1,t2;
@@ -43,6 +44,8 @@ while ($1) 
commit;

drop table t1;

--replace_column 2 # 5 #

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

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

--replace_column 2 # 5 #

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

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

mysql-test/extra/binlog_tests/blackhole.test

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ select * from t3; 
let $VERSION=`select version()`;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

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

show binlog events;



drop table t1,t2,t3;
@@ -144,4 +145,5 @@ rollback; 
set autocommit=1;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

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

show binlog events;

mysql-test/extra/binlog_tests/ctype_cp932_binlog.test

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ SET @var1= x'8300'; 
# exercise this code from mysql-test-run.

EXECUTE stmt1 USING @var1;

--replace_column 2 # 5 #

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

SHOW BINLOG EVENTS FROM 102;

SELECT HEX(f1) FROM t1;

DROP table t1;

mysql-test/extra/binlog_tests/ctype_ucs_binlog.test

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ create table t2 (c char(30)) charset=ucs2; 
set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

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

show binlog events from 102;

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

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