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
b9f5aba8
Commit
b9f5aba8
authored
Oct 23, 2009
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge Peter Lieverdink's fixes:
- configtest target in rc script. - type fix usefull -> useful.
parents
1b7d4b37
c4f5fc85
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
37 additions
and
10 deletions
+37
-10
Docs/myisam.txt
Docs/myisam.txt
+1
-1
configure.in
configure.in
+1
-1
mysql-test/mysql-stress-test.pl
mysql-test/mysql-stress-test.pl
+2
-2
mysys/safemalloc.c
mysys/safemalloc.c
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+1
-1
sql/sql_select.cc
sql/sql_select.cc
+1
-1
sql/udf_example.c
sql/udf_example.c
+1
-1
support-files/mysql.server.sh
support-files/mysql.server.sh
+29
-2
No files found.
Docs/myisam.txt
View file @
b9f5aba8
...
...
@@ -868,7 +868,7 @@ Space compression makes the index file smaller if the string column has a lot of
Prefix compression helps if there are many strings with an identical prefix.
In memory table characteristics
HEAP tables only exists in memory so they are lost if `mysqld' is taken down or crashes. But since they are *very* fast they are useful
l
as anyway.
HEAP tables only exists in memory so they are lost if `mysqld' is taken down or crashes. But since they are *very* fast they are useful as anyway.
The *MySQL* internal HEAP tables uses 100% dynamic hashing without overflow areas and don't have problems with delete.
...
...
configure.in
View file @
b9f5aba8
...
...
@@ -2847,7 +2847,7 @@ do
done
AC_SUBST(sql_union_dirs)
# Some useful
l
subst
# Some useful subst
AC_SUBST(CC)
AC_SUBST(GXX)
...
...
mysql-test/mysql-stress-test.pl
View file @
b9f5aba8
...
...
@@ -1100,7 +1100,7 @@ mysql-stress-test.pl --stress-basedir=<dir> --stress-suite-basedir=<dir> --serve
they specified in the list file.
--sleep-time=<time in seconds>
Delay between test execution. Could be useful
l
in continued testsing
Delay between test execution. Could be useful in continued testsing
when one of instance of stress script perform periodical cleanup or
recreating of some database objects
...
...
@@ -1109,7 +1109,7 @@ mysql-stress-test.pl --stress-basedir=<dir> --stress-suite-basedir=<dir> --serve
--check-tests-file
Check file with list of tests. If file was modified it will force to
reread list of tests. Could be useful
l
in continued testing for
reread list of tests. Could be useful in continued testing for
adding/removing tests without script interruption
--mysqltest=/path/to/mysqltest binary
...
...
mysys/safemalloc.c
View file @
b9f5aba8
...
...
@@ -436,7 +436,7 @@ void TERMINATE(FILE *file, uint flag)
/*
Report where a piece of memory was allocated
This is useful
l
to call from withing a debugger
This is useful to call from withing a debugger
*/
void
sf_malloc_report_allocated
(
void
*
memory
)
...
...
sql/mysqld.cc
View file @
b9f5aba8
...
...
@@ -6630,7 +6630,7 @@ log and this option does nothing anymore.",
0
,
0
,
0
,
0
,
0
},
{
"test-ignore-wrong-options"
,
OPT_TEST_IGNORE_WRONG_OPTIONS
,
"Ignore wrong enums values in command line arguments. Useful
l
only for test scripts"
,
"Ignore wrong enums values in command line arguments. Useful only for test scripts"
,
(
uchar
**
)
&
opt_ignore_wrong_options
,
(
uchar
**
)
&
opt_ignore_wrong_options
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"timed_mutexes"
,
OPT_TIMED_MUTEXES
,
...
...
sql/sql_select.cc
View file @
b9f5aba8
...
...
@@ -11812,7 +11812,7 @@ join_read_const_table(JOIN_TAB *tab, POSITION *pos)
{
#if !defined(DBUG_OFF) && defined(NOT_USING_ITEM_EQUAL)
/*
This test could be very useful
l
to find bugs in the optimizer
This test could be very useful to find bugs in the optimizer
where we would call this function with an expression that can't be
evaluated yet. We can't have this enabled by default as long as
have items like Item_equal, that doesn't report they are const but
...
...
sql/udf_example.c
View file @
b9f5aba8
...
...
@@ -205,7 +205,7 @@ char *is_const(UDF_INIT *initid, UDF_ARGS *args, char *result, unsigned long
** try to keep the error message less than 80 bytes long!
**
** This function should return 1 if something goes wrong. In this case
** message should contain something useful
l
!
** message should contain something useful!
**************************************************************************/
#define MAXMETAPH 8
...
...
support-files/mysql.server.sh
View file @
b9f5aba8
...
...
@@ -434,9 +434,36 @@ case "$mode" in
fi
fi
;;
'configtest'
)
# Safeguard (relative paths, core dumps..)
cd
$basedir
echo
$echo_n
"Testing MySQL configuration syntax"
daemon
=
$bindir
/mysqld
if
test
-x
$libexecdir
/mysqld
then
daemon
=
$libexecdir
/mysqld
elif
test
-x
$sbindir
/mysqld
then
daemon
=
$sbindir
/mysqld
elif
test
-x
`
which mysqld
`
then
daemon
=
`
which mysqld
`
else
log_failure_msg
"Unable to locate the mysqld binary!"
exit
1
fi
help_out
=
`
$daemon
--help
2>&1
`
;
r
=
$?
if
test
"
$r
"
!=
0
;
then
log_failure_msg
"
$help_out
"
log_failure_msg
"There are syntax errors in the server configuration. Please fix them!"
else
log_success_msg
"Syntax OK"
fi
exit
$r
;;
*
)
# usage
echo
"Usage:
$0
{start|stop|restart|reload|force-reload|status} [ MySQL server options ]"
echo
"Usage:
$0
{start|stop|restart|reload|force-reload|status
|configtest
} [ MySQL server options ]"
exit
1
;;
esac
...
...
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