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
df5336a3
Commit
df5336a3
authored
Apr 21, 2004
by
marko@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Introduce keys in child tables corresponding to FOREIGN KEYs
Remove redundant keys in CREATE TABLE and ALTER TABLE
parent
ecfe6ebb
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
68 additions
and
48 deletions
+68
-48
mysql-test/r/constraints.result
mysql-test/r/constraints.result
+1
-3
mysql-test/r/create.result
mysql-test/r/create.result
+1
-31
mysql-test/r/innodb.result
mysql-test/r/innodb.result
+0
-1
mysql-test/r/range.result
mysql-test/r/range.result
+2
-6
mysql-test/t/range.test
mysql-test/t/range.test
+1
-2
sql/sql_class.cc
sql/sql_class.cc
+28
-0
sql/sql_class.h
sql/sql_class.h
+3
-0
sql/sql_table.cc
sql/sql_table.cc
+29
-4
sql/sql_yacc.yy
sql/sql_yacc.yy
+3
-1
No files found.
mysql-test/r/constraints.result
View file @
df5336a3
...
...
@@ -22,8 +22,6 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) default NULL,
UNIQUE KEY `constraint_1` (`a`),
UNIQUE KEY `key_1` (`a`),
UNIQUE KEY `key_2` (`a`)
UNIQUE KEY `constraint_1` (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
mysql-test/r/create.result
View file @
df5336a3
...
...
@@ -155,37 +155,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL default '0',
`b` int(11) default NULL,
PRIMARY KEY (`a`),
KEY `b` (`b`),
KEY `b_2` (`b`),
KEY `b_3` (`b`),
KEY `b_4` (`b`),
KEY `b_5` (`b`),
KEY `b_6` (`b`),
KEY `b_7` (`b`),
KEY `b_8` (`b`),
KEY `b_9` (`b`),
KEY `b_10` (`b`),
KEY `b_11` (`b`),
KEY `b_12` (`b`),
KEY `b_13` (`b`),
KEY `b_14` (`b`),
KEY `b_15` (`b`),
KEY `b_16` (`b`),
KEY `b_17` (`b`),
KEY `b_18` (`b`),
KEY `b_19` (`b`),
KEY `b_20` (`b`),
KEY `b_21` (`b`),
KEY `b_22` (`b`),
KEY `b_23` (`b`),
KEY `b_24` (`b`),
KEY `b_25` (`b`),
KEY `b_26` (`b`),
KEY `b_27` (`b`),
KEY `b_28` (`b`),
KEY `b_29` (`b`),
KEY `b_30` (`b`),
KEY `b_31` (`b`)
KEY `b` (`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
create table t1 select if(1,'1','0'), month("2002-08-02");
...
...
mysql-test/r/innodb.result
View file @
df5336a3
...
...
@@ -371,7 +371,6 @@ t1 0 PRIMARY 2 b A # NULL NULL BTREE
t1 0 c 1 c A # NULL NULL BTREE
t1 0 b 1 b A # NULL NULL BTREE
t1 1 a 1 a A # NULL NULL BTREE
t1 1 a_2 1 a A # NULL NULL BTREE
drop table t1;
create table t1 (col1 int not null, col2 char(4) not null, primary key(col1));
alter table t1 engine=innodb;
...
...
mysql-test/r/range.result
View file @
df5336a3
...
...
@@ -249,18 +249,14 @@ explain select count(*) from t1 where x in (1,2);
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 range x x 5 NULL 2 Using where; Using index
drop table t1;
CREATE TABLE t1 (key1 int(11) NOT NULL default '0', KEY i1 (key1)
, KEY i2 (key1)
);
CREATE TABLE t1 (key1 int(11) NOT NULL default '0', KEY i1 (key1));
INSERT INTO t1 VALUES (0),(0),(1),(1);
CREATE TABLE t2 (keya int(11) NOT NULL default '0', KEY j1 (keya));
INSERT INTO t2 VALUES (0),(0),(1),(1),(2),(2);
explain select * from t1, t2 where (t1.key1 <t2.keya + 1) and t2.keya=3;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ref j1 j1 4 const 1 Using where; Using index
1 SIMPLE t1 ALL i1,i2 NULL NULL NULL 4 Range checked for each record (index map: 0x3)
explain select * from t1 force index(i2), t2 where (t1.key1 <t2.keya + 1) and t2.keya=3;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ref j1 j1 4 const 1 Using where; Using index
1 SIMPLE t1 ALL i2 NULL NULL NULL 4 Range checked for each record (index map: 0x2)
1 SIMPLE t1 ALL i1 NULL NULL NULL 4 Range checked for each record (index map: 0x1)
DROP TABLE t1,t2;
CREATE TABLE t1 (
a int(11) default NULL,
...
...
mysql-test/t/range.test
View file @
df5336a3
...
...
@@ -197,12 +197,11 @@ drop table t1;
#
# bug #1172
#
CREATE
TABLE
t1
(
key1
int
(
11
)
NOT
NULL
default
'0'
,
KEY
i1
(
key1
)
,
KEY
i2
(
key1
)
);
CREATE
TABLE
t1
(
key1
int
(
11
)
NOT
NULL
default
'0'
,
KEY
i1
(
key1
));
INSERT
INTO
t1
VALUES
(
0
),(
0
),(
1
),(
1
);
CREATE
TABLE
t2
(
keya
int
(
11
)
NOT
NULL
default
'0'
,
KEY
j1
(
keya
));
INSERT
INTO
t2
VALUES
(
0
),(
0
),(
1
),(
1
),(
2
),(
2
);
explain
select
*
from
t1
,
t2
where
(
t1
.
key1
<
t2
.
keya
+
1
)
and
t2
.
keya
=
3
;
explain
select
*
from
t1
force
index
(
i2
),
t2
where
(
t1
.
key1
<
t2
.
keya
+
1
)
and
t2
.
keya
=
3
;
DROP
TABLE
t1
,
t2
;
#
...
...
sql/sql_class.cc
View file @
df5336a3
...
...
@@ -79,6 +79,34 @@ extern "C" void free_user_var(user_var_entry *entry)
}
bool
key_part_spec
::
operator
==
(
const
key_part_spec
&
other
)
const
{
return
length
==
other
.
length
&&
!
strcmp
(
field_name
,
other
.
field_name
);
}
/* Equality comparison of keys (ignoring name) */
bool
Key
::
operator
==
(
Key
&
other
)
{
if
(
type
==
other
.
type
&&
algorithm
==
other
.
algorithm
&&
columns
.
elements
==
other
.
columns
.
elements
)
{
List_iterator
<
key_part_spec
>
col_it1
(
columns
);
List_iterator
<
key_part_spec
>
col_it2
(
other
.
columns
);
const
key_part_spec
*
col1
,
*
col2
;
while
((
col1
=
col_it1
++
))
{
col2
=
col_it2
++
;
DBUG_ASSERT
(
col2
!=
NULL
);
if
(
!
(
*
col1
==
*
col2
))
return
false
;
}
return
true
;
}
return
false
;
}
/****************************************************************************
** Thread specific functions
****************************************************************************/
...
...
sql/sql_class.h
View file @
df5336a3
...
...
@@ -210,6 +210,7 @@ public:
const
char
*
field_name
;
uint
length
;
key_part_spec
(
const
char
*
name
,
uint
len
=
0
)
:
field_name
(
name
),
length
(
len
)
{}
bool
operator
==
(
const
key_part_spec
&
other
)
const
;
};
...
...
@@ -245,6 +246,8 @@ public:
:
type
(
type_par
),
algorithm
(
alg_par
),
columns
(
cols
),
name
(
name_arg
)
{}
~
Key
()
{}
/* Equality comparison of keys (ignoring name) */
bool
operator
==
(
Key
&
other
);
};
class
Table_ident
;
...
...
sql/sql_table.cc
View file @
df5336a3
...
...
@@ -639,12 +639,13 @@ int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
/* Create keys */
List_iterator
<
Key
>
key_iterator
(
keys
);
List_iterator
<
Key
>
key_iterator
(
keys
)
,
key_iterator2
(
keys
)
;
uint
key_parts
=
0
,
fk_key_count
=
0
;
List
<
Key
>
keys_in_order
;
// Add new keys here
bool
primary_key
=
0
,
unique_key
=
0
;
Key
*
key
;
Key
*
key
,
*
key2
;
uint
tmp
,
key_number
;
/* special marker for keys to be ignored */
static
char
ignore_key
[
1
];
/* Calculate number of key segements */
*
key_count
=
0
;
...
...
@@ -677,7 +678,21 @@ int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
my_error
(
ER_TOO_LONG_IDENT
,
MYF
(
0
),
key
->
name
);
DBUG_RETURN
(
-
1
);
}
key_iterator2
.
rewind
();
while
((
key2
=
key_iterator2
++
)
!=
key
)
{
if
(
*
key
==
*
key2
)
{
/* TO DO: issue warning message */
/* mark that the key should be ignored */
key
->
name
=
ignore_key
;
break
;
}
}
if
(
key
->
name
!=
ignore_key
)
key_parts
+=
key
->
columns
.
elements
;
else
(
*
key_count
)
--
;
if
(
key
->
name
&&
!
tmp_table
&&
!
my_strcasecmp
(
system_charset_info
,
key
->
name
,
primary_key_name
))
{
...
...
@@ -704,6 +719,16 @@ int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
uint
key_length
=
0
;
key_part_spec
*
column
;
if
(
key
->
name
==
ignore_key
)
{
/* ignore redundant keys */
do
key
=
key_iterator
++
;
while
(
key
&&
key
->
name
==
ignore_key
);
if
(
!
key
)
break
;
}
switch
(
key
->
type
){
case
Key
:
:
MULTIPLE
:
key_info
->
flags
=
0
;
...
...
sql/sql_yacc.yy
View file @
df5336a3
...
...
@@ -1200,12 +1200,14 @@ key_def:
| opt_constraint FOREIGN KEY_SYM opt_ident '(' key_list ')' references
{
LEX *lex=Lex;
lex->key_list.push_back(new foreign_key($4, lex->col_list,
lex->key_list.push_back(new foreign_key($4
? $4:$1
, lex->col_list,
$8,
lex->ref_list,
lex->fk_delete_opt,
lex->fk_update_opt,
lex->fk_match_option));
lex->key_list.push_back(new Key(Key::MULTIPLE, $4 ? $4:$1,
HA_KEY_ALG_UNDEF, lex->col_list));
lex->col_list.empty(); /* Alloced by sql_alloc */
}
| opt_constraint check_constraint
...
...
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