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
22bb602a
Commit
22bb602a
authored
Mar 20, 2010
by
Alexey Kopytov
Browse files
Options
Browse Files
Download
Plain Diff
Automerge.
parents
5ab6b0bb
4a39f83f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
dbug/dbug.c
dbug/dbug.c
+1
-1
scripts/CMakeLists.txt
scripts/CMakeLists.txt
+2
-1
scripts/make_win_bin_dist
scripts/make_win_bin_dist
+0
-2
No files found.
dbug/dbug.c
View file @
22bb602a
...
@@ -384,7 +384,7 @@ static CODE_STATE *code_state(void)
...
@@ -384,7 +384,7 @@ static CODE_STATE *code_state(void)
if
(
!
init_done
)
if
(
!
init_done
)
{
{
init_done
=
TRUE
;
init_done
=
TRUE
;
pthread_mutex_init
(
&
THR_LOCK_dbug
,
MY_MUTEX_INIT_FAST
);
pthread_mutex_init
(
&
THR_LOCK_dbug
,
NULL
);
bzero
(
&
init_settings
,
sizeof
(
init_settings
));
bzero
(
&
init_settings
,
sizeof
(
init_settings
));
init_settings
.
out_file
=
stderr
;
init_settings
.
out_file
=
stderr
;
init_settings
.
flags
=
OPEN_APPEND
;
init_settings
.
flags
=
OPEN_APPEND
;
...
...
scripts/CMakeLists.txt
View file @
22bb602a
...
@@ -261,7 +261,8 @@ IF(WIN32)
...
@@ -261,7 +261,8 @@ IF(WIN32)
SET
(
PLIN_FILES mysql_config mysql_secure_installation
)
SET
(
PLIN_FILES mysql_config mysql_secure_installation
)
# Input files with .sh extension
# Input files with .sh extension
SET
(
SH_FILES mysql_convert_table_format mysqld_multi
)
SET
(
SH_FILES mysql_convert_table_format mysqld_multi mysqldumpslow
mysqlhotcopy
)
FOREACH
(
file
${
PLIN_FILES
}
)
FOREACH
(
file
${
PLIN_FILES
}
)
CONFIGURE_FILE
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
file
}
.pl.in
CONFIGURE_FILE
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
file
}
.pl.in
...
...
scripts/make_win_bin_dist
View file @
22bb602a
...
@@ -158,7 +158,6 @@ cp tests/$TARGET/*.exe $DESTDIR/bin/
...
@@ -158,7 +158,6 @@ cp tests/$TARGET/*.exe $DESTDIR/bin/
cp
libmysql/
$TARGET
/libmysql.dll
$DESTDIR
/bin/
cp
libmysql/
$TARGET
/libmysql.dll
$DESTDIR
/bin/
cp
sql/
$TARGET
/mysqld.exe
$DESTDIR
/bin/mysqld
$EXE_SUFFIX
.exe
cp
sql/
$TARGET
/mysqld.exe
$DESTDIR
/bin/mysqld
$EXE_SUFFIX
.exe
cp
sql/
$TARGET
/mysqld.map
$DESTDIR
/bin/mysqld
$EXE_SUFFIX
.map
if
[
x
"
$TARGET
"
!=
x
"release"
]
;
then
if
[
x
"
$TARGET
"
!=
x
"release"
]
;
then
cp
sql/
$TARGET
/mysqld.pdb
$DESTDIR
/bin/mysqld
$EXE_SUFFIX
.pdb
cp
sql/
$TARGET
/mysqld.pdb
$DESTDIR
/bin/mysqld
$EXE_SUFFIX
.pdb
fi
fi
...
@@ -167,7 +166,6 @@ if [ x"$PACK_DEBUG" = x"" -a -f "sql/debug/mysqld.exe" -o \
...
@@ -167,7 +166,6 @@ if [ x"$PACK_DEBUG" = x"" -a -f "sql/debug/mysqld.exe" -o \
x
"
$PACK_DEBUG
"
=
x
"yes"
]
;
then
x
"
$PACK_DEBUG
"
=
x
"yes"
]
;
then
cp
sql/debug/mysqld.exe
$DESTDIR
/bin/mysqld-debug.exe
cp
sql/debug/mysqld.exe
$DESTDIR
/bin/mysqld-debug.exe
cp
sql/debug/mysqld.pdb
$DESTDIR
/bin/mysqld-debug.pdb
cp
sql/debug/mysqld.pdb
$DESTDIR
/bin/mysqld-debug.pdb
cp
sql/debug/mysqld.map
$DESTDIR
/bin/mysqld-debug.map
fi
fi
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
...
...
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