Commit ce99d443 authored by unknown's avatar unknown
Browse files

Merge with 4.1 


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
include/m_string.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
libmysql/libmysql.c:
  ul
mysql-test/r/ps_1general.result:
  Merge
mysql-test/t/derived.test:
  Merge
mysql-test/t/ps_1general.test:
  Merge
mysql-test/t/type_float.test:
  Merge
sql/field.cc:
  ul
sql/item.cc:
  ul
sql/item.h:
  ul
sql/item_func.h:
  ul
sql/item_strfunc.cc:
  ul
sql/item_sum.cc:
  ul
sql/item_sum.h:
  ul
sql/procedure.h:
  ul
sql/sql_derived.cc:
  Trivial merge
sql/sql_parse.cc:
  ul
sql/sql_update.cc:
  Trivial merge
strings/strtod.c:
  Use updated code from 4.1
  This is bascily same code as we had before or 5.0, execpt that we now have higher accuracy for floating points value that are integers (like 123.45E+02)
parents 6965e72b 2ae6eb09

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ bar@deer.(none) 
bar@gw.udmsearch.izhnet.ru

bar@mysql.com

bar@noter.intranet.mysql.r18.ru

bell@51.0.168.192.in-addr.arpa

bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk

client/mysql.cc

+2 −2
Original line number Diff line number Diff line
@@ -2926,9 +2926,9 @@ com_status(String *buffer __attribute__((unused)), 
    MYSQL_ROW cur=mysql_fetch_row(result);

    if (cur)

    {

      tee_fprintf(stdout, "Server characterset:\t%s\n", cur[0] ? cur[0] : "");

      tee_fprintf(stdout, "Server characterset:\t%s\n", cur[2] ? cur[2] : "");

      tee_fprintf(stdout, "Db     characterset:\t%s\n", cur[3] ? cur[3] : "");

      tee_fprintf(stdout, "Client characterset:\t%s\n", cur[2] ? cur[2] : "");

      tee_fprintf(stdout, "Client characterset:\t%s\n", cur[0] ? cur[0] : "");

      tee_fprintf(stdout, "Conn.  characterset:\t%s\n", cur[1] ? cur[1] : "");

    }

    mysql_free_result(result);

extra/my_print_defaults.c

+13 −5
Original line number Diff line number Diff line
@@ -120,25 +120,33 @@ int main(int argc, char **argv) 
  int count, error;

  char **load_default_groups, *tmp_arguments[2],

       **argument, **arguments;

  char *defaults, *extra_defaults;

  MY_INIT(argv[0]);



  get_defaults_files(argc, argv, &defaults, &extra_defaults);



  /*

  ** Check out the args

  */

  if (get_options(&argc,&argv))

    exit(1);

  if (!(load_default_groups=(char**) my_malloc((argc+2)*sizeof(char*),

					       MYF(MY_WME))))

    exit(1);

  if (get_options(&argc,&argv))

    exit(1);



  for (count=0; *argv ; argv++,count++)

    load_default_groups[count]= *argv;

  load_default_groups[count]=0;



  count=1;

  count=0;

  arguments=tmp_arguments;

  arguments[0]=my_progname;

  arguments[1]=0;

  arguments[count++]=my_progname;

  if (extra_defaults)

    arguments[count++]= extra_defaults;

  if (defaults)

    arguments[count++]= defaults;

  arguments[count]= 0;



  if ((error= load_defaults(config_file, (const char **) load_default_groups,

			   &count, &arguments)))

  {

mysql-test/mysql-test-run.sh

+2 −1
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ while test $# -gt 0; do 
       --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqldump.trace"

      EXTRA_MYSQLBINLOG_OPT="$EXTRA_MYSQLBINLOG_OPT \

       --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqlbinlog.trace"

      EXTRA_MYSQL_CLIENT_TEST_OPT="--debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysql_client_test.trace"

      ;;

    --fast)

      FAST_START=1
@@ -690,7 +691,7 @@ then 
  EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --user=root"

fi



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

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

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  --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-test/r/ctype_latin1.result

+5 −0
Original line number Diff line number Diff line
@@ -325,3 +325,8 @@ latin1_bin 6109 
latin1_bin	61

latin1_bin	6120

drop table t1;

CREATE TABLE a (a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'a (a int)' at line 1

SELECT 'a' as str;

str

a