Commit 1125ce9a authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 

into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166


mysql-test/t/variables.test:
  Auto merged
mysql-test/r/variables.result:
  Manual merge
sql/log.cc:
  Manual merge, spaces added to 5.1 version
sql/mysqld.cc:
  Code no longer exists
sql/set_var.cc:
  Manual merge
parents 13f628fa 629b9cf8

mysql-test/r/variables.result

+8 −0
Original line number Diff line number Diff line
@@ -903,6 +903,14 @@ select @@&; 
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '&' at line 1

select @@@;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@' at line 1

select @@hostname;

@@hostname

#

set @@hostname= "anothername";

ERROR HY000: Variable 'hostname' is a read only variable

show variables like 'hostname';

Variable_name	Value

hostname	#

End of 5.0 tests

set global binlog_cache_size         =@my_binlog_cache_size;

set global connect_timeout           =@my_connect_timeout;

mysql-test/t/variables.test

+11 −0
Original line number Diff line number Diff line
@@ -689,6 +689,17 @@ select @@&; 
--error ER_PARSE_ERROR

select @@@;



#

# Bug#20166 mysql-test-run.pl does not test system privilege tables creation

#

# Don't actually output, since it depends on the system

--replace_column 1 #

select @@hostname;

--error 1238

set @@hostname= "anothername";

--replace_column 2 #

show variables like 'hostname';



--echo End of 5.0 tests



# This is at the very after the versioned tests, since it involves doing

sql/log.cc

+1 −1
Original line number Diff line number Diff line
@@ -2297,7 +2297,7 @@ const char *MYSQL_LOG::generate_name(const char *log_name, 
      TODO: The following should be using fn_format();  We just need to

      first change fn_format() to cut the file name if it's too long.

    */

    strmake(buff, glob_hostname, FN_REFLEN - 5);

    strmake(buff, pidfile_name, FN_REFLEN - 5);

    strmov(fn_ext(buff), suffix);

    return (const char *)buff;

  }

sql/mysqld.cc

+9 −3
Original line number Diff line number Diff line
@@ -2677,8 +2677,14 @@ static int init_common_variables(const char *conf_file_name, int argc, 
  */

  mysql_bin_log.init_pthread_objects();



  if (gethostname(glob_hostname,sizeof(glob_hostname)-4) < 0)

    strmov(glob_hostname,"mysql");

  if (gethostname(glob_hostname,sizeof(glob_hostname)) < 0)

  {

    strmake(glob_hostname, STRING_WITH_LEN("localhost"));

    sql_print_warning("gethostname failed, using '%s' as hostname",

                      glob_hostname);

    strmake(pidfile_name, STRING_WITH_LEN("mysql"));

  }

  else

    strmake(pidfile_name, glob_hostname, sizeof(pidfile_name)-5);

  strmov(fn_ext(pidfile_name),".pid");		// Add proper extension

sql/set_var.cc

+5 −0
Original line number Diff line number Diff line
@@ -655,6 +655,10 @@ sys_var_thd_time_zone sys_time_zone("time_zone"); 


/* Read only variables */



/* Global read-only variable containing hostname */

sys_var_const_str		sys_hostname("hostname", glob_hostname);





sys_var_have_variable sys_have_compress("have_compress", &have_compress);

sys_var_have_variable sys_have_crypt("have_crypt", &have_crypt);

sys_var_have_variable sys_have_csv_db("have_csv", &have_csv_db);
@@ -779,6 +783,7 @@ SHOW_VAR init_vars[]= { 
  {sys_var_general_log.name, (char*) &opt_log,                      SHOW_MY_BOOL},

  {sys_var_general_log_path.name, (char*) &sys_var_general_log_path,  SHOW_SYS},

  {sys_group_concat_max_len.name, (char*) &sys_group_concat_max_len,  SHOW_SYS},

  {sys_hostname.name,         (char*) &sys_hostname,                SHOW_SYS},

  {sys_have_compress.name,    (char*) &have_compress,               SHOW_HAVE},

  {sys_have_crypt.name,       (char*) &have_crypt,                  SHOW_HAVE},

  {sys_have_csv_db.name,      (char*) &have_csv_db,                 SHOW_HAVE},