merge with 4.0 (to get compiler error fixes for innodb)

client/mysqltest.c:
  Auto merged
include/errmsg.h:
  Auto merged
include/mysql_version.h.in:
  Auto merged
innobase/que/que0que.c:
  Auto merged
mysql-test/t/rpl000009.test:
  Auto merged
sql/set_var.cc:
  Auto merged
libmysql/errmsg.c:
  merge with 4.0
libmysql/libmysql.c:
  merge with 4.0
mysql-test/mysql-test-run.sh:
  merge with 4.0
mysql-test/r/rpl000009.result:
  merge with 4.0
scripts/mysql_fix_privilege_tables.sh:
  merge with 4.0
sql/repl_failsafe.cc:
  merge with 4.0

17 files changed, 320 insertions, 157 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index ed4840cf809..1db385b85cb 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -870,18 +870,22 @@ int do_exec(struct st_query* q)
   char buf[1024];
   FILE *res_file;
   char *cmd= q->first_argument;
+  DBUG_ENTER("do_exec");
 
   while (*cmd && my_isspace(charset_info, *cmd))
     cmd++;
   if (!*cmd)
     die("Missing argument in exec\n");
 
+  DBUG_PRINT("info", ("Executing '%s'", cmd));
+
+  if (!(res_file= popen(cmd, "r")) && q->abort_on_error)
+    die("popen() failed\n");
+
   if (disable_result_log)
   {
-    if (!(res_file= popen(cmd, "r")) && q->abort_on_error)
-      die("popen() failed\n");
-    while (fgets(buf, sizeof(buf), res_file));
-    pclose(res_file);
+    while (fgets(buf, sizeof(buf), res_file))
+    {}
   }
   else
   {
@@ -893,11 +897,8 @@ int do_exec(struct st_query* q)
     else
       ds= &ds_res;
 
-    if (!(res_file= popen(cmd, "r")) && q->abort_on_error)
-      die("popen() failed\n");
     while (fgets(buf, sizeof(buf), res_file))
       replace_dynstr_append_mem(ds, buf, strlen(buf));
-    pclose(res_file);
   
     if (glob_replace)
       free_replace();
@@ -916,8 +917,9 @@ int do_exec(struct st_query* q)
     if (ds == &ds_tmp)
       dynstr_free(&ds_tmp);
   }
+  pclose(res_file);
   
-  return error;
+  DBUG_RETURN(error);
 }
 
 int var_query_set(VAR* v, const char* p, const char** p_end)
