Commit 1139dde7 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
parents fd4dbbf5 f0707767

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/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ DEFS = -DUNDEF_THREADS_HACK \ 
			-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \

			-DDATADIR="\"$(localstatedir)\""



sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

sql_src=log_event.h mysql_priv.h rpl_constants.h \

	log_event.cc my_decimal.h my_decimal.cc

strings_src=decimal.c



link_sources:

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