Commit 1d94a1ac authored by unknown's avatar unknown
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


mysql-test/r/rpl_ndb_basic.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 6751cb25 cbbb4034

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ path=`dirname $0` 
. "$path/SETUP.sh" "$@" --with-debug=full



extra_flags="$pentium_cflags $debug_cflags"

extra_configs="$pentium_configs $debug_configs $max_configs $error_inject"

extra_configs="$pentium_configs $debug_configs $max_configs $error_inject --with-experimental-collations"



. "$path/FINISH.sh"

client/mysql.cc

+2 −1
Original line number Diff line number Diff line
@@ -2517,7 +2517,8 @@ print_table_data_xml(MYSQL_RES *result) 


  tee_fputs("<?xml version=\"1.0\"?>\n\n<resultset statement=\"", PAGER);

  xmlencode_print(glob_buffer.ptr(), (int)strlen(glob_buffer.ptr()));

  tee_fputs("\">", PAGER);

  tee_fputs("\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">",

            PAGER);



  fields = mysql_fetch_fields(result);

  while ((cur = mysql_fetch_row(result)))

client/mysqlbinlog.cc

+7 −9
Original line number Diff line number Diff line
@@ -481,19 +481,17 @@ static int 
write_event_header_and_base64(Log_event *ev, FILE *result_file,

                              PRINT_EVENT_INFO *print_event_info)

{

  IO_CACHE *head= &print_event_info->head_cache;

  IO_CACHE *body= &print_event_info->body_cache;

  DBUG_ENTER("write_event_header_and_base64");

  /* Write header and base64 output to cache */

  IO_CACHE result_cache;

  if (open_cached_file(&result_cache, NULL, NULL, 0, MYF(MY_WME | MY_NABP)))

    return 1;



  ev->print_header(&result_cache, print_event_info, FALSE);

  ev->print_base64(&result_cache, print_event_info, FALSE);

  /* Write header and base64 output to cache */

  ev->print_header(head, print_event_info, FALSE);

  ev->print_base64(body, print_event_info, FALSE);



  /* Read data from cache and write to result file */

  my_b_copy_to_file(&result_cache, result_file);

  close_cached_file(&result_cache);

  DBUG_RETURN(0);

  DBUG_RETURN(copy_event_cache_to_file_and_reinit(head, result_file) ||

              copy_event_cache_to_file_and_reinit(body, result_file));

}

config/ac-macros/character_sets.m4

+13 −0
Original line number Diff line number Diff line
@@ -429,3 +429,16 @@ then 
else

  AC_MSG_RESULT(no)

fi





# Shall we build experimental collations

AC_ARG_WITH(experimental-collations,

    [],

    [with_exp_coll=$withval],

    [with_exp_coll=no]

)



if test "$with_exp_coll" = "yes"

then

  AC_DEFINE([HAVE_UTF8_GENERAL_CS], [1], [certain Japanese customer])

fi

mysql-test/extra/binlog_tests/binlog.test

+4 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ commit; 
# first COMMIT must be Query_log_event, second - Xid_log_event

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;

drop table t1,t2;



#
@@ -44,10 +44,10 @@ commit; 
drop table t1;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

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

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

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

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

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



# Test of a too big SET INSERT_ID: see if the truncated value goes

# into binlog (right), or the too big value (wrong); we look at the
@@ -82,7 +82,7 @@ DELETE FROM user WHERE host='localhost' AND user='@#@'; 
use test;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;

drop table t1,t2,t3,tt1;



-- source extra/binlog_tests/binlog_insert_delayed.test