Commit 7d49eca9 authored by unknown's avatar unknown
Browse files

Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/table.cc:
  Auto merged
parents 3c76331f 4e2b6133

BUILD/SETUP.sh

+7 −3
Original line number Diff line number Diff line
@@ -44,17 +44,21 @@ set -e 
export AM_MAKEFLAGS

AM_MAKEFLAGS="-j 4"



# SSL library to use. Should be changed to --with-yassl

SSL_LIBRARY=--with-openssl



# If you are not using codefusion add "-Wpointer-arith" to WARNINGS

# The following warning flag will give too many warnings:

# -Wshadow -Wunused  -Winline (The later isn't usable in C++ as

# __attribute()__ doesn't work with gnu C++)



global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings"

#debug_extra_warnings="-Wuninitialized"

c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"

base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-openssl --with-embedded-server --with-big-tables"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine $SSL_LIBRARY"

base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine $SSL_LIBRARY"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine $SSL_LIBRARY --with-embedded-server --with-big-tables"

max_configs="$base_max_configs --with-embedded-server"

max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"

mysql-test/r/bdb.result

+1 −1
Original line number Diff line number Diff line
@@ -1870,7 +1870,7 @@ a b 
drop table t1;

create table t1 (v varchar(65530), key(v));

Warnings:

Warning	1071	Specified key was too long; max key length is 1024 bytes

Warning	1071	Specified key was too long; max key length is MAX_KEY_LENGTH bytes

drop table if exists t1;

create table t1 (v varchar(65536));

Warnings:

mysql-test/t/bdb.test

+1 −0
Original line number Diff line number Diff line
@@ -962,6 +962,7 @@ source include/varchar.inc; 
# Some errors/warnings on create

#



--replace_result 1024 MAX_KEY_LENGTH 3072 MAX_KEY_LENGTH

create table t1 (v varchar(65530), key(v));

drop table if exists t1;

create table t1 (v varchar(65536));

sql/item_func.cc

+0 −1
Original line number Diff line number Diff line
@@ -1378,7 +1378,6 @@ my_decimal *Item_func_abs::decimal_op(my_decimal *decimal_value) 
void Item_func_abs::fix_length_and_dec()

{

  Item_func_num1::fix_length_and_dec();

  maybe_null= 1;

}

sql/sql_update.cc

+3 −4
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ int mysql_update(THD *thd, 
  bool		safe_update= thd->options & OPTION_SAFE_UPDATES;

  bool		used_key_is_modified, transactional_table;

  int           res;

  int		error=0;

  int		error;

  uint		used_index= MAX_KEY;

  bool          need_sort= TRUE;

#ifndef NO_EMBEDDED_ACCESS_CHECKS
@@ -132,7 +132,7 @@ int mysql_update(THD *thd, 
  ha_rows	updated, found;

  key_map	old_used_keys;

  TABLE		*table;

  SQL_SELECT	*select= 0;

  SQL_SELECT	*select;

  READ_RECORD	info;

  SELECT_LEX    *select_lex= &thd->lex->select_lex;

  bool need_reopen;
@@ -237,7 +237,6 @@ int mysql_update(THD *thd, 
  }

  // Don't count on usage of 'only index' when calculating which key to use

  table->used_keys.clear_all();

  if (limit)

  select= make_select(table, 0, 0, conds, 0, &error);

  if (error || !limit ||

      (select && select->check_quick(thd, safe_update, limit)))