Fix after merge

Updated WEEK() and DATE information in the manual.


Docs/manual.texi:
  Updated WEEK() information.
  Added more information of how MySQL stores dates.
libmysql/Makefile.am:
  Fix after merge
libmysqld/lib_vio.c:
  Use new vio_blocking()
mysql-test/r/group_by.result:
  Update results after merge
sql/ha_innodb.cc:
  Fix after merge
sql/lex.h:
  Fix after merge
sql/slave.cc:
  Added missing include file
sql/sql_base.cc:
  Added function comments
vio/test-ssl.c:
  Fix after merge

4 files changed, 21 insertions, 5 deletions

diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 06931532f51..038da716abe 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -2402,7 +2402,7 @@ ha_innobase::rnd_pos(
 	int		error;
 	uint		keynr	= active_index;
 	DBUG_ENTER("rnd_pos");
-	DBUG_DUMP("key", (char*) pos, ref_stored_len);
+	DBUG_DUMP("key", (char*) pos, ref_length);
 
 	statistic_increment(ha_read_rnd_count, &LOCK_status);
 
diff --git a/sql/lex.h b/sql/lex.h
index 1f7a121e262..c1d647c47aa 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -251,7 +251,6 @@ static SYMBOL symbols[] = {
   { "NEW",              SYM(NEW_SYM),0,0},
   { "NCHAR",		SYM(NCHAR_SYM),0,0},
   { "NO",		SYM(NO_SYM),0,0},
-  { "FOREIGN_KEY_CHECKS", SYM(FOREIGN_KEY_CHECKS), 0, 0},
   { "NOT",		SYM(NOT),0,0},
   { "NULL",		SYM(NULL_SYM),0,0},
   { "NUMERIC",		SYM(NUMERIC_SYM),0,0},
@@ -285,7 +284,6 @@ static SYMBOL symbols[] = {
   { "RELAY_LOG_POS",    SYM(RELAY_LOG_POS_SYM),0,0},
   { "RELOAD",		SYM(RELOAD),0,0},
   { "REGEXP",		SYM(REGEXP),0,0},
-  { "UNIQUE_CHECKS",	SYM(UNIQUE_CHECKS), 0, 0},
   { "RENAME",		SYM(RENAME),0,0},
   { "REPAIR",		SYM(REPAIR),0,0},
   { "REPLACE",		SYM(REPLACE),0,0},
diff --git a/sql/slave.cc b/sql/slave.cc
index 84e0f6dd236..2bde91f3ccd 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -23,6 +23,7 @@
 #include "sql_repl.h"
 #include "repl_failsafe.h"
 #include <thr_alarm.h>
+#include <my_dir.h>
 #include <assert.h>
 
 bool use_slave_mask = 0;
@@ -1029,7 +1030,6 @@ void end_master_info(MASTER_INFO* mi)
 
 int init_relay_log_info(RELAY_LOG_INFO* rli, const char* info_fname)
 {
-  MY_STAT stat_area;
   char fname[FN_REFLEN+128];
   int info_fd;
   const char* msg = 0;
@@ -1069,7 +1069,7 @@ int init_relay_log_info(RELAY_LOG_INFO* rli, const char* info_fname)
     DBUG_RETURN(1);
 
   /* if file does not exist */
-  if (!my_stat(fname, &stat_area, MYF(0)))
+  if (access(fname,F_OK))
   {
     /*
       If someone removed the file from underneath our feet, just close
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 0f540a3a4fd..fddc2080764 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -108,6 +108,24 @@ static void check_unused(void)
 #define check_unused()
 #endif
 
+/*
+  Create a list for all open tables matching SQL expression
+
+  SYNOPSIS
+    list_open_tables()
+    thd			Thread THD
+    wild		SQL like expression
+
+  NOTES
+    One gets only a list of tables for which one has any kind of privilege.
+    db and table names are allocated in result struct, so one doesn't need
+    a lock on LOCK_open when traversing the return list.
+
+  RETURN VALUES
+    NULL	Error (Probably OOM)
+    #		Pointer to list of names of open tables.
+*/
+
 OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild)
 {
   int result = 0;