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
0e0f1092
Commit
0e0f1092
authored
Aug 12, 2018
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some source comments and help texts
parent
5e1bbf66
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
13 deletions
+15
-13
scripts/mysql_install_db.sh
scripts/mysql_install_db.sh
+2
-2
storage/maria/ma_blockrec.c
storage/maria/ma_blockrec.c
+2
-1
storage/maria/ma_open.c
storage/maria/ma_open.c
+2
-2
storage/maria/maria_read_log.c
storage/maria/maria_read_log.c
+3
-3
storage/maria/unittest/ma_test_all-t
storage/maria/unittest/ma_test_all-t
+4
-3
storage/maria/unittest/ma_test_recovery.pl
storage/maria/unittest/ma_test_recovery.pl
+2
-2
No files found.
scripts/mysql_install_db.sh
View file @
0e0f1092
...
...
@@ -237,9 +237,9 @@ cannot_find_file()
fi
echo
echo
"If you compiled from source, you need to either run 'make install' to"
echo
"If you compiled
x
from source, you need to either run 'make install' to"
echo
"copy the software into the correct location ready for operation."
echo
"If you don't want to do a full install, you can use the --srcd
d
ir"
echo
"If you don't want to do a full install, you can use the --srcdir"
echo
"option to only install the mysql database and privilege tables"
echo
echo
"If you are using a binary release, you must either be at the top"
...
...
storage/maria/ma_blockrec.c
View file @
0e0f1092
...
...
@@ -2600,7 +2600,8 @@ static my_bool free_full_page_range(MARIA_HA *info, pgcache_page_no_t page,
@param record Record we should write
@param row Statistics about record (calculated by
calc_record_size())
@param map_blocks On which pages the record should be stored
@param bitmap_blocks On which pages the record should be stored
@param head_block_is_read 1 if head block existed. 0 if new block.
@param row_pos Position on head page where to put head part of
record
@param undo_lsn <> LSN_ERROR if we are executing an UNDO
...
...
storage/maria/ma_open.c
View file @
0e0f1092
...
...
@@ -473,13 +473,13 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags)
/*
A transactional table is not usable on this system if:
- share->state.create_trid > trnman_get_max_trid()
- Critical as trid as stored releative
l
to create_trid.
- Critical as trid as stored releative to create_trid.
- uuid is different
STATE_NOT_MOVABLE is reset when a table is zerofilled
(has no LSN's and no trids)
We can ignore testing uuid if STATE_NOT_MOVABLE is set, as in this
We can ignore testing uuid if STATE_NOT_MOVABLE is
not
set, as in this
case the uuid will be set in _ma_mark_file_changed().
*/
if
(
share
->
base
.
born_transactional
&&
...
...
storage/maria/maria_read_log.c
View file @
0e0f1092
...
...
@@ -261,7 +261,7 @@ static void usage(void)
puts
(
"This software comes with ABSOLUTELY NO WARRANTY. This is free software,"
);
puts
(
"and you are welcome to modify and redistribute it under the GPL license
\n
"
);
puts
(
"Display
and
apply log records from a Aria transaction log"
);
puts
(
"Display
or
apply log records from a Aria transaction log"
);
puts
(
"found in the current directory (for now)"
);
#ifndef IDENTICAL_PAGES_AFTER_RECOVERY
puts
(
"
\n
Note: Aria is compiled without -DIDENTICAL_PAGES_AFTER_RECOVERY
\n
"
...
...
@@ -269,8 +269,8 @@ static void usage(void)
"files created during normal execution. This should be ok, except for
\n
"
"test scripts that tries to compare files before and after recovery."
);
#endif
printf
(
"
\n
Usage: %s OPTIONS
\n
"
,
my_progname_short
);
puts
(
"You need to use one of -d or -a"
);
printf
(
"
\n
Usage: %s OPTIONS
[-d | -a] -h `aria_log_directory`
\n
"
,
my_progname_short
);
my_print_help
(
my_long_options
);
print_defaults
(
"my"
,
load_default_groups
);
my_print_variables
(
my_long_options
);
...
...
storage/maria/unittest/ma_test_all-t
View file @
0e0f1092
...
...
@@ -749,9 +749,10 @@ Options
--help Show this help and exit.
--abort-on-error Abort at once in case of error.
--number-of-tests Print the total number of tests and exit.
--run-tests=... Test number(s) that should be run. You can give just
one number or a range. For example 45..89. To run a specific
test alone, for example test 215, use --run-tests=215..215
--run-tests=... Test range that should be run. You can give just
one number, to start tests from this test, or a range.
For example 45..89. To run a specific test alone,
for example test 215, use --run-tests=215..215
Use this option with caution, because some of the tests
might depend on previous ones.
--start-from=... Alias for --run-tests
...
...
storage/maria/unittest/ma_test_recovery.pl
View file @
0e0f1092
...
...
@@ -235,8 +235,8 @@ sub main
# It is impossible to do a "cmp" between .good and .after_undo,
# because the UNDO phase generated log
# records whose LSN tagged pages. Another reason is that rolling back
# INSERT only marks the rows free, does not empty them
(optimization), so
# traces of the INSERT+rollback remain.
# INSERT only marks the rows free, does not empty them
#
(optimization), so
traces of the INSERT+rollback remain.
check_table_is_same
(
$table
,
$checksum
);
print
MY_LOG
"
testing idempotency
\n
";
...
...
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