Merge with 4.0

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
  Auto merged
BitKeeper/etc/config:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
include/myisam.h:
  Auto merged
include/violite.h:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/Makefile.am:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/tree.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/hash_filo.h:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/ha_myisam.cc:
  Merge with 4.0
  Removed some commented code
sql/sql_db.cc:
  Merge with 4.0
  Optimized the logging of the drop db call a bit
sql/sql_update.cc:
  Added comment

1 files changed, 21 insertions, 20 deletions

diff --git a/include/errmsg.h b/include/errmsg.h
index 5ac5ef9a4a7..703395a3742 100644
--- a/include/errmsg.h
+++ b/include/errmsg.h
@@ -61,26 +61,27 @@ extern const char *client_errors[];	/* Error messages */
 #define CR_PROBE_SLAVE_HOSTS    2023
 #define CR_PROBE_SLAVE_CONNECT  2024
 #define CR_PROBE_MASTER_CONNECT 2025
+#define CR_SSL_CONNECTION_ERROR 2026
 
 /* new 4.1 error codes */
-#define CR_INVALID_CONN_HANDLE	2026
-#define CR_NULL_POINTER		2027
-#define CR_NO_PREPARE_STMT	2028
-#define CR_NOT_ALL_PARAMS_BOUND	2029
-#define CR_DATA_TRUNCATED	2030
-#define CR_NO_PARAMETERS_EXISTS 2031
-#define CR_INVALID_PARAMETER_NO 2032
-#define CR_INVALID_BUFFER_USE	2033
-#define CR_UNSUPPORTED_PARAM_TYPE 2034
+#define CR_INVALID_CONN_HANDLE	2027
+#define CR_NULL_POINTER		2028
+#define CR_NO_PREPARE_STMT	2029
+#define CR_NOT_ALL_PARAMS_BOUND	2030
+#define CR_DATA_TRUNCATED	2031
+#define CR_NO_PARAMETERS_EXISTS 2032
+#define CR_INVALID_PARAMETER_NO 2033
+#define CR_INVALID_BUFFER_USE	2034
+#define CR_UNSUPPORTED_PARAM_TYPE 2035
 
-#define CR_SHARED_MEMORY_CONNECTION             2035
-#define CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR  2036
-#define CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR   2037
-#define CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR  2038
-#define CR_SHARED_MEMORY_CONNECT_MAP_ERROR      2039
-#define CR_SHARED_MEMORY_FILE_MAP_ERROR         2040
-#define CR_SHARED_MEMORY_MAP_ERROR              2041
-#define CR_SHARED_MEMORY_EVENT_ERROR     	2042
-#define CR_SHARED_MEMORY_CONNECT_ABANDODED_ERROR  2043
-#define CR_SHARED_MEMORY_CONNECT_SET_ERROR      2046
-#define CR_CONN_UNKNOW_PROTOCOL 		2048
+#define CR_SHARED_MEMORY_CONNECTION             2036
+#define CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR  2037
+#define CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR   2038
+#define CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR 2039
+#define CR_SHARED_MEMORY_CONNECT_MAP_ERROR      2040
+#define CR_SHARED_MEMORY_FILE_MAP_ERROR         2041
+#define CR_SHARED_MEMORY_MAP_ERROR              2042
+#define CR_SHARED_MEMORY_EVENT_ERROR     	2043
+#define CR_SHARED_MEMORY_CONNECT_ABANDODED_ERROR 2044
+#define CR_SHARED_MEMORY_CONNECT_SET_ERROR      2045
+#define CR_CONN_UNKNOW_PROTOCOL 		2046