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
76fb6d69
Commit
76fb6d69
authored
Nov 10, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.0
parents
33956088
fca8f01a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
15 deletions
+18
-15
mysql-test/r/ps_1general.result
mysql-test/r/ps_1general.result
+0
-1
sql/handler.h
sql/handler.h
+3
-2
sql/log.cc
sql/log.cc
+1
-1
sql/sql_show.cc
sql/sql_show.cc
+14
-11
No files found.
mysql-test/r/ps_1general.result
View file @
76fb6d69
...
...
@@ -332,7 +332,6 @@ CSV YES/NO CSV storage engine
ndbcluster YES/NO Clustered, fault-tolerant, memory-based tables
FEDERATED YES/NO Federated MySQL storage engine
MRG_MYISAM YES/NO Collection of identical MyISAM tables
binlog YES/NO This is a meta storage engine to represent the binlog in a transaction
ISAM YES/NO Obsolete storage engine
drop table if exists t5;
prepare stmt1 from ' drop table if exists t5 ' ;
...
...
sql/handler.h
View file @
76fb6d69
...
...
@@ -401,8 +401,9 @@ struct show_table_alias_st {
/* Possible flags of a handlerton */
#define HTON_NO_FLAGS 0
#define HTON_CLOSE_CURSORS_AT_COMMIT (1 << 0)
#define HTON_ALTER_NOT_SUPPORTED (1 << 1)
#define HTON_CAN_RECREATE (1 << 2)
#define HTON_ALTER_NOT_SUPPORTED (1 << 1) //Engine does not support alter
#define HTON_CAN_RECREATE (1 << 2) //Delete all is used fro truncate
#define HTON_HIDDEN (1 << 3) //Engine does not appear in lists
typedef
struct
st_thd_trans
{
...
...
sql/log.cc
View file @
76fb6d69
...
...
@@ -67,7 +67,7 @@ handlerton binlog_hton = {
NULL
,
/* create_cursor_read_view */
NULL
,
/* set_cursor_read_view */
NULL
,
/* close_cursor_read_view */
HTON_
NO_FLAGS
HTON_
HIDDEN
};
/*
...
...
sql/sql_show.cc
View file @
76fb6d69
...
...
@@ -70,17 +70,20 @@ bool mysqld_show_storage_engines(THD *thd)
handlerton
**
types
;
for
(
types
=
sys_table_types
;
*
types
;
types
++
)
{
protocol
->
prepare_for_resend
();
protocol
->
store
((
*
types
)
->
name
,
system_charset_info
);
const
char
*
option_name
=
show_comp_option_name
[(
int
)
(
*
types
)
->
state
];
if
((
*
types
)
->
state
==
SHOW_OPTION_YES
&&
!
my_strcasecmp
(
system_charset_info
,
default_type_name
,
(
*
types
)
->
name
))
option_name
=
"DEFAULT"
;
protocol
->
store
(
option_name
,
system_charset_info
);
protocol
->
store
((
*
types
)
->
comment
,
system_charset_info
);
if
(
protocol
->
write
())
DBUG_RETURN
(
TRUE
);
if
(
!
((
*
types
)
->
flags
&
HTON_HIDDEN
))
{
protocol
->
prepare_for_resend
();
protocol
->
store
((
*
types
)
->
name
,
system_charset_info
);
const
char
*
option_name
=
show_comp_option_name
[(
int
)
(
*
types
)
->
state
];
if
((
*
types
)
->
state
==
SHOW_OPTION_YES
&&
!
my_strcasecmp
(
system_charset_info
,
default_type_name
,
(
*
types
)
->
name
))
option_name
=
"DEFAULT"
;
protocol
->
store
(
option_name
,
system_charset_info
);
protocol
->
store
((
*
types
)
->
comment
,
system_charset_info
);
if
(
protocol
->
write
())
DBUG_RETURN
(
TRUE
);
}
}
send_eof
(
thd
);
DBUG_RETURN
(
FALSE
);
...
...
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