Commit 9b14dc88 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into gw.mysql.r18.ru:/usr/home/ram/work/5.0
parents bef575d1 193650b8

include/my_sys.h

+2 −0
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@ extern char wild_many,wild_one,wild_prefix; 
extern const char *charsets_dir;

extern char *defaults_extra_file;



extern my_bool timed_mutexes;



typedef struct wild_file_pack	/* Struct to hold info when selecting files */

{

  uint		wilds;		/* How many wildcards */

mysys/my_static.c

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include "my_alarm.h"

#endif



my_bool timed_mutexes= 0;



	/* from my_init */

my_string	home_dir=0,my_progname=0;

char		NEAR curr_dir[FN_REFLEN]= {0},

sql/mysql_priv.h

+0 −1
Original line number Diff line number Diff line
@@ -1002,7 +1002,6 @@ extern ulong table_cache_size; 
extern ulong max_connections,max_connect_errors, connect_timeout;

extern ulong slave_net_timeout;

extern ulong max_user_connections;

extern my_bool timed_mutexes;

extern ulong what_to_log,flush_time;

extern ulong query_buff_size, thread_stack,thread_stack_min;

extern ulong binlog_cache_size, max_binlog_cache_size, open_files_limit;

sql/mysqld.cc

+0 −1
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ ulong binlog_cache_use= 0, binlog_cache_disk_use= 0; 
ulong max_connections,max_used_connections,

      max_connect_errors, max_user_connections = 0;

ulong thread_id=1L,current_pid;

my_bool timed_mutexes= 0;

ulong slow_launch_threads = 0, sync_binlog_period;

ulong expire_logs_days = 0;

ulong rpl_recovery_rank=0;