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
56505c01
Commit
56505c01
authored
Sep 30, 2006
by
brian@zim.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
This patch updates to remove most global hton needs. Cleans up wrong message in partition.
parent
46ae2113
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
23 deletions
+15
-23
mysql-test/r/partition.result
mysql-test/r/partition.result
+3
-3
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+1
-1
sql/ha_partition.cc
sql/ha_partition.cc
+1
-1
sql/handler.cc
sql/handler.cc
+3
-5
sql/mysql_priv.h
sql/mysql_priv.h
+0
-4
sql/mysqld.cc
sql/mysqld.cc
+1
-2
sql/partition_info.cc
sql/partition_info.cc
+1
-2
sql/share/errmsg.txt
sql/share/errmsg.txt
+3
-3
sql/sql_cache.cc
sql/sql_cache.cc
+2
-2
No files found.
mysql-test/r/partition.result
View file @
56505c01
...
...
@@ -68,7 +68,7 @@ create table t1 (a int)
engine = csv
partition by list (a)
(partition p0 values in (null));
ERROR HY000:
CSV handler
cannot be used in partitioned tables
ERROR HY000:
Engine
cannot be used in partitioned tables
create table t1 (a bigint)
partition by range (a)
(partition p0 values less than (0xFFFFFFFFFFFFFFFF),
...
...
@@ -102,7 +102,7 @@ create table t1 (a int)
engine = csv
partition by list (a)
(partition p0 values in (null));
ERROR HY000:
CSV handler
cannot be used in partitioned tables
ERROR HY000:
Engine
cannot be used in partitioned tables
create table t1 (a int)
partition by key(a)
(partition p0 engine = MEMORY);
...
...
@@ -1054,7 +1054,7 @@ drop table t1;
create table t1 (a int)
partition by key (a)
(partition p0 engine = MERGE);
ERROR HY000:
MyISAM Merge handler
cannot be used in partitioned tables
ERROR HY000:
Engine
cannot be used in partitioned tables
create table t1 (a varchar(1))
partition by key (a)
as select 'a';
...
...
sql/ha_ndbcluster.cc
View file @
56505c01
...
...
@@ -87,7 +87,7 @@ static int ndbcluster_fill_files_table(handlerton *hton,
TABLE_LIST
*
tables
,
COND
*
cond
);
handlerton
*
ndbcluster_hton
;
static
handlerton
*
ndbcluster_hton
;
static
handler
*
ndbcluster_create_handler
(
handlerton
*
hton
,
TABLE_SHARE
*
table
,
...
...
sql/ha_partition.cc
View file @
56505c01
...
...
@@ -75,11 +75,11 @@ static handler *partition_create_handler(handlerton *hton,
static
uint
partition_flags
();
static
uint
alter_table_flags
(
uint
flags
);
handlerton
*
partition_hton
;
static
int
partition_initialize
(
void
*
p
)
{
handlerton
*
partition_hton
;
partition_hton
=
(
handlerton
*
)
p
;
partition_hton
->
state
=
SHOW_OPTION_YES
;
...
...
sql/handler.cc
View file @
56505c01
...
...
@@ -467,13 +467,11 @@ int ha_initialize_handlerton(st_plugin_int *plugin)
}
/*
This is entirely for legacy. We will create a new "disk based" hton and a "memory" hton
which will be configurable longterm.
This is entirely for legacy. We will create a new "disk based" hton and a
"memory" hton which will be configurable longterm. We should be able to
remove partition and myisammrg.
*/
switch
(
hton
->
db_type
)
{
case
DB_TYPE_MRG_ISAM
:
myisammrg_hton
=
hton
;
break
;
case
DB_TYPE_HEAP
:
heap_hton
=
hton
;
break
;
...
...
sql/mysql_priv.h
View file @
56505c01
...
...
@@ -1638,11 +1638,7 @@ extern SHOW_COMP_OPTION have_ndbcluster;
extern
SHOW_COMP_OPTION
have_partition_db
;
extern
SHOW_COMP_OPTION
have_merge_db
;
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
extern
handlerton
*
ndbcluster_hton
;
#endif
extern
handlerton
*
partition_hton
;
extern
handlerton
*
myisammrg_hton
;
extern
handlerton
*
myisam_hton
;
extern
handlerton
*
heap_hton
;
...
...
sql/mysqld.cc
View file @
56505c01
...
...
@@ -358,10 +358,9 @@ my_bool opt_innodb;
/*
Legacy global handlerton. These will be removed (please do not add more).
*/
handlerton
*
ndbclusert_hton
;
handlerton
*
myisammrg_hton
;
handlerton
*
heap_hton
;
handlerton
*
myisam_hton
;
handlerton
*
partition_hton
;
#ifdef WITH_INNOBASE_STORAGE_ENGINE
extern
ulong
innobase_fast_shutdown
;
...
...
sql/partition_info.cc
View file @
56505c01
...
...
@@ -445,8 +445,7 @@ bool partition_info::check_engine_mix(handlerton **engine_array, uint no_parts)
}
while
(
++
i
<
no_parts
);
if
(
engine_array
[
0
]
->
flags
&
HTON_NO_PARTITION
)
{
my_error
(
ER_PARTITION_MERGE_ERROR
,
MYF
(
0
),
engine_array
[
0
]
==
myisammrg_hton
?
"MyISAM Merge"
:
"CSV"
);
my_error
(
ER_PARTITION_MERGE_ERROR
,
MYF
(
0
));
DBUG_RETURN
(
TRUE
);
}
DBUG_RETURN
(
FALSE
);
...
...
sql/share/errmsg.txt
View file @
56505c01
...
...
@@ -5960,9 +5960,9 @@ ER_EVENT_SET_VAR_ERROR
eng "Error during starting/stopping of the scheduler. Error code %u"
ger "Fehler whrend des Startens oder Anhalten des Schedulers. Fehlercode %u"
ER_PARTITION_MERGE_ERROR
eng "
%s handler
cannot be used in partitioned tables"
ger "
%s-Handler
kann in partitionierten Tabellen nicht verwendet werden"
swe "
%s kan
inte anvndas i en partitionerad tabell"
eng "
Engine
cannot be used in partitioned tables"
ger "
Engine
kann in partitionierten Tabellen nicht verwendet werden"
swe "
Engine
inte anvndas i en partitionerad tabell"
ER_CANT_ACTIVATE_LOG
eng "Cannot activate '%-.64s' log"
ger "Kann Logdatei '%-.64s' nicht aktivieren"
...
...
sql/sql_cache.cc
View file @
56505c01
...
...
@@ -2389,7 +2389,7 @@ Query_cache::register_tables_from_list(TABLE_LIST *tables_used,
tables_used
->
engine_data
))
DBUG_RETURN
(
0
);
if
(
tables_used
->
table
->
s
->
db_type
==
myisammrg_hton
)
if
(
tables_used
->
table
->
s
->
db_type
->
db_type
==
DB_TYPE_MRG_MYISAM
)
{
ha_myisammrg
*
handler
=
(
ha_myisammrg
*
)
tables_used
->
table
->
file
;
MYRG_INFO
*
file
=
handler
->
myrg_info
();
...
...
@@ -3013,7 +3013,7 @@ static TABLE_COUNTER_TYPE process_and_count_tables(TABLE_LIST *tables_used,
"other non-cacheable table(s)"
));
DBUG_RETURN
(
0
);
}
if
(
tables_used
->
table
->
s
->
db_type
==
myisammrg_hton
)
if
(
tables_used
->
table
->
s
->
db_type
->
db_type
==
DB_TYPE_MRG_MYISAM
)
{
ha_myisammrg
*
handler
=
(
ha_myisammrg
*
)
tables_used
->
table
->
file
;
MYRG_INFO
*
file
=
handler
->
myrg_info
();
...
...
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