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
4409e04d
Commit
4409e04d
authored
Apr 12, 2015
by
Daniel Black
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correct server side error messages
parent
9b067a3e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
29 deletions
+4
-29
sql/handler.h
sql/handler.h
+0
-2
sql/share/errmsg-utf8.txt
sql/share/errmsg-utf8.txt
+0
-6
sql/sql_admin.cc
sql/sql_admin.cc
+0
-16
sql/sql_base.cc
sql/sql_base.cc
+0
-1
sql/sql_view.cc
sql/sql_view.cc
+4
-4
No files found.
sql/handler.h
View file @
4409e04d
...
...
@@ -42,7 +42,6 @@
// the following is for checking tables
#define HA_ADMIN_VIEW_REPAIR_IS_DONE 2
#define HA_ADMIN_ALREADY_DONE 1
#define HA_ADMIN_OK 0
#define HA_ADMIN_NOT_IMPLEMENTED -1
...
...
@@ -57,7 +56,6 @@
#define HA_ADMIN_NEEDS_UPGRADE -10
#define HA_ADMIN_NEEDS_ALTER -11
#define HA_ADMIN_NEEDS_CHECK -12
#define HA_ADMIN_NEEDS_REPAIR -13
/* Bits in table_flags() to show what database can do */
...
...
sql/share/errmsg-utf8.txt
View file @
4409e04d
...
...
@@ -6565,9 +6565,3 @@ ER_QUERY_EXCEEDED_ROWS_EXAMINED_LIMIT
ER_NO_SUCH_TABLE_IN_ENGINE 42S02
eng "Table '%-.192s.%-.192s' doesn't exist in engine"
swe "Det finns ingen tabell som heter '%-.192s.%-.192s' i handlern"
ER_NO_MARIADB_SERVER_FIELD
eng "view '%-.192s.%-.192s' has no field mariadb server in its .frm file"
ER_VIEW_REPAIR_IS_DONE
eng "view is repaired"
ER_NEEDS_REPAIR
eng "needs repair"
sql/sql_admin.cc
View file @
4409e04d
...
...
@@ -879,22 +879,6 @@ send_result_message:
fatal_error
=
1
;
break
;
}
case
HA_ADMIN_VIEW_REPAIR_IS_DONE
:
{
protocol
->
store
(
STRING_WITH_LEN
(
"status"
),
system_charset_info
);
protocol
->
store
(
ER
(
ER_VIEW_REPAIR_IS_DONE
),
strlen
(
ER
(
ER_VIEW_REPAIR_IS_DONE
)),
system_charset_info
);
break
;
}
case
HA_ADMIN_NEEDS_REPAIR
:
{
protocol
->
store
(
STRING_WITH_LEN
(
"status"
),
system_charset_info
);
protocol
->
store
(
ER
(
ER_NEEDS_REPAIR
),
strlen
(
ER
(
ER_NEEDS_REPAIR
)),
system_charset_info
);
break
;
}
default:
// Probably HA_ADMIN_INTERNAL_ERROR
{
...
...
sql/sql_base.cc
View file @
4409e04d
...
...
@@ -3023,7 +3023,6 @@ bool open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
else
if
(
table_list
->
open_strategy
==
TABLE_LIST
::
OPEN_STUB
)
DBUG_RETURN
(
FALSE
);
retry_share:
mysql_mutex_lock
(
&
LOCK_open
);
...
...
sql/sql_view.cc
View file @
4409e04d
...
...
@@ -882,7 +882,7 @@ int mariadb_fix_view(THD *thd, TABLE_LIST *view, bool wrong_checksum,
"MERGE"
:
"TEMPTABLE"
);
DBUG_RETURN
(
HA_ADMIN_
VIEW_REPAIR_IS_DONE
);
DBUG_RETURN
(
HA_ADMIN_
OK
);
}
...
...
@@ -2049,11 +2049,11 @@ int view_check(THD *thd, TABLE_LIST *view, HA_CHECK_OPT *check_opt)
!
view
->
mariadb_version
))
{
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_NOTE
,
ER_
NO_MARIADB_SERVER_FIELD
,
ER
(
ER_
NO_MARIADB_SERVER_FIELD
),
ER_
TABLE_NEEDS_UPGRADE
,
ER
(
ER_
TABLE_NEEDS_UPGRADE
),
view
->
db
,
view
->
table_name
);
DBUG_RETURN
(
HA_ADMIN_NEEDS_
REPAIR
);
DBUG_RETURN
(
HA_ADMIN_NEEDS_
UPGRADE
);
}
DBUG_RETURN
(
HA_ADMIN_OK
);
}
...
...
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