@@ -1052,7 +1054,7 @@ int do_system(struct st_query* q)
   eval_expr(&v, p, 0); /* NULL terminated */
   if (v.str_val_len)
   {
-    char expr_buf[512];
+    char expr_buf[1024];
     if ((uint)v.str_val_len > sizeof(expr_buf) - 1)
       v.str_val_len = sizeof(expr_buf) - 1;
     memcpy(expr_buf, v.str_val, v.str_val_len);
@@ -1797,11 +1799,12 @@ int read_query(struct st_query** q_ptr)
   char *p = read_query_buf, * p1 ;
   int expected_errno;
   struct st_query* q;
+  DBUG_ENTER("read_query_buf");
 
   if (parser.current_line < parser.read_lines)
   {
     get_dynamic(&q_lines, (gptr) q_ptr, parser.current_line) ;
-    return 0;
+    DBUG_RETURN(0);
   }
   if (!(*q_ptr= q= (struct st_query*) my_malloc(sizeof(*q), MYF(MY_WME))) ||
       insert_dynamic(&q_lines, (gptr) &q))
@@ -1820,7 +1823,7 @@ int read_query(struct st_query** q_ptr)
   q->type = Q_UNKNOWN;
   q->query_buf= q->query= 0;
   if (read_line(read_query_buf, sizeof(read_query_buf)))
-    return 1;
+    DBUG_RETURN(1);
 
   if (*p == '#')
   {
@@ -1874,7 +1877,7 @@ int read_query(struct st_query** q_ptr)
   q->first_argument= p;
   q->end= strend(q->query);
   parser.read_lines++;
-  return 0;
+  DBUG_RETURN(0);
 }
 
 
@@ -2392,10 +2395,12 @@ void get_query_type(struct st_query* q)
 {
   char save;
   uint type;
+  DBUG_ENTER("get_query_type");
+
   if (*q->query == '}')
   {
     q->type = Q_END_BLOCK;
-    return;
+    DBUG_VOID_RETURN;
   }
   if (q->type != Q_COMMENT_WITH_COMMAND)
     q->type = Q_QUERY;
@@ -2406,8 +2411,10 @@ void get_query_type(struct st_query* q)
   q->query[q->first_word_len]=save;
   if (type > 0)
     q->type=(enum enum_commands) type;		/* Found command */
+  DBUG_VOID_RETURN;
 }
 
+
 static byte *get_var_key(const byte* var, uint* len,
 			 my_bool __attribute__((unused)) t)
 {
diff --git a/include/errmsg.h b/include/errmsg.h
index 16f220a7ee2..76a293f3dec 100644
--- a/include/errmsg.h
+++ b/include/errmsg.h
@@ -63,6 +63,7 @@ extern const char *client_errors[];	/* Error messages */
 #define CR_PROBE_MASTER_CONNECT 2025
 #define CR_SSL_CONNECTION_ERROR 2026
 #define CR_MALFORMED_PACKET     2027
+#define CR_WRONG_LICENSE	2028
 
 /* new 4.1 error codes */
 #define CR_NULL_POINTER		2028
diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in
index 095531d527d..c440c1298d4 100644
--- a/include/mysql_version.h.in
+++ b/include/mysql_version.h.in
@@ -23,4 +23,9 @@
 
 /* mysqld compile time options */
 #endif /* _CUSTOMCONFIG_ */
+
+#ifndef LICENSE
+#define LICENSE "GPL"
+#endif /* LICENSE */
+
 #endif /* _mysql_version_h */
diff --git a/innobase/que/que0que.c b/innobase/que/que0que.c
index 77495246bb0..b2608b6d175 100644
--- a/innobase/que/que0que.c
+++ b/innobase/que/que0que.c
@@ -668,15 +668,15 @@ does nothing! */
 void
 que_thr_handle_error(
 /*=================*/
-	que_thr_t*	thr __attribute((unused)),
+	que_thr_t*	thr __attribute__((unused)),
 				/* in: query thread */
-	ulint		err_no __attribute((unused)),
+	ulint		err_no __attribute__((unused)),
 				/* in: error number */
-	byte*		err_str __attribute((unused)),
+	byte*		err_str __attribute__((unused)),
 				/* in, own: error string or NULL; NOTE: the
 				function will take care of freeing of the
 				string! */
-	ulint		err_len __attribute((unused)))
+	ulint		err_len __attribute__((unused)))
 				/* in: error string length */	
 {
 	/* Does nothing */
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c
index e651c13897f..ad93c1b8f9e 100644
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -52,6 +52,7 @@ const char *client_errors[]=
   "Error connecting to master:",
   "SSL connection error",
   "Malformed packet",
+  "This client library is licensed only for use with MySQL servers having '%s' license",
   "Invalid use of null pointer",
   "Statement not prepared",
   "Parameters data was not supplied",
@@ -110,6 +111,7 @@ const char *client_errors[]=
   "Error connecting to master:",
   "SSL connection error",
   "Malformed packet",
+  "This client library is licensed only for use with MySQL servers having '%s' license",
   "Invalid use of null pointer",
   "Statement not prepared",
   "Parameters data was not supplied",
@@ -166,6 +168,7 @@ const char *client_errors[]=
   "Error connecting to master:",
   "SSL connection error",
   "Malformed packet",
+  "This client library is licensed only for use with MySQL servers having '%s' license",
   "Invalid use of null pointer",
   "Statement not prepared",
   "Not all parameters data supplied",
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 91927e44e49..0a93fe60990 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -603,6 +603,57 @@ mysql_connect(MYSQL *mysql,const char *host,
 #endif
 
 
+#ifdef CHECK_LICENSE
+/*
+  Check server side variable 'license'.
+  If the variable does not exist or does not contain 'Commercial', 
+  we're talking to non-commercial server from commercial client.
+  SYNOPSIS
+    check_license()
+  RETURN VALUE
+    0  success
+   !0  network error or the server is not commercial.
+       Error code is saved in mysql->net.last_errno.
+*/
+
+static int check_license(MYSQL *mysql)
+{
+  MYSQL_ROW row;
+  MYSQL_RES *res;
+  NET *net= &mysql->net;
+  static const char query[]= "SELECT @@license";
+  static const char required_license[]= LICENSE;
+
+  if (mysql_real_query(mysql, query, sizeof(query)-1))
+  {
+    if (net->last_errno == ER_UNKNOWN_SYSTEM_VARIABLE)
+    {
+      net->last_errno= CR_WRONG_LICENSE;
+      sprintf(net->last_error, ER(net->last_errno), required_license);
+    }
+    return 1;
+  }
+  if (!(res= mysql_use_result(mysql)))
+    return 1;
+  row= mysql_fetch_row(res);
+  /* 
+    If no rows in result set, or column value is NULL (none of these
+    two is ever true for server variables now), or column value
+    mismatch, set wrong license error.
+  */
+  if (!net->last_errno &&
+      (!row || !row[0] ||
+       strncmp(row[0], required_license, sizeof(required_license))))
+  {
+    net->last_errno= CR_WRONG_LICENSE;
+    sprintf(net->last_error, ER(net->last_errno), required_license);
+  }
+  mysql_free_result(res);
+  return net->last_errno;
+}
+#endif /* CHECK_LICENSE */
+
+
 /**************************************************************************
   Change user and database
 **************************************************************************/
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 3ff427f6515..7827fe9791f 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -10,7 +10,7 @@
 # Access Definitions
 #--
 DB=test
-DBPASSWD=
+DBPASSWD=""
 VERBOSE=""
 USE_MANAGER=0
 MY_TZ=GMT-3
@@ -469,12 +469,13 @@ if [ x$SOURCE_DIST = x1 ] ; then
   MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST"
  fi
 
- MYSQLADMIN="$BASEDIR/client/mysqladmin"
+ CLIENT_BINDIR="$BASEDIR/client"
+ MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"
  WAIT_PID="$BASEDIR/extra/mysql_waitpid"
- MYSQL_MANAGER_CLIENT="$BASEDIR/client/mysqlmanagerc"
+ MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"
  MYSQL_MANAGER="$BASEDIR/tools/mysqlmanager"
- MYSQL_MANAGER_PWGEN="$BASEDIR/client/mysqlmanager-pwgen"
- MYSQL="$BASEDIR/client/mysql"
+ MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqlmanager-pwgen"
+ MYSQL="$CLIENT_BINDIR/mysql"
  LANGUAGE="$BASEDIR/sql/share/english/"
  CHARSETSDIR="$BASEDIR/sql/share/charsets"
  INSTALL_DB="./install_test_db"
@@ -486,17 +487,18 @@ else
  else
    MYSQLD="$VALGRIND $BASEDIR/bin/mysqld"
  fi
- MYSQL_TEST="$BASEDIR/bin/mysqltest"
- MYSQL_DUMP="$BASEDIR/bin/mysqldump"
- MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog"
- MYSQLADMIN="$BASEDIR/bin/mysqladmin"
- WAIT_PID="$BASEDIR/bin/mysql_waitpid"
- MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager"
- MYSQL_MANAGER_CLIENT="$BASEDIR/bin/mysqlmanagerc"
- MYSQL_MANAGER_PWGEN="$BASEDIR/bin/mysqlmanager-pwgen"
- MYSQL="$BASEDIR/bin/mysql"
+ CLIENT_BINDIR="$BASEDIR/bin"
+ MYSQL_TEST="$CLIENT_BINDIR/mysqltest"
+ MYSQL_DUMP="$CLIENT_BINDIR/mysqldump"
+ MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"
+ MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"
+ WAIT_PID="$CLIENT_BINDIR/mysql_waitpid"
+ MYSQL_MANAGER="$CLIENT_BINDIR/mysqlmanager"
+ MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"
+ MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqlmanager-pwgen"
+ MYSQL="$CLIENT_BINDIR/mysql"
  INSTALL_DB="./install_test_db --bin"
- MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/bin/mysql_fix_privilege_tables"
+ MYSQL_FIX_SYSTEM_TABLES="$CLIENT_BINDIR/mysql_fix_privilege_tables"
  if test -d "$BASEDIR/share/mysql/english"
  then
    LANGUAGE="$BASEDIR/share/mysql/english/"
@@ -507,11 +509,12 @@ else
   fi
 fi
 
-MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK  $EXTRA_MYSQLDUMP_OPT"
+MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
 MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYSQLBINLOG_OPT"
-MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password="
-MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password="
-export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES
+MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --bindir=$CLIENT_BINDIR"
+MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"
+export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES CLIENT_BINDIR
+
 
 if [ -z "$MASTER_MYSQLD" ]
 then
@@ -539,9 +542,9 @@ fi
 
 if [ -w / ]
 then
-    # We are running as root;  We need to add the --root argument
-    EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --user=root"
-    EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --user=root"
+  # We are running as root;  We need to add the --root argument
+  EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --user=root"
+  EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --user=root"
 fi
 
 
diff --git a/mysql-test/r/system_mysql_db_refs.result b/mysql-test/r/system_mysql_db_refs.result
index a08b46ffbbb..e15934b03ac 100644
--- a/mysql-test/r/system_mysql_db_refs.result
+++ b/mysql-test/r/system_mysql_db_refs.result
@@ -17,7 +17,7 @@ insert into test_tables_priv (Host,Db,User,Table_name) values (@name,@name,@name
 create table test_columns_priv select * from mysql.columns_priv;
 delete from test_columns_priv;
 insert into test_columns_priv (Host,Db,User,Table_name,Column_name) values (@name,@name,@name,@name,@name);
-select 

+select
 if(isnull(test_db.Host),'WRONG!!!','ok') as test_db_Host,

 if(isnull(test_host.Host),'WRONG!!!','ok') as test_host_Host,

 if(isnull(test_user.Host),'WRONG!!!','ok') as test_user_Host,

@@ -30,7 +30,7 @@ left join test_tables_priv  on test_db.Host=test_tables_priv.Host
 left join test_columns_priv on test_db.Host=test_columns_priv.Host;
 test_db_Host	test_host_Host	test_user_Host	test_tables_priv_Host	test_columns_priv_Host
 ok	ok	ok	ok	ok
-select 

+select
 if(isnull(test_db.Db),'WRONG!!!','ok') as test_db_Db,

 if(isnull(test_host.Db),'WRONG!!!','ok') as test_host_Db,

 if(isnull(test_tables_priv.Db),'WRONG!!!','ok') as test_tables_priv_Db,

diff --git a/mysql-test/t/reserv/system_mysql_db_fix.test b/mysql-test/t/reserv/system_mysql_db_fix.test
deleted file mode 100644
index bb2d37ee215..00000000000
--- a/mysql-test/t/reserv/system_mysql_db_fix.test
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# This is the test for mysql_fix_privilege_tables
-#
-
--- disable_query_log
--- source include/create_old_system_tables.inc
--- exec $MYSQL_FIX_SYSTEM_TABLES --database=test > nil 2>nil
--- enable_query_log
-
--- source include/system_db_struct.inc
-
--- disable_query_log
--- source include/drop_system_tables.inc
--- enable_query_log
diff --git a/mysql-test/t/rpl000009.test b/mysql-test/t/rpl000009.test
index cd318efa2b6..4b69fb3e31c 100644
--- a/mysql-test/t/rpl000009.test
+++ b/mysql-test/t/rpl000009.test
@@ -118,6 +118,21 @@ connection slave;
 sync_with_master;
 select * from mysqltest.t1;
 
+# Check that LOAD DATA FROM MASTER is able to create master.info
+# if needed (if RESET SLAVE was used before), before writing to it (BUG#2922).
+
+stop slave;
+reset slave;
+load data from master;
+start slave;
+# see if replication coordinates were restored fine
+connection master;
+insert into bar.t1 values (5, 'five bar');
+save_master_pos;
+connection slave;
+sync_with_master;
+select * from bar.t1;
+
 # Check that LOAD DATA FROM MASTER reports the error if it can't drop a
 # table to be overwritten.
 # DISABLED FOR NOW AS chmod IS NOT PORTABLE ON NON-UNIX
diff --git a/mysql-test/t/reserv/system_mysql_db.test b/mysql-test/t/system_mysql_db.test
index 85a2f7f9bae..bd69297b739 100644
--- a/mysql-test/t/reserv/system_mysql_db.test
+++ b/mysql-test/t/system_mysql_db.test
@@ -1,8 +1,8 @@
-#
-# This test must examine integrity of system database "mysql"
-#
-
--- disable_query_log
-use mysql;
--- enable_query_log
--- source include/system_db_struct.inc
+#

+# This test must examine integrity of system database "mysql"

+#

+

+-- disable_query_log

+use mysql;

+-- enable_query_log

+-- source include/system_db_struct.inc

diff --git a/mysql-test/t/reserv/system_mysql_db_fix-master.opt b/mysql-test/t/system_mysql_db_fix-master.opt
index 69eb9d2cbf0..69eb9d2cbf0 100644
--- a/mysql-test/t/reserv/system_mysql_db_fix-master.opt
+++ b/mysql-test/t/system_mysql_db_fix-master.opt
diff --git a/mysql-test/t/system_mysql_db_fix.test b/mysql-test/t/system_mysql_db_fix.test
new file mode 100644
index 00000000000..6f3979bf66e
--- /dev/null
+++ b/mysql-test/t/system_mysql_db_fix.test
@@ -0,0 +1,78 @@
+#

+# This is the test for mysql_fix_privilege_tables
+#

+
+-- disable_result_log

+-- disable_query_log

+

+use test;

+

+# create system tables as in mysql-3.20

+

+CREATE TABLE db (

+  Host char(60) binary DEFAULT '' NOT NULL,

+  Db char(32) binary DEFAULT '' NOT NULL,

+  User char(16) binary DEFAULT '' NOT NULL,

+  Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Create_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  PRIMARY KEY Host (Host,Db,User),

+  KEY User (User)

+)

+type=ISAM;

+
+INSERT INTO db VALUES ('%','test',   '','Y','Y','Y','Y','Y','Y');

+INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y');

+
+CREATE TABLE host (

+  Host char(60) binary DEFAULT '' NOT NULL,

+  Db char(32) binary DEFAULT '' NOT NULL,

+  Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Create_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  PRIMARY KEY Host (Host,Db)

+)

+type=ISAM;

+
+CREATE TABLE user (

+  Host char(60) binary DEFAULT '' NOT NULL,

+  User char(16) binary DEFAULT '' NOT NULL,

+  Password char(16),

+  Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Create_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Reload_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Shutdown_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  Process_priv enum('N','Y') DEFAULT 'N' NOT NULL,

+  PRIMARY KEY Host (Host,User)

+)

+type=ISAM;

+
+INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y');

+INSERT INTO user VALUES ('localhost','',    '','N','N','N','N','N','N','N','N','N');

+

+-- exec $MYSQL_FIX_SYSTEM_TABLES --database=test
+-- enable_query_log

+-- enable_result_log

+

+-- source include/system_db_struct.inc

+

+-- disable_query_log

+

+DROP TABLE db;

+DROP TABLE host;

+DROP TABLE user;

+DROP TABLE func;

+DROP TABLE tables_priv;

+DROP TABLE columns_priv;

+

+-- enable_query_log

diff --git a/mysql-test/t/reserv/system_mysql_db_refs.test b/mysql-test/t/system_mysql_db_refs.test
index d15141fdaa5..49d6f198b32 100644
--- a/mysql-test/t/reserv/system_mysql_db_refs.test
+++ b/mysql-test/t/system_mysql_db_refs.test
@@ -1,89 +1,89 @@
-#
-# This test must examine integrity of current system database
-#
-
-set @name="This is a very long string, that mustn't find room in a system field like Table_name. Thus it should be cut by the actual size of the field. So we can use this string to find out the actual length of the field and to use it in any compare queries";
-
-#
-# If this part is wrong, most likely you've done wrong modification of system database "mysql"
-#
-
-create table test_db select * from mysql.db;
-delete from test_db;
-insert into test_db (Host,Db,User) values (@name,@name,@name);
-
-create table test_host select * from mysql.host;
-delete from test_host;
-insert into test_host (Host,Db) values (@name,@name);
-
-create table test_user select * from mysql.user;
-delete from test_user;
-insert into test_user (Host,User) values (@name,@name);
-
-create table test_func select * from mysql.func;
-delete from test_func;
-insert into test_func (name) values (@name);
-
-create table test_tables_priv select * from mysql.tables_priv;
-delete from test_tables_priv;
-insert into test_tables_priv (Host,Db,User,Table_name) values (@name,@name,@name,@name);
-
-create table test_columns_priv select * from mysql.columns_priv;
-delete from test_columns_priv;
-insert into test_columns_priv (Host,Db,User,Table_name,Column_name) values (@name,@name,@name,@name,@name);
-
-# 'Host' field must be the same for all the tables:
-
-select 
- if(isnull(test_db.Host),'WRONG!!!','ok') as test_db_Host,
- if(isnull(test_host.Host),'WRONG!!!','ok') as test_host_Host,
- if(isnull(test_user.Host),'WRONG!!!','ok') as test_user_Host,
- if(isnull(test_tables_priv.Host),'WRONG!!!','ok') as test_tables_priv_Host,
- if(isnull(test_columns_priv.Host),'WRONG!!!','ok') as test_columns_priv_Host
- 
-from      test_db
-left join test_host         on test_db.Host=test_host.Host
-left join test_user         on test_db.Host=test_user.Host
-left join test_tables_priv  on test_db.Host=test_tables_priv.Host
-left join test_columns_priv on test_db.Host=test_columns_priv.Host;
-
-# 'Db' field must be the same for all the tables:
-
-select 
- if(isnull(test_db.Db),'WRONG!!!','ok') as test_db_Db,
- if(isnull(test_host.Db),'WRONG!!!','ok') as test_host_Db,
- if(isnull(test_tables_priv.Db),'WRONG!!!','ok') as test_tables_priv_Db,
- if(isnull(test_columns_priv.Db),'WRONG!!!','ok') as est_columns_priv_Db
- 
-from      test_db
-left join test_host         on test_db.Db=test_host.Db
-left join test_tables_priv  on test_db.Db=test_tables_priv.Db
-left join test_columns_priv on test_db.Db=test_columns_priv.Db;
-
-# 'User' field must be the same for all the tables:
-
+#

+# This test must examine integrity of current system database

+#

+

+set @name="This is a very long string, that mustn't find room in a system field like Table_name. Thus it should be cut by the actual size of the field. So we can use this string to find out the actual length of the field and to use it in any compare queries";

+

+#

+# If this part is wrong, most likely you've done wrong modification of system database "mysql"

+#

+

+create table test_db select * from mysql.db;

+delete from test_db;

+insert into test_db (Host,Db,User) values (@name,@name,@name);

+

+create table test_host select * from mysql.host;

+delete from test_host;

+insert into test_host (Host,Db) values (@name,@name);

+

+create table test_user select * from mysql.user;

+delete from test_user;

+insert into test_user (Host,User) values (@name,@name);

+

+create table test_func select * from mysql.func;

+delete from test_func;

+insert into test_func (name) values (@name);

+

+create table test_tables_priv select * from mysql.tables_priv;

+delete from test_tables_priv;

+insert into test_tables_priv (Host,Db,User,Table_name) values (@name,@name,@name,@name);

+

+create table test_columns_priv select * from mysql.columns_priv;

+delete from test_columns_priv;

+insert into test_columns_priv (Host,Db,User,Table_name,Column_name) values (@name,@name,@name,@name,@name);

+

+# 'Host' field must be the same for all the tables:

+

 select
- if(isnull(test_db.User),'WRONG!!!','ok') as test_db_User,
- if(isnull(test_user.User),'WRONG!!!','ok') as test_user_User,
- if(isnull(test_tables_priv.User),'WRONG!!!','ok') as test_tables_priv_User,
- if(isnull(test_columns_priv.User),'WRONG!!!','ok') as test_columns_priv_User
- 
-from      test_db
-left join test_user         on test_db.User=test_user.User
-left join test_tables_priv  on test_db.User=test_tables_priv.User
-left join test_columns_priv on test_db.User=test_columns_priv.User;
-
-# 'Table_name' field must be the same for all the tables:
-
+ if(isnull(test_db.Host),'WRONG!!!','ok') as test_db_Host,

+ if(isnull(test_host.Host),'WRONG!!!','ok') as test_host_Host,

+ if(isnull(test_user.Host),'WRONG!!!','ok') as test_user_Host,

+ if(isnull(test_tables_priv.Host),'WRONG!!!','ok') as test_tables_priv_Host,

+ if(isnull(test_columns_priv.Host),'WRONG!!!','ok') as test_columns_priv_Host

+
+from      test_db

+left join test_host         on test_db.Host=test_host.Host

+left join test_user         on test_db.Host=test_user.Host

+left join test_tables_priv  on test_db.Host=test_tables_priv.Host

+left join test_columns_priv on test_db.Host=test_columns_priv.Host;

+

+# 'Db' field must be the same for all the tables:

+

 select
- if(isnull(test_tables_priv.User),'WRONG!!!','ok') as test_tables_priv_User,
- if(isnull(test_columns_priv.User),'WRONG!!!','ok') as test_columns_priv_User
-from      test_tables_priv
-left join test_columns_priv on test_tables_priv.Table_name=test_columns_priv.Table_name;
-
-drop table test_columns_priv;
-drop table test_tables_priv;
-drop table test_func;
-drop table test_host;
-drop table test_user;
-drop table test_db;
+ if(isnull(test_db.Db),'WRONG!!!','ok') as test_db_Db,

+ if(isnull(test_host.Db),'WRONG!!!','ok') as test_host_Db,

+ if(isnull(test_tables_priv.Db),'WRONG!!!','ok') as test_tables_priv_Db,

+ if(isnull(test_columns_priv.Db),'WRONG!!!','ok') as est_columns_priv_Db

+
+from      test_db

+left join test_host         on test_db.Db=test_host.Db

+left join test_tables_priv  on test_db.Db=test_tables_priv.Db

+left join test_columns_priv on test_db.Db=test_columns_priv.Db;

+

+# 'User' field must be the same for all the tables:

+

+select

+ if(isnull(test_db.User),'WRONG!!!','ok') as test_db_User,

+ if(isnull(test_user.User),'WRONG!!!','ok') as test_user_User,

+ if(isnull(test_tables_priv.User),'WRONG!!!','ok') as test_tables_priv_User,

+ if(isnull(test_columns_priv.User),'WRONG!!!','ok') as test_columns_priv_User

+
+from      test_db

+left join test_user         on test_db.User=test_user.User

+left join test_tables_priv  on test_db.User=test_tables_priv.User

+left join test_columns_priv on test_db.User=test_columns_priv.User;

+

+# 'Table_name' field must be the same for all the tables:

+

+select

+ if(isnull(test_tables_priv.User),'WRONG!!!','ok') as test_tables_priv_User,

+ if(isnull(test_columns_priv.User),'WRONG!!!','ok') as test_columns_priv_User

+from      test_tables_priv

+left join test_columns_priv on test_tables_priv.Table_name=test_columns_priv.Table_name;

+

+drop table test_columns_priv;

+drop table test_tables_priv;

+drop table test_func;

+drop table test_host;

+drop table test_user;

+drop table test_db;

diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh
index d4291e7f496..39a4554be77 100644
--- a/scripts/mysql_fix_privilege_tables.sh
+++ b/scripts/mysql_fix_privilege_tables.sh
@@ -13,6 +13,7 @@ args=""
 port=""
 socket=""
 database="mysql"
+bindir=""
 
 file=mysql_fix_privilege_tables.sql
 
@@ -40,6 +41,7 @@ parse_arguments() {
       --port=*) port=`echo "$arg" | sed -e "s;--port=;;"` ;;
       --socket=*) socket=`echo "$arg" | sed -e "s;--socket=;;"` ;;
       --database=*) database=`echo "$arg" | sed -e "s;--database=;;"` ;;
+      --bindir=*) bindir=`echo "$arg" | sed -e "s;--bindir=;;"` ;;
       *)
         if test -n "$pick_args"
         then
