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
c48abfe6
Commit
c48abfe6
authored
Feb 09, 2002
by
monty@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
parents
be90ca5c
40c77c76
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
24 deletions
+26
-24
Docs/manual.texi
Docs/manual.texi
+2
-2
myisam/myisampack.c
myisam/myisampack.c
+1
-1
sql/handler.cc
sql/handler.cc
+23
-20
sql/slave.cc
sql/slave.cc
+0
-1
No files found.
Docs/manual.texi
View file @
c48abfe6
...
@@ -46898,8 +46898,8 @@ Added internal safety checks for InnoDB.
...
@@ -46898,8 +46898,8 @@ Added internal safety checks for InnoDB.
Some InnoDB variables was always shown in @code{SHOW VARIABLES} as
Some InnoDB variables was always shown in @code{SHOW VARIABLES} as
@code{OFF} on high-byte-first systems (like sparc).
@code{OFF} on high-byte-first systems (like sparc).
@item
@item
Fixed problem with one thread
s
using an InnoDB table and another
Fixed problem with one thread using an InnoDB table and another
thread
using an @code{ALTER TABLE} on th
e table.
thread
doing an @code{ALTER TABLE} on the sam
e table.
@item
@item
If inserts to several tables containing an auto-inc column are wrapped
If inserts to several tables containing an auto-inc column are wrapped
inside one @code{LOCK TABLES}, InnoDB asserted in @code{lock0lock.c}.
inside one @code{LOCK TABLES}, InnoDB asserted in @code{lock0lock.c}.
myisam/myisampack.c
View file @
c48abfe6
...
@@ -283,7 +283,7 @@ static void usage(void)
...
@@ -283,7 +283,7 @@ static void usage(void)
-?, --help Display this help and exit.
\n
\
-?, --help Display this help and exit.
\n
\
-V, --version Output version information and exit."
);
-V, --version Output version information and exit."
);
print_defaults
(
"my"
,
load_default_groups
);
print_defaults
(
"my"
,
load_default_groups
);
}
;
}
/* reads options */
/* reads options */
/* Initiates DEBUG - but no debugging here ! */
/* Initiates DEBUG - but no debugging here ! */
...
...
sql/handler.cc
View file @
c48abfe6
...
@@ -257,28 +257,31 @@ int ha_autocommit_or_rollback(THD *thd, int error)
...
@@ -257,28 +257,31 @@ int ha_autocommit_or_rollback(THD *thd, int error)
DBUG_RETURN
(
error
);
DBUG_RETURN
(
error
);
}
}
/* This function is called when MySQL writes the log segment of a transaction
/*
to the binlog. It is called when the LOCK_log mutex is reserved. Here we
This function is called when MySQL writes the log segment of a
communicate to transactional table handlers whta binlog position corresponds
transaction to the binlog. It is called when the LOCK_log mutex is
to the current transaction. The handler can store it and in recovery print
reserved. Here we communicate to transactional table handlers whta
to the user, so that the user knows from what position in the binlog to
binlog position corresponds to the current transaction. The handler
start possible roll-forward, for example, if the crashed server was a slave
can store it and in recovery print to the user, so that the user
in replication. This function also calls the commit of the table handler,
knows from what position in the binlog to start possible
because the order of trasnactions in the log of the table handler must be
roll-forward, for example, if the crashed server was a slave in
the same as in the binlog. */
replication. This function also calls the commit of the table
handler, because the order of trasnactions in the log of the table
int
ha_report_binlog_offset_and_commit
(
handler must be the same as in the binlog.
THD
*
thd
,
/* in: user thread */
char
*
log_file_name
,
/* in: latest binlog file name */
arguments:
my_off_t
end_offset
)
/* in: the offset in the binlog file
log_file_name: latest binlog file name
up to which we wrote */
end_offset: the offset in the binlog file up to which we wrote
*/
int
ha_report_binlog_offset_and_commit
(
THD
*
thd
,
char
*
log_file_name
,
my_off_t
end_offset
)
{
{
int
error
=
0
;
#ifdef HAVE_INNOBASE_DB
THD_TRANS
*
trans
;
THD_TRANS
*
trans
;
int
error
=
0
;
trans
=
&
thd
->
transaction
.
all
;
trans
=
&
thd
->
transaction
.
all
;
#ifdef HAVE_INNOBASE_DB
if
(
trans
->
innobase_tid
)
if
(
trans
->
innobase_tid
)
{
{
if
((
error
=
innobase_report_binlog_offset_and_commit
(
thd
,
if
((
error
=
innobase_report_binlog_offset_and_commit
(
thd
,
...
@@ -292,10 +295,10 @@ int ha_report_binlog_offset_and_commit(
...
@@ -292,10 +295,10 @@ int ha_report_binlog_offset_and_commit(
trans
->
innodb_active_trans
=
0
;
trans
->
innodb_active_trans
=
0
;
}
}
#endif
#endif
return
error
;
return
error
;
}
}
int
ha_commit_trans
(
THD
*
thd
,
THD_TRANS
*
trans
)
int
ha_commit_trans
(
THD
*
thd
,
THD_TRANS
*
trans
)
{
{
int
error
=
0
;
int
error
=
0
;
...
...
sql/slave.cc
View file @
c48abfe6
...
@@ -79,7 +79,6 @@ static byte* get_table_key(TABLE_RULE_ENT* e, uint* len,
...
@@ -79,7 +79,6 @@ static byte* get_table_key(TABLE_RULE_ENT* e, uint* len,
void
init_slave_skip_errors
(
char
*
arg
)
void
init_slave_skip_errors
(
char
*
arg
)
{
{
char
*
p
;
char
*
p
;
my_bool
last_was_digit
=
0
;
if
(
bitmap_init
(
&
slave_error_mask
,
MAX_SLAVE_ERROR
,
0
))
if
(
bitmap_init
(
&
slave_error_mask
,
MAX_SLAVE_ERROR
,
0
))
{
{
fprintf
(
stderr
,
"Badly out of memory, please check your system status
\n
"
);
fprintf
(
stderr
,
"Badly out of memory, please check your system status
\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