After merge fixes

Added initialization of all important global variables


BUILD/SETUP.sh:
  build with readline
client/mysqltest.c:
  Added variable SERVER_VERSION
myisam/mi_key.c:
  Indentation change
myisam/mi_open.c:
  After merge fix
myisam/mi_range.c:
  After merge fix
myisam/mi_rkey.c:
  After merge fix
myisam/mi_search.c:
  After merge fix
myisam/myisamdef.h:
  After merge fix
mysql-test/include/not_embedded.inc:
  Fix test (because of wrong utf8 test)
mysql-test/r/alter_table.result:
  Updated results after merge
mysql-test/r/create.result:
  Updated results after merge
mysql-test/r/ctype_recoding.result:
  Updated results after merge
mysql-test/r/fulltext.result:
  Updated results after merge
mysql-test/r/func_group.result:
  Updated results after merge
mysql-test/r/group_by.result:
  Updated results after merge
mysql-test/r/innodb.result:
  Updated results after merge
mysql-test/r/join_outer.result:
  Updated results after merge
mysql-test/r/null_key.result:
  Updated results after merge
mysql-test/r/order_by.result:
  Updated results after merge
mysql-test/r/query_cache.result:
  Updated results after merge
mysql-test/r/repair.result:
  Updated results after merge
mysql-test/r/rpl_flush_tables.result:
  Updated results after merge
mysql-test/r/union.result:
  Updated results after merge
mysql-test/r/update.result:
  Updated results after merge
mysql-test/t/ansi.test:
  After merge fixes
mysql-test/t/create.test:
  After merge fixes
mysql-test/t/ctype_recoding.test:
  After merge fixes
mysql-test/t/ctype_ujis.test:
  After merge fixes
mysql-test/t/fulltext.test:
  After merge fixes
mysql-test/t/innodb.test:
  After merge fixes
mysql-test/t/join_outer.test:
  After merge fixes
mysql-test/t/loaddata.test:
  After merge fixes
mysql-test/t/order_by.test:
  After merge fixes
mysql-test/t/rpl_flush_tables.test:
  After merge fixes
mysql-test/t/status.test:
  After merge fixes
mysql-test/t/subselect.test:
  After merge fixes
sql/convert.cc:
  Code cleanup
sql/field.cc:
  After merge fixes
sql/filesort.cc:
  Remove compiler warning
sql/item.cc:
  More efficient set_name() (no mallocs)
sql/item_cmpfunc.cc:
  Code Code cleanup
  Item_bool_func2::fix_fields() added to get error handling right for cmp_charset
sql/item_cmpfunc.h:
  New prototypes
sql/item_func.cc:
  After merge fix
sql/item_strfunc.cc:
  Faster check for BINARY
sql/log_event.cc:
  Comment cleanup
sql/mysql_priv.h:
  New prototypes and variables
sql/mysqld.cc:
  Added initialization of all important global variables.
  Cleanup of variable declarations
  This is needed ot make the embedded version restartable
sql/opt_sum.cc:
  After merge fix
sql/set_var.cc:
  Code cleanup
sql/sql_acl.cc:
  After merge fix
  Better error message
sql/sql_db.cc:
  After merge fix
sql/sql_derived.cc:
  After merge fix
sql/sql_insert.cc:
  Indentation cleanups
sql/sql_list.h:
  Added empty() to base_ilist
sql/sql_parse.cc:
  After merge fix
sql/sql_select.cc:
  After merge fix
  Fixed derived name handling in EXPLAIN
sql/sql_show.cc:
  After merge fix
sql/sql_string.cc:
  Made copy_and_convert global
sql/sql_string.h:
  Made copy_and_convert global
sql/sql_update.cc:
  After merge fix
sql/sql_yacc.yy:
  After merge fix
sql/thr_malloc.cc:
  Added sql_strmake_with_convert()
sql/unireg.h:
  Added MAX_ALIAS_NAME
strings/ctype-ujis.c:
  Fixed bug in converting to ujis

1 files changed, 30 insertions, 30 deletions

diff --git a/sql/log_event.cc b/sql/log_event.cc
index be5b5079eee..900d0a482aa 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -195,9 +195,9 @@ static inline int read_str(char * &buf, char *buf_end, char * &str,
 }
 
 