@@ -76,11 +78,17 @@ parse_arguments PICK-ARGS-FROM-ARGV "$@"
 if test -z "$basedir"
 then
   basedir=@prefix@
-  bindir=@bindir@
+  if test -z "$bindir"
+  then
+     bindir=@bindir@
+  fi
   execdir=@libexecdir@ 
   pkgdatadir=@pkgdatadir@
 else
-  bindir="$basedir/bin"
+  if test -z "$bindir"
+  then
+    bindir="$basedir/bin"
+  fi
   if test -x "$basedir/libexec/mysqld"
   then
     execdir="$basedir/libexec"
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index 6cd07e16647..78e4e3386b2 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -895,7 +895,7 @@ int load_master_data(THD* thd)
 
     cleanup_mysql_results(db_res, cur_table_res - 1, table_res);
 
-    // adjust position in the master
+    // adjust replication coordinates from the master
     if (master_status_res)
     {
       MYSQL_ROW row = mysql_fetch_row(master_status_res);
@@ -908,10 +908,18 @@ int load_master_data(THD* thd)
       */
       if (row && row[0] && row[1])
       {
+        /*
+          If the slave's master info is not inited, we init it, then we write
+          the new coordinates to it. Must call init_master_info() *before*
+          setting active_mi, because init_master_info() sets active_mi with
+          defaults.
+        */
+        if (init_master_info(active_mi, master_info_file, relay_log_info_file, 0))
+          send_error(&thd->net, ER_MASTER_INFO);
 	strmake(active_mi->master_log_name, row[0],
 		sizeof(active_mi->master_log_name));
 	active_mi->master_log_pos = strtoull(row[1], (char**) 0, 10);
-	/* don't hit the magic number */
+        /* at least in recent versions, the condition below should be false */
 	if (active_mi->master_log_pos < BIN_LOG_HEADER_SIZE)
 	  active_mi->master_log_pos = BIN_LOG_HEADER_SIZE;
         /*
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 576e33002da..98e59db7558 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -424,14 +424,12 @@ static sys_var_thd_ulong        sys_default_week_format("default_week_format",
 sys_var_thd_ulong               sys_group_concat_max_len("group_concat_max_len",
                                                          &SV::group_concat_max_len);
 
-static const char license[]= "GPL";
 
 /* Read only variables */
 
 sys_var_const_str		sys_os("version_compile_os", SYSTEM_TYPE);
-sys_var_const_str		sys_license("license", license);
-
 /* Global read-only variable describing server license */
+sys_var_const_str		sys_license("license", LICENSE);