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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a533db74
Commit
a533db74
authored
21 years ago
by
monty@mashka.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Patch for novell
Reverted wrong patch for mysqld_safe.sh
parent
62eda324
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
client/mysqldump.c
client/mysqldump.c
+10
-2
scripts/mysqld_safe.sh
scripts/mysqld_safe.sh
+1
-1
No files found.
client/mysqldump.c
View file @
a533db74
...
@@ -894,9 +894,12 @@ static void dumpTable(uint numFields, char *table)
...
@@ -894,9 +894,12 @@ static void dumpTable(uint numFields, char *table)
{
{
char
query
[
QUERY_LENGTH
],
*
end
,
buff
[
256
],
table_buff
[
NAME_LEN
+
3
];
char
query
[
QUERY_LENGTH
],
*
end
,
buff
[
256
],
table_buff
[
NAME_LEN
+
3
];
MYSQL_RES
*
res
;
MYSQL_RES
*
res
;
MYSQL_FIELD
*
field
;
MYSQL_FIELD
*
field
;
MYSQL_ROW
row
;
MYSQL_ROW
row
;
ulong
rownr
,
row_break
,
total_length
,
init_length
;
ulong
rownr
,
row_break
,
total_length
,
init_length
;
#if defined(__NETWARE__) && defined(THREAD)
uint
lines
=
0
;
#endif
if
(
verbose
)
if
(
verbose
)
fprintf
(
stderr
,
"-- Sending SELECT query...
\n
"
);
fprintf
(
stderr
,
"-- Sending SELECT query...
\n
"
);
...
@@ -1123,6 +1126,11 @@ static void dumpTable(uint numFields, char *table)
...
@@ -1123,6 +1126,11 @@ static void dumpTable(uint numFields, char *table)
}
}
else
if
(
!
opt_xml
)
else
if
(
!
opt_xml
)
fputs
(
");
\n
"
,
md_result_file
);
fputs
(
");
\n
"
,
md_result_file
);
#if defined(__NETWARE__) && defined(THREAD)
/* on a long result the screen could hog the cpu */
if
((
lines
++
&
1023
)
==
0
)
pthread_yield
();
#endif
}
}
/* XML - close table tag and supress regular output */
/* XML - close table tag and supress regular output */
...
...
This diff is collapsed.
Click to expand it.
scripts/mysqld_safe.sh
View file @
a533db74
...
@@ -272,6 +272,7 @@ echo "Starting $MYSQLD daemon with databases from $DATADIR"
...
@@ -272,6 +272,7 @@ echo "Starting $MYSQLD daemon with databases from $DATADIR"
echo
"
`
date
+
'%y%m%d %H:%M:%S mysqld started'
`
"
>>
$err_log
echo
"
`
date
+
'%y%m%d %H:%M:%S mysqld started'
`
"
>>
$err_log
while
true
while
true
do
do
rm
-f
$MYSQL_UNIX_PORT
$pid_file
# Some extra safety
if
test
-z
"
$args
"
if
test
-z
"
$args
"
then
then
$NOHUP_NICENESS
$ledir
/
$MYSQLD
$defaults
--basedir
=
$MY_BASEDIR_VERSION
--datadir
=
$DATADIR
$USER_OPTION
--pid-file
=
$pid_file
@MYSQLD_DEFAULT_SWITCHES@
>>
$err_log
2>&1
$NOHUP_NICENESS
$ledir
/
$MYSQLD
$defaults
--basedir
=
$MY_BASEDIR_VERSION
--datadir
=
$DATADIR
$USER_OPTION
--pid-file
=
$pid_file
@MYSQLD_DEFAULT_SWITCHES@
>>
$err_log
2>&1
...
@@ -310,7 +311,6 @@ do
...
@@ -310,7 +311,6 @@ do
I
=
`
expr
$I
+ 1
`
I
=
`
expr
$I
+ 1
`
done
done
fi
fi
rm
-f
$MYSQL_UNIX_PORT
$pid_file
# Some extra safety
echo
"
`
date
+
'%y%m%d %H:%M:%S'
`
mysqld restarted"
|
tee
-a
$err_log
echo
"
`
date
+
'%y%m%d %H:%M:%S'
`
mysqld restarted"
|
tee
-a
$err_log
done
done
...
...
This diff is collapsed.
Click to expand it.
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