-/**************************************************************************/
+/**************************************************************************
 	Log_event methods
-***************************************************************************/
+**************************************************************************/
 
 /*
   Log_event::get_type_str()
@@ -715,9 +715,9 @@ void Log_event::set_log_pos(MYSQL_LOG* log)
 #endif // !MYSQL_CLIENT
 
 
-/**************************************************************************/
+/**************************************************************************
 	Query_log_event methods
-***************************************************************************/
+**************************************************************************/
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
 
@@ -982,9 +982,9 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli)
 #endif
 
 
-/**************************************************************************/
+/**************************************************************************
 	Start_log_event methods
-***************************************************************************/
+**************************************************************************/
 
 /*
   Start_log_event::pack_info()
@@ -1093,9 +1093,9 @@ int Start_log_event::exec_event(struct st_relay_log_info* rli)
 }
 #endif /* defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */
 
-/**************************************************************************/
+/**************************************************************************
 	Load_log_event methods
-***************************************************************************/
+**************************************************************************/
 
 /*
   Load_log_event::pack_info()
@@ -1651,9 +1651,9 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
 #endif
 
 
-/****************************************************************************/
+/**************************************************************************
   Rotate_log_event methods
-*****************************************************************************/
+**************************************************************************/
 
 /*
   Rotate_log_event::pack_info()
@@ -1788,9 +1788,9 @@ int Rotate_log_event::exec_event(struct st_relay_log_info* rli)
 #endif
 
 
-/***************************************************************************/
+/**************************************************************************
 	Intvar_log_event methods
-****************************************************************************/
+**************************************************************************/
 
 /*
   Intvar_log_event::pack_info()
@@ -1902,9 +1902,9 @@ int Intvar_log_event::exec_event(struct st_relay_log_info* rli)
 #endif
 
 
-/****************************************************************************
+/**************************************************************************
   Rand_log_event methods
-****************************************************************************/
+**************************************************************************/
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
 void Rand_log_event::pack_info(Protocol *protocol)
@@ -1964,9 +1964,9 @@ int Rand_log_event::exec_event(struct st_relay_log_info* rli)
 #endif // !MYSQL_CLIENT
 
 
-/***************************************************************************
+/**************************************************************************
   User_var_log_event methods
-***************************************************************************/
+**************************************************************************/
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
 void User_var_log_event::pack_info(Protocol* protocol)
@@ -2195,9 +2195,9 @@ int User_var_log_event::exec_event(struct st_relay_log_info* rli)
 #endif // !MYSQL_CLIENT
 
 
-/****************************************************************************
+/**************************************************************************
   Slave_log_event methods
-****************************************************************************/
+**************************************************************************/
 
 #ifdef HAVE_REPLICATION
 #ifdef MYSQL_CLIENT
@@ -2342,9 +2342,9 @@ int Slave_log_event::exec_event(struct st_relay_log_info* rli)
 #endif // !MYSQL_CLIENT
 
 
-/***************************************************************************/
+/**************************************************************************
 	Stop_log_event methods
-****************************************************************************/
+**************************************************************************/
 
 /*
   Stop_log_event::print()
@@ -2403,9 +2403,9 @@ int Stop_log_event::exec_event(struct st_relay_log_info* rli)
 #endif /* HAVE_REPLICATION */
 
 
-/***************************************************************************/
+/**************************************************************************
 	Create_file_log_event methods
-****************************************************************************/
+**************************************************************************/
 
 /*
   Create_file_log_event ctor
@@ -2622,9 +2622,9 @@ err:
 #endif
 
 
-/***************************************************************************/
+/**************************************************************************
 	Append_block_log_event methods
-****************************************************************************/
+**************************************************************************/
 
 /*
   Append_block_log_event ctor
@@ -2739,9 +2739,9 @@ err:
 #endif
 
 
-/***************************************************************************/
+/**************************************************************************
 	Delete_file_log_event methods
-****************************************************************************/
+**************************************************************************/
 
 /*
   Delete_file_log_event ctor
@@ -2829,9 +2829,9 @@ int Delete_file_log_event::exec_event(struct st_relay_log_info* rli)
 #endif
 
 
-/**************************************************************************/
+/**************************************************************************
 	Execute_load_log_event methods
-***************************************************************************/
+**************************************************************************/
 
 /*
   Execute_load_log_event ctor
@@ -2971,9 +2971,9 @@ err:
 #endif /* defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */
 
 
-/**************************************************************************/
+/**************************************************************************
 	sql_ex_info methods
-***************************************************************************/
+**************************************************************************/
 
 /*
   sql_ex_info::write_data()