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
c1376737
Commit
c1376737
authored
Apr 27, 2003
by
monty@mashka.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
parents
dd377bfb
a1861ddb
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
377 additions
and
575 deletions
+377
-575
Docs/internals.texi
Docs/internals.texi
+374
-559
innobase/include/trx0trx.h
innobase/include/trx0trx.h
+0
-4
innobase/srv/srv0start.c
innobase/srv/srv0start.c
+3
-1
innobase/trx/trx0trx.c
innobase/trx/trx0trx.c
+0
-2
sql/ha_innodb.cc
sql/ha_innodb.cc
+0
-9
No files found.
Docs/internals.texi
View file @
c1376737
This diff is collapsed.
Click to expand it.
innobase/include/trx0trx.h
View file @
c1376737
...
@@ -418,10 +418,6 @@ struct trx_struct{
...
@@ -418,10 +418,6 @@ struct trx_struct{
lock_t
*
auto_inc_lock
;
/* possible auto-inc lock reserved by
lock_t
*
auto_inc_lock
;
/* possible auto-inc lock reserved by
the transaction; note that it is also
the transaction; note that it is also
in the lock list trx_locks */
in the lock list trx_locks */
ibool
ignore_duplicates_in_insert
;
/* in an insert roll back only insert
of the latest row in case
of a duplicate key error */
UT_LIST_NODE_T
(
trx_t
)
UT_LIST_NODE_T
(
trx_t
)
trx_list
;
/* list of transactions */
trx_list
;
/* list of transactions */
UT_LIST_NODE_T
(
trx_t
)
UT_LIST_NODE_T
(
trx_t
)
...
...
innobase/srv/srv0start.c
View file @
c1376737
...
@@ -1441,6 +1441,8 @@ innobase_start_or_create_for_mysql(void)
...
@@ -1441,6 +1441,8 @@ innobase_start_or_create_for_mysql(void)
srv_force_recovery
);
srv_force_recovery
);
}
}
fflush
(
stderr
);
return
((
int
)
DB_SUCCESS
);
return
((
int
)
DB_SUCCESS
);
}
}
...
...
innobase/trx/trx0trx.c
View file @
c1376737
...
@@ -102,8 +102,6 @@ trx_create(
...
@@ -102,8 +102,6 @@ trx_create(
trx
->
mysql_master_log_file_name
=
(
char
*
)
""
;
trx
->
mysql_master_log_file_name
=
(
char
*
)
""
;
trx
->
mysql_master_log_pos
=
0
;
trx
->
mysql_master_log_pos
=
0
;
trx
->
ignore_duplicates_in_insert
=
FALSE
;
mutex_create
(
&
(
trx
->
undo_mutex
));
mutex_create
(
&
(
trx
->
undo_mutex
));
mutex_set_level
(
&
(
trx
->
undo_mutex
),
SYNC_TRX_UNDO
);
mutex_set_level
(
&
(
trx
->
undo_mutex
),
SYNC_TRX_UNDO
);
...
...
sql/ha_innodb.cc
View file @
c1376737
...
@@ -1911,13 +1911,6 @@ ha_innobase::write_row(
...
@@ -1911,13 +1911,6 @@ ha_innobase::write_row(
build_template
(
prebuilt
,
NULL
,
table
,
ROW_MYSQL_WHOLE_ROW
);
build_template
(
prebuilt
,
NULL
,
table
,
ROW_MYSQL_WHOLE_ROW
);
}
}
if
(
user_thd
->
lex
.
sql_command
==
SQLCOM_INSERT
&&
user_thd
->
lex
.
duplicates
==
DUP_IGNORE
)
{
prebuilt
->
trx
->
ignore_duplicates_in_insert
=
TRUE
;
}
else
{
prebuilt
->
trx
->
ignore_duplicates_in_insert
=
FALSE
;
}
srv_conc_enter_innodb
(
prebuilt
->
trx
);
srv_conc_enter_innodb
(
prebuilt
->
trx
);
error
=
row_insert_for_mysql
((
byte
*
)
record
,
prebuilt
);
error
=
row_insert_for_mysql
((
byte
*
)
record
,
prebuilt
);
...
@@ -1958,8 +1951,6 @@ ha_innobase::write_row(
...
@@ -1958,8 +1951,6 @@ ha_innobase::write_row(
}
}
}
}
prebuilt
->
trx
->
ignore_duplicates_in_insert
=
FALSE
;
error
=
convert_error_code_to_mysql
(
error
,
user_thd
);
error
=
convert_error_code_to_mysql
(
error
,
user_thd
);
/* Tell InnoDB server that there might be work for
/* Tell InnoDB server that there might be work for
...
...
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