Commit ee8e18fd authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql

parents 6b4967e3 61fd6baf

Docs/manual.texi

+278 −82

File changed.

Preview size limit exceeded, changes collapsed.

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ extern char *get_charsets_dir(char *buf); 
extern ulong	_my_cache_w_requests,_my_cache_write,_my_cache_r_requests,

		_my_cache_read;

extern ulong	 _my_blocks_used,_my_blocks_changed;

extern uint	my_file_opened,my_stream_opened;

extern ulong	my_file_opened,my_stream_opened, my_tmp_file_created;

extern my_bool	key_cache_inited;



					/* Point to current my_message() */

libmysql/libmysql.c

+5 −2
Original line number Diff line number Diff line
@@ -684,8 +684,8 @@ mysql_free_result(MYSQL_RES *result) 
static const char *default_options[]=

{"port","socket","compress","password","pipe", "timeout", "user",

 "init-command", "host", "database", "debug", "return-found-rows",

 "ssl_key" ,"ssl_cert" ,"ssl_ca" ,"ssl_capath",

 "character-set-dir", "default-character-set",

 "ssl-key" ,"ssl-cert" ,"ssl-ca" ,"ssl-capath",

 "character-set-dir", "default-character-set", "interactive-timeout",

 NullS

};
@@ -815,6 +815,9 @@ static void mysql_read_default_options(struct st_mysql_options *options, 
	  my_free(options->charset_name,MYF(MY_ALLOW_ZERO_PTR));

          options->charset_name = my_strdup(opt_arg, MYF(MY_WME));

	  break;

	case 19:				/* Interactive-timeout */

	  options->client_flag|=CLIENT_INTERACTIVE;

	  break;

	default:

	  DBUG_PRINT("warning",("unknown option: %s",option[0]));

	}

mysys/mf_tempfile.c

+2 −0
Original line number Diff line number Diff line
@@ -170,5 +170,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, 
    }

  }

#endif

  if (file >= 0)

    thread_safe_increment(my_tmp_file_created,&THR_LOCK_open);

  DBUG_RETURN(file);

}

mysys/my_static.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
my_string	home_dir=0,my_progname=0;

char		NEAR curr_dir[FN_REFLEN]= {0},

		NEAR home_dir_buff[FN_REFLEN]= {0};

uint		my_stream_opened=0,my_file_opened=0;

ulong		my_stream_opened=0,my_file_opened=0, my_tmp_file_created=0;

int		NEAR my_umask=0664, NEAR my_umask_dir=0777;

#ifndef THREAD

int		NEAR my_errno=0;