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
30441aea
Commit
30441aea
authored
15 years ago
by
Satya B
Browse files
Options
Browse Files
Download
Plain Diff
merge 5.0-bugteam to 5.1-bugteam
parents
9c708fdf
559e2f1c
Branches unavailable
Tags unavailable
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
13 deletions
+11
-13
include/my_base.h
include/my_base.h
+2
-1
mysys/my_handler_errors.h
mysys/my_handler_errors.h
+2
-1
sql/handler.cc
sql/handler.cc
+4
-0
sql/share/errmsg.txt
sql/share/errmsg.txt
+2
-0
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+1
-11
No files found.
include/my_base.h
View file @
30441aea
...
...
@@ -441,7 +441,8 @@ enum ha_base_keytype {
#define HA_ERR_INITIALIZATION 174
/* Error during initialization */
#define HA_ERR_FILE_TOO_SHORT 175
/* File too short */
#define HA_ERR_WRONG_CRC 176
/* Wrong CRC on page */
#define HA_ERR_LAST 176
/* Copy of last error nr */
#define HA_ERR_TOO_MANY_CONCURRENT_TRXS 177
/*Too many active concurrent transactions */
#define HA_ERR_LAST 177
/* Copy of last error nr */
/* Number of different errors */
#define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1)
...
...
This diff is collapsed.
Click to expand it.
mysys/my_handler_errors.h
View file @
30441aea
...
...
@@ -62,6 +62,7 @@ static const char *handler_error_messages[]=
"The event could not be processed no other hanlder error happened"
,
"Got a fatal error during initialzaction of handler"
,
"File to short; Expected more data in file"
,
"Read page with wrong checksum"
"Read page with wrong checksum"
,
"Too many active concurrent transactions"
};
This diff is collapsed.
Click to expand it.
sql/handler.cc
View file @
30441aea
...
...
@@ -342,6 +342,7 @@ int ha_init_errors(void)
SETMSG
(
HA_ERR_TABLE_READONLY
,
ER
(
ER_OPEN_AS_READONLY
));
SETMSG
(
HA_ERR_AUTOINC_READ_FAILED
,
ER
(
ER_AUTOINC_READ_FAILED
));
SETMSG
(
HA_ERR_AUTOINC_ERANGE
,
ER
(
ER_WARN_DATA_OUT_OF_RANGE
));
SETMSG
(
HA_ERR_TOO_MANY_CONCURRENT_TRXS
,
ER
(
ER_TOO_MANY_CONCURRENT_TRXS
));
/* Register the error messages for use with my_error(). */
return
my_error_register
(
errmsgs
,
HA_ERR_FIRST
,
HA_ERR_LAST
);
...
...
@@ -2747,6 +2748,9 @@ void handler::print_error(int error, myf errflag)
case
HA_ERR_AUTOINC_ERANGE
:
textno
=
ER_WARN_DATA_OUT_OF_RANGE
;
break
;
case
HA_ERR_TOO_MANY_CONCURRENT_TRXS
:
textno
=
ER_TOO_MANY_CONCURRENT_TRXS
;
break
;
default:
{
/* The error was "unknown" to this function.
...
...
This diff is collapsed.
Click to expand it.
sql/share/errmsg.txt
View file @
30441aea
...
...
@@ -6201,3 +6201,5 @@ ER_TEMPORARY_NAME
ER_RENAMED_NAME
eng "Renamed"
swe "Namnndrad"
ER_TOO_MANY_CONCURRENT_TRXS
eng "Too many active concurrent transactions"
This diff is collapsed.
Click to expand it.
storage/innobase/handler/ha_innodb.cc
View file @
30441aea
...
...
@@ -734,17 +734,7 @@ convert_error_code_to_mysql(
return
(
HA_ERR_LOCK_TABLE_FULL
);
}
else
if
(
error
==
DB_TOO_MANY_CONCURRENT_TRXS
)
{
/* Once MySQL add the appropriate code to errmsg.txt then
we can get rid of this #ifdef. NOTE: The code checked by
the #ifdef is the suggested name for the error condition
and the actual error code name could very well be different.
This will require some monitoring, ie. the status
of this request on our part.*/
#ifdef ER_TOO_MANY_CONCURRENT_TRXS
return
(
ER_TOO_MANY_CONCURRENT_TRXS
);
#else
return
(
HA_ERR_RECORD_FILE_FULL
);
#endif
return
(
HA_ERR_TOO_MANY_CONCURRENT_TRXS
);
}
else
if
(
error
==
DB_UNSUPPORTED
)
{
...
...
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