Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
ce3a76a4
Commit
ce3a76a4
authored
Jan 11, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/d2/hf/mr10/my50-mr10 sql/mysqld.cc: Auto merged
parents
6943153e
c11c3b08
Changes
24
Show whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
155 additions
and
40 deletions
+155
-40
BUILD/check-cpu
BUILD/check-cpu
+1
-2
VC++Files/mysys/mysys.vcproj
VC++Files/mysys/mysys.vcproj
+43
-0
client/mysql_upgrade.c
client/mysql_upgrade.c
+11
-1
configure.in
configure.in
+11
-4
include/my_global.h
include/my_global.h
+36
-0
innobase/buf/buf0buf.c
innobase/buf/buf0buf.c
+1
-1
innobase/dict/dict0dict.c
innobase/dict/dict0dict.c
+3
-3
innobase/fil/fil0fil.c
innobase/fil/fil0fil.c
+2
-2
innobase/ha/ha0ha.c
innobase/ha/ha0ha.c
+1
-1
innobase/ha/hash0hash.c
innobase/ha/hash0hash.c
+1
-1
innobase/include/hash0hash.h
innobase/include/hash0hash.h
+1
-1
innobase/lock/lock0lock.c
innobase/lock/lock0lock.c
+1
-1
innobase/log/log0recv.c
innobase/log/log0recv.c
+2
-2
innobase/thr/thr0loc.c
innobase/thr/thr0loc.c
+1
-1
mysql-test/t/myisam.test
mysql-test/t/myisam.test
+1
-1
mysql-test/t/query_cache_notembedded.test
mysql-test/t/query_cache_notembedded.test
+2
-2
mysql-test/t/rpl000015.test
mysql-test/t/rpl000015.test
+1
-1
mysql-test/t/rpl000017.test
mysql-test/t/rpl000017.test
+1
-1
mysql-test/t/rpl_rotate_logs.test
mysql-test/t/rpl_rotate_logs.test
+1
-1
scripts/make_binary_distribution.sh
scripts/make_binary_distribution.sh
+1
-1
scripts/mysql_secure_installation.sh
scripts/mysql_secure_installation.sh
+20
-9
sql/mysqld.cc
sql/mysqld.cc
+6
-2
support-files/MySQL-shared-compat.spec.sh
support-files/MySQL-shared-compat.spec.sh
+1
-1
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+6
-1
No files found.
BUILD/check-cpu
View file @
ce3a76a4
...
@@ -177,8 +177,7 @@ check_cpu () {
...
@@ -177,8 +177,7 @@ check_cpu () {
touch
__test.c
touch
__test.c
while
[
"
$cpu_arg
"
]
;
do
while
[
"
$cpu_arg
"
]
;
do
# FIXME: echo -n isn't portable - see contortions autoconf goes through
printf
"testing
$cpu_arg
... "
>
&2
echo
-n
testing
$cpu_arg
"... "
>
&2
# compile check
# compile check
check_cpu_cflags
=
`
eval echo
$check_cpu_args
`
check_cpu_cflags
=
`
eval echo
$check_cpu_args
`
...
...
VC++Files/mysys/mysys.vcproj
View file @
ce3a76a4
...
@@ -3417,6 +3417,49 @@
...
@@ -3417,6 +3417,49 @@
PreprocessorDefinitions=
""
/>
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</FileConfiguration>
</File>
</File>
<File
RelativePath=
"my_getpagesize.c"
>
<FileConfiguration
Name=
"Debug|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
/>
</FileConfiguration>
<FileConfiguration
Name=
"Max|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
/>
</FileConfiguration>
<FileConfiguration
Name=
"Release|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
/>
</FileConfiguration>
<FileConfiguration
Name=
"TLS_DEBUG|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
/>
</FileConfiguration>
<FileConfiguration
Name=
"TLS|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</File>
<File
<File
RelativePath=
"my_mmap.c"
>
RelativePath=
"my_mmap.c"
>
<FileConfiguration
<FileConfiguration
...
...
client/mysql_upgrade.c
View file @
ce3a76a4
...
@@ -143,6 +143,7 @@ void set_extra_default(int id, const struct my_option *opt)
...
@@ -143,6 +143,7 @@ void set_extra_default(int id, const struct my_option *opt)
case
'f'
:
/* --force is ours */
case
'f'
:
/* --force is ours */
case
'u'
:
/* --user passed on cmdline */
case
'u'
:
/* --user passed on cmdline */
case
'T'
:
/* --debug-info is not accepted by mysqlcheck */
case
'T'
:
/* --debug-info is not accepted by mysqlcheck */
case
'p'
:
/* --password may change yet */
/* so, do nothing */
/* so, do nothing */
break
;
break
;
default:
default:
...
@@ -174,7 +175,7 @@ void set_extra_default(int id, const struct my_option *opt)
...
@@ -174,7 +175,7 @@ void set_extra_default(int id, const struct my_option *opt)
d
->
id
=
id
;
d
->
id
=
id
;
d
->
name
=
opt
->
name
;
d
->
name
=
opt
->
name
;
d
->
n_len
=
strlen
(
opt
->
name
);
d
->
n_len
=
strlen
(
opt
->
name
);
if
(
opt
->
arg_type
!=
NO_ARG
)
if
(
opt
->
arg_type
!=
NO_ARG
&&
opt
->
value
)
switch
(
opt
->
var_type
&
GET_TYPE_MASK
)
{
switch
(
opt
->
var_type
&
GET_TYPE_MASK
)
{
case
GET_BOOL
:
case
GET_BOOL
:
if
(
*
((
int
*
)
opt
->
value
))
if
(
*
((
int
*
)
opt
->
value
))
...
@@ -320,6 +321,15 @@ static int create_defaults_file(const char *path, const char *forced_path)
...
@@ -320,6 +321,15 @@ static int create_defaults_file(const char *path, const char *forced_path)
}
}
dynstr_set
(
&
buf
,
"
\n
[client]"
);
dynstr_set
(
&
buf
,
"
\n
[client]"
);
if
(
opt_password
)
{
if
(
dynstr_append
(
&
buf
,
"
\n
password="
)
||
dynstr_append
(
&
buf
,
opt_password
))
{
ret
=
1
;
goto
error
;
}
}
while
(
extra_defaults
)
while
(
extra_defaults
)
{
{
int
len
;
int
len
;
...
...
configure.in
View file @
ce3a76a4
...
@@ -1073,6 +1073,7 @@ case $SYSTEM_TYPE in
...
@@ -1073,6 +1073,7 @@ case $SYSTEM_TYPE in
fi
fi
;;
;;
*
darwin
*
)
*
darwin
*
)
AC_DEFINE
([
DEFAULT_SKIP_THREAD_PRIORITY],
[
1],
[
default to skip thread priority]
)
if
test
"
$ac_cv_prog_gcc
"
=
"yes"
if
test
"
$ac_cv_prog_gcc
"
=
"yes"
then
then
FLAGS
=
"-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT"
FLAGS
=
"-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT"
...
@@ -2494,12 +2495,14 @@ thread_dirs=
...
@@ -2494,12 +2495,14 @@ thread_dirs=
dnl This probably should be cleaned up more -
for
now the threaded
dnl This probably should be cleaned up more -
for
now the threaded
dnl client is just using plain-old libs.
dnl client is just using plain-old libs.
sql_client_dirs
=
"strings regex mysys libmysql client"
sql_client_dirs
=
linked_client_targets
=
"linked_libmysql_sources"
linked_client_targets
=
"linked_libmysql_sources"
if
test
"
$THREAD_SAFE_CLIENT
"
!
=
"no"
if
test
"
$THREAD_SAFE_CLIENT
"
=
"no"
then
then
sql_client_dirs
=
"libmysql_r
$sql_client_dirs
"
sql_client_dirs
=
"strings regex mysys extra libmysql client"
else
sql_client_dirs
=
"strings regex mysys extra libmysql libmysql_r client"
linked_client_targets
=
"
$linked_client_targets
linked_libmysql_r_sources"
linked_client_targets
=
"
$linked_client_targets
linked_libmysql_r_sources"
AC_CONFIG_FILES
(
libmysql_r/Makefile
)
AC_CONFIG_FILES
(
libmysql_r/Makefile
)
AC_DEFINE
([
THREAD_SAFE_CLIENT],
[
1],
[
Should be client be thread safe]
)
AC_DEFINE
([
THREAD_SAFE_CLIENT],
[
1],
[
Should be client be thread safe]
)
...
@@ -2528,13 +2531,17 @@ AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")
...
@@ -2528,13 +2531,17 @@ AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")
export
CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR
export
CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR
ac_configure_args
=
"
$ac_configure_args
CFLAGS='
$CFLAGS
' CXXFLAGS='
$CXXFLAGS
'"
ac_configure_args
=
"
$ac_configure_args
CFLAGS='
$CFLAGS
' CXXFLAGS='
$CXXFLAGS
'"
if
test
"
$with_server
"
=
"yes
"
-o
"
$THREAD_SAFE_CLIENT
"
!=
"no"
if
test
"
$with_server
"
!=
"no
"
-o
"
$THREAD_SAFE_CLIENT
"
!=
"no"
then
then
AC_DEFINE
([
THREAD],
[
1],
AC_DEFINE
([
THREAD],
[
1],
[
Define
if
you want to have threaded code. This may be undef on client code]
)
[
Define
if
you want to have threaded code. This may be undef on client code]
)
# Avoid _PROGRAMS names
# Avoid _PROGRAMS names
THREAD_LOBJECTS
=
"thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o"
THREAD_LOBJECTS
=
"thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o"
AC_SUBST
(
THREAD_LOBJECTS
)
AC_SUBST
(
THREAD_LOBJECTS
)
fi
if
test
"
$with_server
"
!=
"no"
then
server_scripts
=
"mysqld_safe mysql_install_db"
server_scripts
=
"mysqld_safe mysql_install_db"
sql_server_dirs
=
"strings mysys dbug extra regex"
sql_server_dirs
=
"strings mysys dbug extra regex"
...
...
include/my_global.h
View file @
ce3a76a4
...
@@ -92,6 +92,42 @@
...
@@ -92,6 +92,42 @@
#define NETWARE_SET_SCREEN_MODE(A)
#define NETWARE_SET_SCREEN_MODE(A)
#endif
#endif
/*
The macros below are used to allow build of Universal/fat binaries of
MySQL and MySQL applications under darwin.
*/
#ifdef TARGET_FAT_BINARY
# undef SIZEOF_CHARP
# undef SIZEOF_INT
# undef SIZEOF_LONG
# undef SIZEOF_LONG_LONG
# undef SIZEOF_OFF_T
# undef SIZEOF_SHORT
#if defined(__i386__)
# undef WORDS_BIGENDIAN
# define SIZEOF_CHARP 4
# define SIZEOF_INT 4
# define SIZEOF_LONG 4
# define SIZEOF_LONG_LONG 8
# define SIZEOF_OFF_T 8
# define SIZEOF_SHORT 2
#elif defined(__ppc__)
# define WORDS_BIGENDIAN
# define SIZEOF_CHARP 4
# define SIZEOF_INT 4
# define SIZEOF_LONG 4
# define SIZEOF_LONG_LONG 8
# define SIZEOF_OFF_T 8
# define SIZEOF_SHORT 2
#else
# error Building FAT binary for an unknown architecture.
#endif
#endif
/* TARGET_FAT_BINARY */
/*
/*
The macros below are borrowed from include/linux/compiler.h in the
The macros below are borrowed from include/linux/compiler.h in the
Linux kernel. Use them to indicate the likelyhood of the truthfulness
Linux kernel. Use them to indicate the likelyhood of the truthfulness
...
...
innobase/buf/buf0buf.c
View file @
ce3a76a4
...
@@ -649,7 +649,7 @@ buf_pool_init(
...
@@ -649,7 +649,7 @@ buf_pool_init(
}
}
}
}
buf_pool
->
page_hash
=
hash_create
(
2
*
max_size
);
buf_pool
->
page_hash
=
hash
0
_create
(
2
*
max_size
);
buf_pool
->
n_pend_reads
=
0
;
buf_pool
->
n_pend_reads
=
0
;
...
...
innobase/dict/dict0dict.c
View file @
ce3a76a4
...
@@ -708,13 +708,13 @@ dict_init(void)
...
@@ -708,13 +708,13 @@ dict_init(void)
mutex_create
(
&
(
dict_sys
->
mutex
));
mutex_create
(
&
(
dict_sys
->
mutex
));
mutex_set_level
(
&
(
dict_sys
->
mutex
),
SYNC_DICT
);
mutex_set_level
(
&
(
dict_sys
->
mutex
),
SYNC_DICT
);
dict_sys
->
table_hash
=
hash_create
(
buf_pool_get_max_size
()
/
dict_sys
->
table_hash
=
hash
0
_create
(
buf_pool_get_max_size
()
/
(
DICT_POOL_PER_TABLE_HASH
*
(
DICT_POOL_PER_TABLE_HASH
*
UNIV_WORD_SIZE
));
UNIV_WORD_SIZE
));
dict_sys
->
table_id_hash
=
hash_create
(
buf_pool_get_max_size
()
/
dict_sys
->
table_id_hash
=
hash
0
_create
(
buf_pool_get_max_size
()
/
(
DICT_POOL_PER_TABLE_HASH
*
(
DICT_POOL_PER_TABLE_HASH
*
UNIV_WORD_SIZE
));
UNIV_WORD_SIZE
));
dict_sys
->
col_hash
=
hash_create
(
buf_pool_get_max_size
()
/
dict_sys
->
col_hash
=
hash
0
_create
(
buf_pool_get_max_size
()
/
(
DICT_POOL_PER_COL_HASH
*
(
DICT_POOL_PER_COL_HASH
*
UNIV_WORD_SIZE
));
UNIV_WORD_SIZE
));
dict_sys
->
size
=
0
;
dict_sys
->
size
=
0
;
...
...
innobase/fil/fil0fil.c
View file @
ce3a76a4
...
@@ -1294,8 +1294,8 @@ fil_system_create(
...
@@ -1294,8 +1294,8 @@ fil_system_create(
mutex_set_level
(
&
(
system
->
mutex
),
SYNC_ANY_LATCH
);
mutex_set_level
(
&
(
system
->
mutex
),
SYNC_ANY_LATCH
);
system
->
spaces
=
hash_create
(
hash_size
);
system
->
spaces
=
hash
0
_create
(
hash_size
);
system
->
name_hash
=
hash_create
(
hash_size
);
system
->
name_hash
=
hash
0
_create
(
hash_size
);
UT_LIST_INIT
(
system
->
LRU
);
UT_LIST_INIT
(
system
->
LRU
);
...
...
innobase/ha/ha0ha.c
View file @
ce3a76a4
...
@@ -32,7 +32,7 @@ ha_create(
...
@@ -32,7 +32,7 @@ ha_create(
hash_table_t
*
table
;
hash_table_t
*
table
;
ulint
i
;
ulint
i
;
table
=
hash_create
(
n
);
table
=
hash
0
_create
(
n
);
if
(
in_btr_search
)
{
if
(
in_btr_search
)
{
table
->
adaptive
=
TRUE
;
table
->
adaptive
=
TRUE
;
...
...
innobase/ha/hash0hash.c
View file @
ce3a76a4
...
@@ -74,7 +74,7 @@ Creates a hash table with >= n array cells. The actual number of cells is
...
@@ -74,7 +74,7 @@ Creates a hash table with >= n array cells. The actual number of cells is
chosen to be a prime number slightly bigger than n. */
chosen to be a prime number slightly bigger than n. */
hash_table_t
*
hash_table_t
*
hash_create
(
hash
0
_create
(
/*========*/
/*========*/
/* out, own: created table */
/* out, own: created table */
ulint
n
)
/* in: number of array cells */
ulint
n
)
/* in: number of array cells */
...
...
innobase/include/hash0hash.h
View file @
ce3a76a4
...
@@ -23,7 +23,7 @@ Creates a hash table with >= n array cells. The actual number
...
@@ -23,7 +23,7 @@ Creates a hash table with >= n array cells. The actual number
of cells is chosen to be a prime number slightly bigger than n. */
of cells is chosen to be a prime number slightly bigger than n. */
hash_table_t
*
hash_table_t
*
hash_create
(
hash
0
_create
(
/*========*/
/*========*/
/* out, own: created table */
/* out, own: created table */
ulint
n
);
/* in: number of array cells */
ulint
n
);
/* in: number of array cells */
...
...
innobase/lock/lock0lock.c
View file @
ce3a76a4
...
@@ -584,7 +584,7 @@ lock_sys_create(
...
@@ -584,7 +584,7 @@ lock_sys_create(
{
{
lock_sys
=
mem_alloc
(
sizeof
(
lock_sys_t
));
lock_sys
=
mem_alloc
(
sizeof
(
lock_sys_t
));
lock_sys
->
rec_hash
=
hash_create
(
n_cells
);
lock_sys
->
rec_hash
=
hash
0
_create
(
n_cells
);
/* hash_create_mutexes(lock_sys->rec_hash, 2, SYNC_REC_LOCK); */
/* hash_create_mutexes(lock_sys->rec_hash, 2, SYNC_REC_LOCK); */
...
...
innobase/log/log0recv.c
View file @
ce3a76a4
...
@@ -148,7 +148,7 @@ recv_sys_init(
...
@@ -148,7 +148,7 @@ recv_sys_init(
recv_sys
->
len
=
0
;
recv_sys
->
len
=
0
;
recv_sys
->
recovered_offset
=
0
;
recv_sys
->
recovered_offset
=
0
;
recv_sys
->
addr_hash
=
hash_create
(
available_memory
/
64
);
recv_sys
->
addr_hash
=
hash
0
_create
(
available_memory
/
64
);
recv_sys
->
n_addrs
=
0
;
recv_sys
->
n_addrs
=
0
;
recv_sys
->
apply_log_recs
=
FALSE
;
recv_sys
->
apply_log_recs
=
FALSE
;
...
@@ -187,7 +187,7 @@ recv_sys_empty_hash(void)
...
@@ -187,7 +187,7 @@ recv_sys_empty_hash(void)
hash_table_free
(
recv_sys
->
addr_hash
);
hash_table_free
(
recv_sys
->
addr_hash
);
mem_heap_empty
(
recv_sys
->
heap
);
mem_heap_empty
(
recv_sys
->
heap
);
recv_sys
->
addr_hash
=
hash_create
(
buf_pool_get_curr_size
()
/
256
);
recv_sys
->
addr_hash
=
hash
0
_create
(
buf_pool_get_curr_size
()
/
256
);
}
}
/************************************************************
/************************************************************
...
...
innobase/thr/thr0loc.c
View file @
ce3a76a4
...
@@ -224,7 +224,7 @@ thr_local_init(void)
...
@@ -224,7 +224,7 @@ thr_local_init(void)
ut_a
(
thr_local_hash
==
NULL
);
ut_a
(
thr_local_hash
==
NULL
);
thr_local_hash
=
hash_create
(
OS_THREAD_MAX_N
+
100
);
thr_local_hash
=
hash
0
_create
(
OS_THREAD_MAX_N
+
100
);
mutex_create
(
&
thr_local_mutex
);
mutex_create
(
&
thr_local_mutex
);
mutex_set_level
(
&
thr_local_mutex
,
SYNC_THR_LOCAL
);
mutex_set_level
(
&
thr_local_mutex
,
SYNC_THR_LOCAL
);
...
...
mysql-test/t/myisam.test
View file @
ce3a76a4
...
@@ -498,7 +498,7 @@ insert into t1 values (1),(2),(3),(4),(5),(6);
...
@@ -498,7 +498,7 @@ insert into t1 values (1),(2),(3),(4),(5),(6);
insert
into
t2
values
(
1
,
1
),(
2
,
1
);
insert
into
t2
values
(
1
,
1
),(
2
,
1
);
lock
tables
t1
read
local
,
t2
read
local
;
lock
tables
t1
read
local
,
t2
read
local
;
select
straight_join
*
from
t1
,
t2
force
index
(
primary
)
where
t1
.
a
=
t2
.
a
;
select
straight_join
*
from
t1
,
t2
force
index
(
primary
)
where
t1
.
a
=
t2
.
a
;
connect
(
root
,
localhost
,
root
,,
test
,
$MASTER_MYPORT
,
master
.
sock
);
connect
(
root
,
localhost
,
root
,,
test
,
$MASTER_MYPORT
,
$MASTER_MYSOCK
);
insert
into
t2
values
(
2
,
0
);
insert
into
t2
values
(
2
,
0
);
disconnect
root
;
disconnect
root
;
connection
default
;
connection
default
;
...
...
mysql-test/t/query_cache_notembedded.test
View file @
ce3a76a4
...
@@ -81,12 +81,12 @@ drop table t1, t2, t3, t11, t21;
...
@@ -81,12 +81,12 @@ drop table t1, t2, t3, t11, t21;
#
#
# do not use QC if tables locked (BUG#12385)
# do not use QC if tables locked (BUG#12385)
#
#
connect
(
root
,
localhost
,
root
,,
test
,
$MASTER_MYPORT
,
master
.
sock
);
connect
(
root
,
localhost
,
root
,,
test
,
$MASTER_MYPORT
,
$MASTER_MYSOCK
);
connection
root
;
connection
root
;
CREATE
TABLE
t1
(
a
INT
NOT
NULL
PRIMARY
KEY
AUTO_INCREMENT
)
ENGINE
=
CREATE
TABLE
t1
(
a
INT
NOT
NULL
PRIMARY
KEY
AUTO_INCREMENT
)
ENGINE
=
MyISAM
;
MyISAM
;
LOCK
TABLE
t1
READ
LOCAL
;
LOCK
TABLE
t1
READ
LOCAL
;
connect
(
root2
,
localhost
,
root
,,
test
,
$MASTER_MYPORT
,
master
.
sock
);
connect
(
root2
,
localhost
,
root
,,
test
,
$MASTER_MYPORT
,
$MASTER_MYSOCK
);
connection
root2
;
connection
root2
;
INSERT
INTO
t1
VALUES
(),
(),
();
INSERT
INTO
t1
VALUES
(),
(),
();
connection
root
;
connection
root
;
...
...
mysql-test/t/rpl000015.test
View file @
ce3a76a4
connect
(
master
,
localhost
,
root
,,
test
,
$MASTER_MYPORT
,
$MASTER_MYSOCK
);
connect
(
master
,
localhost
,
root
,,
test
,
$MASTER_MYPORT
,
$MASTER_MYSOCK
);
connect
(
slave
,
localhost
,
root
,,
test
,
$SLAVE_MYPORT
,
slave
.
sock
);
connect
(
slave
,
localhost
,
root
,,
test
,
$SLAVE_MYPORT
,
$SLAVE_MYSOCK
);
connection
master
;
connection
master
;
reset
master
;
reset
master
;
show
master
status
;
show
master
status
;
...
...
mysql-test/t/rpl000017.test
View file @
ce3a76a4
connect
(
master
,
localhost
,
root
,,
test
,
$MASTER_MYPORT
,
$MASTER_MYSOCK
);
connect
(
master
,
localhost
,
root
,,
test
,
$MASTER_MYPORT
,
$MASTER_MYSOCK
);
connect
(
slave
,
localhost
,
root
,,
test
,
$SLAVE_MYPORT
,
slave
.
sock
);
connect
(
slave
,
localhost
,
root
,,
test
,
$SLAVE_MYPORT
,
$SLAVE_MYSOCK
);
connection
master
;
connection
master
;
reset
master
;
reset
master
;
grant
replication
slave
on
*.*
to
replicate
@
localhost
identified
by
'aaaaaaaaaaaaaaab'
;
grant
replication
slave
on
*.*
to
replicate
@
localhost
identified
by
'aaaaaaaaaaaaaaab'
;
...
...
mysql-test/t/rpl_rotate_logs.test
View file @
ce3a76a4
...
@@ -16,7 +16,7 @@ connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
...
@@ -16,7 +16,7 @@ connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
--
disable_warnings
--
disable_warnings
drop
table
if
exists
t1
,
t2
,
t3
,
t4
;
drop
table
if
exists
t1
,
t2
,
t3
,
t4
;
--
enable_warnings
--
enable_warnings
connect
(
slave
,
localhost
,
root
,,
test
,
$SLAVE_MYPORT
,
slave
.
sock
);
connect
(
slave
,
localhost
,
root
,,
test
,
$SLAVE_MYPORT
,
$SLAVE_MYSOCK
);
system
cat
/
dev
/
null
>
$MYSQLTEST_VARDIR
/
slave
-
data
/
master
.
info
;
system
cat
/
dev
/
null
>
$MYSQLTEST_VARDIR
/
slave
-
data
/
master
.
info
;
system
chmod
000
$MYSQLTEST_VARDIR
/
slave
-
data
/
master
.
info
;
system
chmod
000
$MYSQLTEST_VARDIR
/
slave
-
data
/
master
.
info
;
connection
slave
;
connection
slave
;
...
...
scripts/make_binary_distribution.sh
View file @
ce3a76a4
...
@@ -360,7 +360,7 @@ BASE=$BASE2
...
@@ -360,7 +360,7 @@ BASE=$BASE2
#
#
if
[
x
"@GXX@"
=
x
"yes"
]
;
then
if
[
x
"@GXX@"
=
x
"yes"
]
;
then
gcclib
=
`
@CC@
--print-libgcc-file
`
gcclib
=
`
@CC@
@CFLAGS@
--print-libgcc-file
`
if
[
$?
-ne
0
]
;
then
if
[
$?
-ne
0
]
;
then
echo
"Warning: Couldn't find libgcc.a!"
echo
"Warning: Couldn't find libgcc.a!"
else
else
...
...
scripts/mysql_secure_installation.sh
View file @
ce3a76a4
...
@@ -21,6 +21,16 @@ command=".mysql.$$"
...
@@ -21,6 +21,16 @@ command=".mysql.$$"
trap
"interrupt"
2
trap
"interrupt"
2
rootpass
=
""
rootpass
=
""
echo_n
=
echo_c
=
set_echo_compat
()
{
case
`
echo
"testing
\c
"
`
,
`
echo
-n
testing
`
in
*
c
*
,-n
*
)
echo_n
=
echo_c
=
;;
*
c
*
,
*
)
echo_n
=
-n
echo_c
=
;;
*
)
echo_n
=
echo_c
=
'\c'
;;
esac
}
prepare
()
{
prepare
()
{
touch
$config
$command
touch
$config
$command
...
@@ -44,7 +54,7 @@ get_root_password() {
...
@@ -44,7 +54,7 @@ get_root_password() {
status
=
1
status
=
1
while
[
$status
-eq
1
]
;
do
while
[
$status
-eq
1
]
;
do
stty
-echo
stty
-echo
echo
-n
"Enter current password for root (enter for none):
"
echo
$echo_n
"Enter current password for root (enter for none):
$echo_c
"
read
password
read
password
echo
echo
stty echo
stty echo
...
@@ -64,10 +74,10 @@ get_root_password() {
...
@@ -64,10 +74,10 @@ get_root_password() {
set_root_password
()
{
set_root_password
()
{
stty
-echo
stty
-echo
echo
-n
"New password:
"
echo
$echo_n
"New password:
$echo_c
"
read
password1
read
password1
echo
echo
echo
-n
"Re-enter new password:
"
echo
$echo_n
"Re-enter new password:
$echo_c
"
read
password2
read
password2
echo
echo
stty echo
stty echo
...
@@ -172,6 +182,7 @@ cleanup() {
...
@@ -172,6 +182,7 @@ cleanup() {
# The actual script starts here
# The actual script starts here
prepare
prepare
set_echo_compat
echo
echo
echo
echo
...
@@ -200,11 +211,11 @@ echo "root user without the proper authorisation."
...
@@ -200,11 +211,11 @@ echo "root user without the proper authorisation."
echo
echo
if
[
$hadpass
-eq
0
]
;
then
if
[
$hadpass
-eq
0
]
;
then
echo
-n
"Set root password? [Y/n]
"
echo
$echo_n
"Set root password? [Y/n]
$echo_c
"
else
else
echo
"You already have a root password set, so you can safely answer 'n'."
echo
"You already have a root password set, so you can safely answer 'n'."
echo
echo
echo
-n
"Change the root password? [Y/n]
"
echo
$echo_n
"Change the root password? [Y/n]
$echo_c
"
fi
fi
read
reply
read
reply
...
@@ -231,7 +242,7 @@ echo "go a bit smoother. You should remove them before moving into a"
...
@@ -231,7 +242,7 @@ echo "go a bit smoother. You should remove them before moving into a"
echo
"production environment."
echo
"production environment."
echo
echo
echo
-n
"Remove anonymous users? [Y/n]
"
echo
$echo_n
"Remove anonymous users? [Y/n]
$echo_c
"
read
reply
read
reply
if
[
"
$reply
"
=
"n"
]
;
then
if
[
"
$reply
"
=
"n"
]
;
then
...
@@ -250,7 +261,7 @@ echo "Normally, root should only be allowed to connect from 'localhost'. This"
...
@@ -250,7 +261,7 @@ echo "Normally, root should only be allowed to connect from 'localhost'. This"
echo
"ensures that someone cannot guess at the root password from the network."
echo
"ensures that someone cannot guess at the root password from the network."
echo
echo
echo
-n
"Disallow root login remotely? [Y/n]
"
echo
$echo_n
"Disallow root login remotely? [Y/n]
$echo_c
"
read
reply
read
reply
if
[
"
$reply
"
=
"n"
]
;
then
if
[
"
$reply
"
=
"n"
]
;
then
echo
" ... skipping."
echo
" ... skipping."
...
@@ -269,7 +280,7 @@ echo "access. This is also intended only for testing, and should be removed"
...
@@ -269,7 +280,7 @@ echo "access. This is also intended only for testing, and should be removed"
echo
"before moving into a production environment."
echo
"before moving into a production environment."
echo
echo
echo
-n
"Remove test database and access to it? [Y/n]
"
echo
$echo_n
"Remove test database and access to it? [Y/n]
$echo_c
"
read
reply
read
reply
if
[
"
$reply
"
=
"n"
]
;
then
if
[
"
$reply
"
=
"n"
]
;
then
echo
" ... skipping."
echo
" ... skipping."
...
@@ -287,7 +298,7 @@ echo "Reloading the privilege tables will ensure that all changes made so far"
...
@@ -287,7 +298,7 @@ echo "Reloading the privilege tables will ensure that all changes made so far"
echo
"will take effect immediately."
echo
"will take effect immediately."
echo
echo
echo
-n
"Reload privilege tables now? [Y/n]
"
echo
$echo_n
"Reload privilege tables now? [Y/n]
$echo_c
"
read
reply
read
reply
if
[
"
$reply
"
=
"n"
]
;
then
if
[
"
$reply
"
=
"n"
]
;
then
echo
" ... skipping."
echo
" ... skipping."
...
...
sql/mysqld.cc
View file @
ce3a76a4
...
@@ -51,6 +51,10 @@
...
@@ -51,6 +51,10 @@
#define OPT_NDBCLUSTER_DEFAULT 0
#define OPT_NDBCLUSTER_DEFAULT 0
#endif
#endif
#ifndef DEFAULT_SKIP_THREAD_PRIORITY
#define DEFAULT_SKIP_THREAD_PRIORITY 0
#endif
#include <thr_alarm.h>
#include <thr_alarm.h>
#include <ft_global.h>
#include <ft_global.h>
#include <errmsg.h>
#include <errmsg.h>
...
@@ -5384,8 +5388,8 @@ Can't be set to 1 if --log-slave-updates is used.",
...
@@ -5384,8 +5388,8 @@ Can't be set to 1 if --log-slave-updates is used.",
{
"skip-symlink"
,
OPT_SKIP_SYMLINKS
,
"Don't allow symlinking of tables. Deprecated option. Use --skip-symbolic-links instead."
,
{
"skip-symlink"
,
OPT_SKIP_SYMLINKS
,
"Don't allow symlinking of tables. Deprecated option. Use --skip-symbolic-links instead."
,
0
,
0
,
0
,
GET_NO_ARG
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
,
0
,
0
,
GET_NO_ARG
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"skip-thread-priority"
,
OPT_SKIP_PRIOR
,
{
"skip-thread-priority"
,
OPT_SKIP_PRIOR
,
"Don't give threads different priorities."
,
0
,
0
,
0
,
GET_NO_ARG
,
NO_ARG
,
0
,
"Don't give threads different priorities."
,
0
,
0
,
0
,
GET_NO_ARG
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
},
DEFAULT_SKIP_THREAD_PRIORITY
,
0
,
0
,
0
,
0
,
0
},
#ifdef HAVE_REPLICATION
#ifdef HAVE_REPLICATION
{
"slave-load-tmpdir"
,
OPT_SLAVE_LOAD_TMPDIR
,
{
"slave-load-tmpdir"
,
OPT_SLAVE_LOAD_TMPDIR
,
"The location where the slave should put its temporary files when \
"The location where the slave should put its temporary files when \
...
...
support-files/MySQL-shared-compat.spec.sh
View file @
ce3a76a4
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
# Change this to match the version of the shared libs you want to include
# Change this to match the version of the shared libs you want to include
#
#
%define version50 @MYSQL_NO_DASH_VERSION@
%define version50 @MYSQL_NO_DASH_VERSION@
%define version41 4.1.1
6
%define version41 4.1.1
7
%define version40 4.0.26
%define version40 4.0.26
%define version3 3.23.58
%define version3 3.23.58
...
...
support-files/mysql.spec.sh
View file @
ce3a76a4
...
@@ -362,7 +362,7 @@ fi
...
@@ -362,7 +362,7 @@ fi
# Include libgcc.a in the devel subpackage (BUG 4921)
# Include libgcc.a in the devel subpackage (BUG 4921)
if
expr
"
$CC
"
:
".*gcc.*"
>
/dev/null
;
if
expr
"
$CC
"
:
".*gcc.*"
>
/dev/null
;
then
then
libgcc
=
`
$CC
--print-libgcc-file
`
libgcc
=
`
$CC
$CFLAGS
--print-libgcc-file
`
if
[
-f
$libgcc
]
if
[
-f
$libgcc
]
then
then
%define have_libgcc 1
%define have_libgcc 1
...
@@ -755,6 +755,11 @@ fi
...
@@ -755,6 +755,11 @@ fi
# itself - note that they must be ordered by date (important when
# itself - note that they must be ordered by date (important when
# merging BK trees)
# merging BK trees)
%changelog
%changelog
*
Fri Jan 05 2007 Kent Boortz <kent@mysql.com>
- Add CFLAGS to gcc call with
--print-libgcc-file
, to make sure the
correct
"libgcc.a"
path is returned
for
the 32/64 bit architecture.
*
Mon Dec 18 2006 Joerg Bruehe <joerg@mysql.com>
*
Mon Dec 18 2006 Joerg Bruehe <joerg@mysql.com>
- Fix the move of
"mysqlmanager"
to section 8: Directory name was wrong.
- Fix the move of
"mysqlmanager"
to section 8: Directory name was wrong.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment