Commit 0cbd58c5 authored by unknown's avatar unknown
Browse files

Merge with 4.1 


BitKeeper/etc/ignore:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysqladmin.cc:
  Auto merged
heap/hp_create.c:
  Auto merged
heap/hp_write.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/data/data0type.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/type_float.result.es:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
configure.in:
  Use local values
mysql-test/r/ps_1general.result:
  Update results
mysql-test/t/func_gconcat.test:
  no changes
mysql-test/t/ps_1general.test:
  Use local code
ndb/src/common/util/version.c:
  Use local code
sql/filesort.cc:
  Empty line changes
sql/ha_heap.cc:
  Merge
sql/item_timefunc.cc:
  Keep local code
sql/mysql_priv.h:
  Update to 5.0
sql/sql_show.cc:
  Hand merge
support-files/mysql.spec.sh:
  No changes
parents 5168d25f 193eae3b

.bzrignore

+1 −1
Original line number Diff line number Diff line
@@ -753,6 +753,7 @@ ndb/examples/ndbapi_example3/ndbapi_example3 
ndb/examples/ndbapi_example5/ndbapi_example5

ndb/examples/select_all/select_all

ndb/include/ndb_global.h

ndb/include/ndb_types.h

ndb/include/ndb_version.h

ndb/lib/libMGM_API.so

ndb/lib/libNDB_API.so
@@ -1045,4 +1046,3 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl
 
ndb/include/ndb_types.h

Build-tools/Do-compile

+2 −1
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ if ($opt_stage <= 1) 
  $opt_config_options.= " --with-zlib-dir=bundled" if ($opt_bundled_zlib);

  $opt_config_options.= " --with-client-ldflags=-all-static" if ($opt_static_client);

  $opt_config_options.= " --with-debug" if ($opt_with_debug);

  $opt_config_options.= " --without-ndb-debug" if ($opt_with_debug && $opt_with_cluster);

  $opt_config_options.= " --with-libwrap" if ($opt_libwrap);

  $opt_config_options.= " --with-low-memory" if ($opt_with_low_memory);

  $opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server);

client/mysqladmin.cc

+17 −8
Original line number Diff line number Diff line
@@ -833,7 +833,8 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      if (argv[1][0])

      {

        char *pw= argv[1];

        bool old= find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD;

        bool old= (find_type(argv[0], &command_typelib, 2) ==

                   ADMIN_OLD_PASSWORD);

#ifdef __WIN__

        uint pw_len= strlen(pw);

        if (pw_len > 1 && pw[0] == '\'' && pw[pw_len-1] == '\'')
@@ -844,21 +845,29 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
           If we don't already know to use an old-style password, see what

           the server is using

        */

        if (!old) {

          if (mysql_query(mysql, "SHOW VARIABLES LIKE 'old_passwords'")) {

        if (!old)

        {

          if (mysql_query(mysql, "SHOW VARIABLES LIKE 'old_passwords'"))

          {

            my_printf_error(0, "Could not determine old_passwords setting from server; error: '%s'",

                	    MYF(ME_BELL),mysql_error(mysql));

            return -1;

          } else {

          }

          else

          {

            MYSQL_RES *res= mysql_store_result(mysql);

            if (!res) {

              my_printf_error(0, "Could not get old_passwords setting from server; error: '%s'",

            if (!res)

            {

              my_printf_error(0,

                              "Could not get old_passwords setting from "

                              "server; error: '%s'",

        		      MYF(ME_BELL),mysql_error(mysql));

              return -1;

            }

            if (!mysql_num_rows(res)) {

            if (!mysql_num_rows(res))

              old= 1;

            } else {

            else

            {

              MYSQL_ROW row= mysql_fetch_row(res);

              old= !strncmp(row[1], "ON", 2);

            }

heap/hp_create.c

+4 −3
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
    }

    share->min_records= min_records;

    share->max_records= max_records;

    share->max_table_size= create_info->max_table_size;

    share->data_length= share->index_length= 0;

    share->reclength= reclength;

    share->blength= 1;

heap/hp_write.c

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ static byte *next_free_record_pos(HP_SHARE *info) 
  }

  if (!(block_pos=(info->records % info->block.records_in_block)))

  {

    if (info->records > info->max_records && info->max_records)

    if ((info->records > info->max_records && info->max_records) ||

        (info->data_length + info->index_length >= info->max_table_size))

    {

      my_errno=HA_ERR_RECORD_FILE_FULL;

      DBUG_RETURN(NULL);