Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/my/mysql-4.0

13 files changed, 280 insertions, 119 deletions

diff --git a/include/errmsg.h b/include/errmsg.h
index 5136af5b87a..24ebe24d786 100644
--- a/include/errmsg.h
+++ b/include/errmsg.h
@@ -63,4 +63,5 @@ 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
 
diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in
index 41d4ce081fb..de5294a82cf 100644
--- a/include/mysql_version.h.in
+++ b/include/mysql_version.h.in
@@ -26,4 +26,9 @@
 #define MYSQL_CHARSET			"@default_charset@"
 #endif /* MYSQL_CHARSET */
 #endif /* _CUSTOMCONFIG_ */
+
+#ifndef LICENSE
+#define LICENSE "GPL"
+#endif /* LICENSE */
+
 #endif /* _mysql_version_h */
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c
index 7accbf8f1d2..06d21cf36c3 100644
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -51,7 +51,8 @@ const char *client_errors[]=
   "Error connecting to slave:",
   "Error connecting to master:",
   "SSL connection error",
-  "Malformed packet"
+  "Malformed packet",
+  "This client library is licensed only for use with MySQL servers having '%s' license"
 };
 
 /* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */
@@ -86,7 +87,8 @@ const char *client_errors[]=
   "Error connecting to slave:",
   "Error connecting to master:",
   "SSL connection error",
-  "Malformed packet"
+  "Malformed packet",
+  "This client library is licensed only for use with MySQL servers having '%s' license"
 };
 
 #else /* ENGLISH */
@@ -119,7 +121,8 @@ const char *client_errors[]=
   "Error connecting to slave:",
   "Error connecting to master:",
   "SSL connection error",
-  "Malformed packet"
+  "Malformed packet",
+  "This client library is licensed only for use with MySQL servers having '%s' license"
 };
 #endif
 
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index f2d77d495c9..6a4189b6b18 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1612,6 +1612,56 @@ 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 */
+
 /*
   The following union is used to force a struct to be double allgined.
   This is to avoid warings with gethostname_r() on Linux itanium systems
@@ -2048,6 +2098,10 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
     net->compress=1;
   if (mysql->options.max_allowed_packet)
     net->max_packet_size= mysql->options.max_allowed_packet;
+#ifdef CHECK_LICENSE 
+  if (check_license(mysql))
+    goto error;
+#endif
   if (db && mysql_select_db(mysql,db))
     goto error;
   if (mysql->options.init_command)
diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl000009.result
index 569dd301143..a4611cf7d42 100644
--- a/mysql-test/r/rpl000009.result
+++ b/mysql-test/r/rpl000009.result
@@ -111,6 +111,18 @@ n	s
 2	two bar
 3	three bar
 4	four bar
+stop slave;
+reset slave;
+load data from master;
+start slave;
+insert into bar.t1 values (5, 'five bar');
+select * from bar.t1;
+n	s
+1	one bar
+2	two bar
+3	three bar
+4	four bar
+5	five bar
 load table bar.t1 from master;
 Table 't1' already exists
 drop table bar.t1;
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 e019e1fc3a7..4426cafe299 100644
--- a/mysql-test/t/rpl000009.test
+++ b/mysql-test/t/rpl000009.test
@@ -108,6 +108,21 @@ connection slave;
 sync_with_master;
 select * from bar.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..3cb5d93e2f6
--- /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..be47f1ba5bf 100644
--- a/mysql-test/t/reserv/system_mysql_db_refs.test
+++ b/mysql-test/t/system_mysql_db_refs.test
@@ -1,89 +1,90 @@
-#
-# 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:
-
-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;
+#

+# 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:

+

+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/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index e687b227946..1edf452d5f6 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -874,7 +874,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 = mc_mysql_fetch_row(master_status_res);
@@ -887,10 +887,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;
 	active_mi->rli.pending = 0;
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 71c0865dd91..eb94ad2ebf6 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -334,14 +334,12 @@ static sys_var_rand_seed2	sys_rand_seed2("rand_seed2");
 static sys_var_thd_ulong        sys_default_week_format("default_week_format",
 							&SV::default_week_format);
 
-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);