Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

Docs/manual.texi

@@ -46929,6 +46929,8 @@ not yet 100% confident in this code.
 @appendixsubsec Changes in release 3.23.53
 @itemize @bullet
 @item
+Fixed problem with @code{configure ... --localstatedir=...}.
+@item
 Fixed problem with @code{UNSIGNED BIGINT} on AIX (again).
 @item
 Fixed bug in pthread_mutex_trylock() on HPUX 11.0

sql/mysqld.cc

@@ -3458,7 +3458,7 @@ static void set_options(void)
   (void) strmake(default_charset, MYSQL_CHARSET, sizeof(default_charset)-1);
   (void) strmake(language, LANGUAGE, sizeof(language)-1);
   (void) strmake(mysql_real_data_home, get_relative_path(DATADIR),
-		 sizeof(mysql_real_data_home-1));
+		 sizeof(mysql_real_data_home)-1);
 #ifdef __WIN__
   /* Allow Win32 users to move MySQL anywhere */
   {