merge with 4.1

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
Docs/Support/texi2html:
  Auto merged
Makefile.am:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/my_time.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/include/ps_modify.inc:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_recoding.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/insert.test:
  merge with 4.1
  Fixed test case to not use 'if exists' when it shouldn't
mysql-test/t/range.test:
  merge with 4.1
  Added missing drop table
sql/ha_ndbcluster.cc:
  merge with 4.1
  Simple optimization: use max() instead of ? :
sql/item_func.cc:
  merge with 4.1
  (Added back old variable names for easier merges)
sql/opt_range.cc:
  merge with 4.1
  Removed argument 'parent_alloc' from QUICK_RANGE_SELECT as this was not used
  Added assert if using QUICK_GROUP_MIN_MAX_SELECT with parent_alloc as the init() function can't handle this
  Changed back get_quick_select_for_ref() to use it's own alloc root becasue this function may be called several times for one query
sql/sql_handler.cc:
  merge with 4.1
  change variable 'err' to 'error' as same function had a label named 'err'
sql/sql_update.cc:
  Use multi-update code from 5.0 instead of 4.1
  We will fix the locking code shortly in 5.0 to be faster than in 4.1

1 files changed, 0 insertions, 98 deletions

diff --git a/Docs/Flags/canada.eps b/Docs/Flags/canada.eps
deleted file mode 100644
index 7773f12a699..00000000000
--- a/Docs/Flags/canada.eps
+++ /dev/null
@@ -1,98 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Creator: pnmtops
-%%Title: canada.ps
-%%Pages: 1
-%%BoundingBox: 290 385 321 407
-%%EndComments
-/readstring {
-  currentfile exch readhexstring pop
-} bind def
-/rpicstr 32 string def
-/gpicstr 32 string def
-/bpicstr 32 string def
-%%EndProlog
-%%Page: 1 1
-gsave
-290.64 385.44 translate
-30.72 21.12 scale
-32 22 8
-[ 32 0 0 -22 0 22 ]
-{ rpicstr readstring }
-{ gpicstr readstring }
-{ bpicstr readstring }
-true 3
-colorimage
-000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000
-00000000000000c6c6c6c6c6c6c6def7f7f7f7f7f7f7f7f7f7f7f7f7f7de
-c6c6c6c6c6c6c60000000000000000007bf7f7f7f7f7f7f7f7f7f7f7f7f7
-f778000000000000000000000000000000007bf7f7f7f7f7f7f7f7f7f7f7
-f7f7f779000000000000000000c6c6c6c6c6c6c6def7f7f7f7f7f7f7f7f7
-f7f7f7f7f7dec6c6c6c6c6c6c60000000000000000007bf7f7f7f7f7f7f7
-f7f7f7f7f7f7f778000000000000000000000000000000007bf7f7f7f7f7
-f7f7f7f7f7f7f7f7f779000000000000000000c6c6c6c6c6c6c6def7f7f7
-f7f7f7f7f7f7f7f7f7f7f7dec6c6c6c6c6c6c60000000000000000007bf7
-f7f7f7f7f7f7f7f7f7f7f7f7f77800000000000000000000000000000000
-7bf7f7f7f7f7f7f7f7f7f7f7f7f7f779000000000000000000c6c6c6c6c6
-c6c6def7f7f7f7f7f7f7f7f7f7f7f7f7f7dec6c6c6c6c6c6c60000000000
-000000007bf7f7f7f7f7f7f5f5f7f7f7f7f7f77800000000000000000000
-0000000000007bf7f7f7f7f7f7f5f5f7f7f7f7f7f7790000000000000000
-00c6c6c6c6c6c6c6def7f7f7f7f7f7e8e8f7f7f7f7f7f7dec6c6c6c6c6c6
-c60000000000000000007bf7f7f7f7f7f7adadf7f7f7f7f7f77800000000
-0000000000000000000000007bf7f7f7f7f7f7adadf7f7f7f7f7f7790000
-00000000000000c6c6c6c6c6c6c6def7f7f7f7f7f5d3d3f5f7f7f7f7f7de
-c6c6c6c6c6c6c60000000000000000007bf7f7f7f7f5ec4242ecf5f7f7f7
-f778000000000000000000000000000000007bf7f7f7f7f5ec4242ecf5f7
-f7f7f779000000000000000000c6c6c6c6c6c6c6def7f7f7f7f7d5c6c6d5
-f7f7f7f7f7dec6c6c6c6c6c6c60000000000000000007bf7f7f7f7f74a01
-014af7f7f7f7f778000000000000000000000000000000007bf7f7f7f7f7
-4a01014af7f7f7f7f779000000000000000000c6c6c6c6c6c6c6def7f7f7
-f2f7dcc6c6dcf7f2f7f7f7dec6c6c6c6c6c6c60000000000000000007bf7
-f7f7dcf76f00006ff7dcf7f7f77800000000000000000000000000000000
-7bf7f7f7dcf76f00006ff7dcf7f7f779000000000000000000c6c6c6c6c6
-c6c6def7eee9d9d5e4c6c6e4d5d9e9eef7dec6c6c6c6c6c6c60000000000
-000000007bf7caaf5e4995000095495eafcaf77800000000000000000000
-0000000000007bf7caaf5f4996000096495fafcaf7790000000000000000
-00c6c6c6c6c6c6c6def7f4c8c6c6c7c6c6c7c6c6c8f3f7dec6c6c6c6c6c6
-c60000000000000000007bf7e508000004000004000008e5f77800000000
-0000000000000000000000007bf7e508000004000004000008e5f7790000
-00000000000000c6c6c6c6c6c6c6def7f0cdc6c6c6c6c6c6c6c6cdf0f7de
-c6c6c6c6c6c6c60000000000000000007bf7d222000000000000000022d2
-f778000000000000000000000000000000007bf7d2220000000000000000
-22d2f779000000000000000000c6c6c6c6c6c6c6def7f7ecdccbc6c6c6c6
-cbdcecf7f7dec6c6c6c6c6c6c60000000000000000007bf7f6c16d1b0000
-00001b6dc0f6f778000000000000000000000000000000007bf7f6c16d1b
-000000001b6dc1f6f779000000000000000000c6c6c6c6c6c6c6def7f7f7
-f7dbc6c6c6c6dbf7f7f7f7dec6c6c6c6c6c6c60000000000000000007bf7
-f7f7f76b000000006bf7f7f7f77800000000000000000000000000000000
-7bf7f7f7f76b000000006bf7f7f7f779000000000000000000c6c6c6c6c6
-c6c6def7f7f7f7eef2e9e9f2eef6f7f7f7dec6c6c6c6c6c6c60000000000
-000000007bf7f7f7f4c8dcb0b0dcc8f4f7f7f77800000000000000000000
-0000000000007bf7f7f7f4c9dcb0b0dcc9f4f7f7f7790000000000000000
-00c6c6c6c6c6c6c6def7f7f7f7f7f7e9e9f7f7f7f7f7f7dec6c6c6c6c6c6
-c60000000000000000007bf7f7f7f7f7f7b2b2f7f7f7f7f7f77800000000
-0000000000000000000000007bf7f7f7f7f7f7b2b2f7f7f7f7f7f7790000
-00000000000000c6c6c6c6c6c6c6def7f7f7f7f7f7e9e9f7f7f7f7f7f7de
-c6c6c6c6c6c6c60000000000000000007bf7f7f7f7f7f7aeaef7f7f7f7f7
-f778000000000000000000000000000000007bf7f7f7f7f7f7aeaef7f7f7
-f7f7f779000000000000000000c6c6c6c6c6c6c6def7f7f7f7f7f7f4f4f7
-f7f7f7f7f7dec6c6c6c6c6c6c60000000000000000007bf7f7f7f7f7f7ea
-e9f7f7f7f7f7f778000000000000000000000000000000007bf7f7f7f7f7
-f7eaeaf7f7f7f7f7f779000000000000000000c6c6c6c6c6c6c6def7f7f7
-f7f7f7f7f7f7f7f7f7f7f7dec6c6c6c6c6c6c60000000000000000007bf7
-f7f7f7f7f7f7f7f7f7f7f7f7f77800000000000000000000000000000000
-7bf7f7f7f7f7f7f7f7f7f7f7f7f7f779000000000000000000c6c6c6c6c6
-c6c6def7f7f7f7f7f7f7f7f7f7f7f7f7f7dec6c6c6c6c6c6c60000000000
-000000007bf7f7f7f7f7f7f7f7f7f7f7f7f7f77800000000000000000000
-0000000000007bf7f7f7f7f7f7f7f7f7f7f7f7f7f7790000000000000000
-00c6c6c6c6c6c6c6def7f7f7f7f7f7f7f7f7f7f7f7f7f7dec6c6c6c6c6c6
-c60000000000000000007bf7f7f7f7f7f7f7f7f7f7f7f7f7f77800000000
-0000000000000000000000007bf7f7f7f7f7f7f7f7f7f7f7f7f7f7790000
-000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000
-grestore
-showpage
-%%Trailer