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
d7baef2a
Commit
d7baef2a
authored
Jul 20, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes needed
parents
8a08c802
e7ea49dc
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
3 deletions
+20
-3
mysql-test/r/warnings.result
mysql-test/r/warnings.result
+7
-0
mysql-test/t/warnings-master.opt
mysql-test/t/warnings-master.opt
+1
-1
mysql-test/t/warnings.test
mysql-test/t/warnings.test
+4
-0
sql/mysql_priv.h
sql/mysql_priv.h
+1
-0
sql/mysqld.cc
sql/mysqld.cc
+6
-2
sql/set_var.cc
sql/set_var.cc
+1
-0
No files found.
mysql-test/r/warnings.result
View file @
d7baef2a
...
@@ -173,6 +173,13 @@ alter table t1 engine=isam;
...
@@ -173,6 +173,13 @@ alter table t1 engine=isam;
Warnings:
Warnings:
Warning 1266 Using storage engine MyISAM for table 't1'
Warning 1266 Using storage engine MyISAM for table 't1'
drop table t1;
drop table t1;
create table t1 (id int) engine=merge;
Warnings:
Warning 1266 Using storage engine MyISAM for table 't1'
alter table t1 engine=merge;
Warnings:
Warning 1266 Using storage engine MyISAM for table 't1'
drop table t1;
create table t1 (id int) type=heap;
create table t1 (id int) type=heap;
Warnings:
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
...
...
mysql-test/t/warnings-master.opt
View file @
d7baef2a
--skip-isam
--skip-isam
--skip-merge
mysql-test/t/warnings.test
View file @
d7baef2a
...
@@ -117,6 +117,10 @@ create table t1 (id int) engine=isam;
...
@@ -117,6 +117,10 @@ create table t1 (id int) engine=isam;
alter
table
t1
engine
=
isam
;
alter
table
t1
engine
=
isam
;
drop
table
t1
;
drop
table
t1
;
create
table
t1
(
id
int
)
engine
=
merge
;
alter
table
t1
engine
=
merge
;
drop
table
t1
;
#
#
# Test for deprecated TYPE= syntax
# Test for deprecated TYPE= syntax
#
#
...
...
sql/mysql_priv.h
View file @
d7baef2a
...
@@ -1324,6 +1324,7 @@ extern SHOW_COMP_OPTION have_ndbcluster;
...
@@ -1324,6 +1324,7 @@ extern SHOW_COMP_OPTION have_ndbcluster;
#endif
#endif
extern
SHOW_COMP_OPTION
have_isam
;
extern
SHOW_COMP_OPTION
have_isam
;
extern
SHOW_COMP_OPTION
have_merge_db
;
extern
SHOW_COMP_OPTION
have_raid
,
have_openssl
,
have_symlink
,
have_dlopen
;
extern
SHOW_COMP_OPTION
have_raid
,
have_openssl
,
have_symlink
,
have_dlopen
;
extern
SHOW_COMP_OPTION
have_query_cache
;
extern
SHOW_COMP_OPTION
have_query_cache
;
extern
SHOW_COMP_OPTION
have_geometry
,
have_rtree_keys
;
extern
SHOW_COMP_OPTION
have_geometry
,
have_rtree_keys
;
...
...
sql/mysqld.cc
View file @
d7baef2a
...
@@ -300,7 +300,7 @@ static bool lower_case_table_names_used= 0;
...
@@ -300,7 +300,7 @@ static bool lower_case_table_names_used= 0;
static
bool
volatile
select_thread_in_use
,
signal_thread_in_use
;
static
bool
volatile
select_thread_in_use
,
signal_thread_in_use
;
static
bool
volatile
ready_to_exit
;
static
bool
volatile
ready_to_exit
;
static
my_bool
opt_debugging
=
0
,
opt_external_locking
=
0
,
opt_console
=
0
;
static
my_bool
opt_debugging
=
0
,
opt_external_locking
=
0
,
opt_console
=
0
;
static
my_bool
opt_bdb
,
opt_isam
,
opt_ndbcluster
;
static
my_bool
opt_bdb
,
opt_isam
,
opt_ndbcluster
,
opt_merge
;
static
my_bool
opt_short_log_format
=
0
;
static
my_bool
opt_short_log_format
=
0
;
static
uint
kill_cached_threads
,
wake_thread
;
static
uint
kill_cached_threads
,
wake_thread
;
static
ulong
killed_threads
,
thread_created
;
static
ulong
killed_threads
,
thread_created
;
...
@@ -4648,7 +4648,8 @@ enum options_mysqld
...
@@ -4648,7 +4648,8 @@ enum options_mysqld
OPT_OLD_STYLE_USER_LIMITS
,
OPT_OLD_STYLE_USER_LIMITS
,
OPT_LOG_SLOW_ADMIN_STATEMENTS
,
OPT_LOG_SLOW_ADMIN_STATEMENTS
,
OPT_TABLE_LOCK_WAIT_TIMEOUT
,
OPT_TABLE_LOCK_WAIT_TIMEOUT
,
OPT_PORT_OPEN_TIMEOUT
OPT_PORT_OPEN_TIMEOUT
,
OPT_MERGE
};
};
...
@@ -5101,6 +5102,9 @@ master-ssl",
...
@@ -5101,6 +5102,9 @@ master-ssl",
#endif
/* HAVE_REPLICATION */
#endif
/* HAVE_REPLICATION */
{
"memlock"
,
OPT_MEMLOCK
,
"Lock mysqld in memory."
,
(
gptr
*
)
&
locked_in_memory
,
{
"memlock"
,
OPT_MEMLOCK
,
"Lock mysqld in memory."
,
(
gptr
*
)
&
locked_in_memory
,
(
gptr
*
)
&
locked_in_memory
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
(
gptr
*
)
&
locked_in_memory
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"merge"
,
OPT_MERGE
,
"Enable Merge storage engine. Disable with \
--skip-merge."
,
(
gptr
*
)
&
opt_merge
,
(
gptr
*
)
&
opt_merge
,
0
,
GET_BOOL
,
NO_ARG
,
1
,
0
,
0
,
0
,
0
},
{
"myisam-recover"
,
OPT_MYISAM_RECOVER
,
{
"myisam-recover"
,
OPT_MYISAM_RECOVER
,
"Syntax: myisam-recover[=option[,option...]], where option can be DEFAULT, BACKUP, FORCE or QUICK."
,
"Syntax: myisam-recover[=option[,option...]], where option can be DEFAULT, BACKUP, FORCE or QUICK."
,
(
gptr
*
)
&
myisam_recover_options_str
,
(
gptr
*
)
&
myisam_recover_options_str
,
0
,
(
gptr
*
)
&
myisam_recover_options_str
,
(
gptr
*
)
&
myisam_recover_options_str
,
0
,
...
...
sql/set_var.cc
View file @
d7baef2a
...
@@ -870,6 +870,7 @@ struct show_var_st init_vars[]= {
...
@@ -870,6 +870,7 @@ struct show_var_st init_vars[]= {
{
"have_innodb"
,
(
char
*
)
&
have_innodb
,
SHOW_HAVE
},
{
"have_innodb"
,
(
char
*
)
&
have_innodb
,
SHOW_HAVE
},
{
"have_isam"
,
(
char
*
)
&
have_isam
,
SHOW_HAVE
},
{
"have_isam"
,
(
char
*
)
&
have_isam
,
SHOW_HAVE
},
{
"have_ndbcluster"
,
(
char
*
)
&
have_ndbcluster
,
SHOW_HAVE
},
{
"have_ndbcluster"
,
(
char
*
)
&
have_ndbcluster
,
SHOW_HAVE
},
{
"have_merge_engine"
,
(
char
*
)
&
have_merge_db
,
SHOW_HAVE
},
{
"have_openssl"
,
(
char
*
)
&
have_openssl
,
SHOW_HAVE
},
{
"have_openssl"
,
(
char
*
)
&
have_openssl
,
SHOW_HAVE
},
{
"have_query_cache"
,
(
char
*
)
&
have_query_cache
,
SHOW_HAVE
},
{
"have_query_cache"
,
(
char
*
)
&
have_query_cache
,
SHOW_HAVE
},
{
"have_raid"
,
(
char
*
)
&
have_raid
,
SHOW_HAVE
},
{
"have_raid"
,
(
char
*
)
&
have_raid
,
SHOW_HAVE
},
...
...
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