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
7f613ebd
Commit
7f613ebd
authored
Apr 03, 2015
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-7284 INDEX: CREATE OR REPLACE
parent
118fc5c6
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
178 additions
and
16 deletions
+178
-16
mysql-test/r/create_drop_binlog.result
mysql-test/r/create_drop_binlog.result
+29
-0
mysql-test/r/create_drop_index.result
mysql-test/r/create_drop_index.result
+44
-0
mysql-test/suite/rpl/r/rpl_create_drop_index.result
mysql-test/suite/rpl/r/rpl_create_drop_index.result
+23
-0
mysql-test/suite/rpl/t/rpl_create_drop_index.test
mysql-test/suite/rpl/t/rpl_create_drop_index.test
+19
-0
mysql-test/t/create_drop_binlog.test
mysql-test/t/create_drop_binlog.test
+13
-0
mysql-test/t/create_drop_index.test
mysql-test/t/create_drop_index.test
+16
-0
sql/sql_lex.h
sql/sql_lex.h
+2
-1
sql/sql_table.cc
sql/sql_table.cc
+24
-9
sql/sql_yacc.yy
sql/sql_yacc.yy
+8
-6
No files found.
mysql-test/r/create_drop_binlog.result
View file @
7f613ebd
...
@@ -304,3 +304,32 @@ Log_name Pos Event_type Server_id End_log_pos Info
...
@@ -304,3 +304,32 @@ Log_name Pos Event_type Server_id End_log_pos Info
# # Gtid 1 # GTID #-#-#
# # Gtid 1 # GTID #-#-#
# # Query 1 # use `test`; DROP TABLE `t1` /* generated by server */
# # Query 1 # use `test`; DROP TABLE `t1` /* generated by server */
RESET MASTER;
RESET MASTER;
CREATE TABLE t1(a INT, b INT);
CREATE TABLE IF NOT EXISTS t1(a INT, b INT);
Warnings:
Note 1050 Table 't1' already exists
CREATE OR REPLACE INDEX i1 ON t1(a);
CREATE OR REPLACE INDEX i1 ON t1(a);
CREATE OR REPLACE INDEX i1 ON t1(a,b);
CREATE OR REPLACE INDEX i1 ON t1(a,b);
DROP TABLE t1;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
# # Format_desc 1 # VER
# # Gtid_list 1 # []
# # Binlog_checkpoint 1 # master-bin.000001
# # Gtid 1 # GTID #-#-#
# # Query 1 # use `test`; CREATE TABLE t1(a INT, b INT)
# # Gtid 1 # GTID #-#-#
# # Query 1 # use `test`; CREATE TABLE IF NOT EXISTS t1(a INT, b INT)
# # Gtid 1 # GTID #-#-#
# # Query 1 # use `test`; CREATE OR REPLACE INDEX i1 ON t1(a)
# # Gtid 1 # GTID #-#-#
# # Query 1 # use `test`; CREATE OR REPLACE INDEX i1 ON t1(a)
# # Gtid 1 # GTID #-#-#
# # Query 1 # use `test`; CREATE OR REPLACE INDEX i1 ON t1(a,b)
# # Gtid 1 # GTID #-#-#
# # Query 1 # use `test`; CREATE OR REPLACE INDEX i1 ON t1(a,b)
# # Gtid 1 # GTID #-#-#
# # Query 1 # use `test`; DROP TABLE `t1` /* generated by server */
RESET MASTER;
mysql-test/r/create_drop_index.result
0 → 100644
View file @
7f613ebd
CREATE TABLE t1(a INT, b INT);
CREATE INDEX IF NOT EXISTS i1 ON t1(a);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL,
KEY `i1` (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP INDEX IF EXISTS i1 ON t1;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP INDEX IF EXISTS i1 ON t1;
Warnings:
Note 1091 Can't DROP 'i1'; check that column/key exists
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
CREATE OR REPLACE INDEX i1 ON t1(a);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL,
KEY `i1` (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
CREATE OR REPLACE INDEX i1 ON t1(a,b);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL,
KEY `i1` (`a`,`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
CREATE OR REPLACE INDEX IF NOT EXISTS i1 ON t1(b,a);
ERROR HY000: Incorrect usage of OR REPLACE and IF NOT EXISTS
mysql-test/suite/rpl/r/rpl_create_drop_index.result
0 → 100644
View file @
7f613ebd
include/master-slave.inc
[connection master]
CREATE TABLE t1 (a INT, b INT);
CREATE INDEX i1 ON t1 (a);
CREATE OR REPLACE INDEX i1 ON t1 (a, b);
# On slave:
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL,
KEY `i1` (`a`,`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
# On master:
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL,
KEY `i1` (`a`,`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
include/rpl_end.inc
mysql-test/suite/rpl/t/rpl_create_drop_index.test
0 → 100644
View file @
7f613ebd
--
source
include
/
master
-
slave
.
inc
connection
master
;
CREATE
TABLE
t1
(
a
INT
,
b
INT
);
CREATE
INDEX
i1
ON
t1
(
a
);
CREATE
OR
REPLACE
INDEX
i1
ON
t1
(
a
,
b
);
sync_slave_with_master
;
--
echo
# On slave:
SHOW
CREATE
TABLE
t1
;
connection
master
;
--
echo
# On master:
SHOW
CREATE
TABLE
t1
;
DROP
TABLE
t1
;
sync_slave_with_master
;
--
source
include
/
rpl_end
.
inc
mysql-test/t/create_drop_binlog.test
View file @
7f613ebd
...
@@ -147,3 +147,16 @@ DROP TABLE t1;
...
@@ -147,3 +147,16 @@ DROP TABLE t1;
--
replace_regex
/
xid
=
[
0
-
9
]
+/
xid
=
XX
/
/
GTID
[
0
-
9
]
+-
[
0
-
9
]
+-
[
0
-
9
]
+/
GTID
#-#-#/ /Server.ver.*/VER/
--
replace_regex
/
xid
=
[
0
-
9
]
+/
xid
=
XX
/
/
GTID
[
0
-
9
]
+-
[
0
-
9
]
+-
[
0
-
9
]
+/
GTID
#-#-#/ /Server.ver.*/VER/
SHOW
BINLOG
EVENTS
;
SHOW
BINLOG
EVENTS
;
RESET
MASTER
;
RESET
MASTER
;
CREATE
TABLE
t1
(
a
INT
,
b
INT
);
CREATE
TABLE
IF
NOT
EXISTS
t1
(
a
INT
,
b
INT
);
CREATE
OR
REPLACE
INDEX
i1
ON
t1
(
a
);
CREATE
OR
REPLACE
INDEX
i1
ON
t1
(
a
);
CREATE
OR
REPLACE
INDEX
i1
ON
t1
(
a
,
b
);
CREATE
OR
REPLACE
INDEX
i1
ON
t1
(
a
,
b
);
DROP
TABLE
t1
;
--
replace_column
1
# 2 # 5 #
--
replace_regex
/
xid
=
[
0
-
9
]
+/
xid
=
XX
/
/
GTID
[
0
-
9
]
+-
[
0
-
9
]
+-
[
0
-
9
]
+/
GTID
#-#-#/ /Server.ver.*/VER/
SHOW
BINLOG
EVENTS
;
RESET
MASTER
;
mysql-test/t/create_drop_index.test
0 → 100644
View file @
7f613ebd
CREATE
TABLE
t1
(
a
INT
,
b
INT
);
CREATE
INDEX
IF
NOT
EXISTS
i1
ON
t1
(
a
);
SHOW
CREATE
TABLE
t1
;
DROP
INDEX
IF
EXISTS
i1
ON
t1
;
SHOW
CREATE
TABLE
t1
;
DROP
INDEX
IF
EXISTS
i1
ON
t1
;
SHOW
CREATE
TABLE
t1
;
CREATE
OR
REPLACE
INDEX
i1
ON
t1
(
a
);
SHOW
CREATE
TABLE
t1
;
CREATE
OR
REPLACE
INDEX
i1
ON
t1
(
a
,
b
);
SHOW
CREATE
TABLE
t1
;
DROP
TABLE
t1
;
--
error
ER_WRONG_USAGE
CREATE
OR
REPLACE
INDEX
IF
NOT
EXISTS
i1
ON
t1
(
b
,
a
);
sql/sql_lex.h
View file @
7f613ebd
...
@@ -2866,7 +2866,8 @@ struct LEX: public Query_tables_list
...
@@ -2866,7 +2866,8 @@ struct LEX: public Query_tables_list
bool
add_create_index
(
Key
::
Keytype
type
,
const
LEX_STRING
&
name
,
bool
add_create_index
(
Key
::
Keytype
type
,
const
LEX_STRING
&
name
,
ha_key_alg
algorithm
,
DDL_options_st
ddl
)
ha_key_alg
algorithm
,
DDL_options_st
ddl
)
{
{
if
(
!
(
last_key
=
new
Key
(
type
,
name
,
algorithm
,
false
,
ddl
)))
if
(
check_create_options
(
ddl
)
||
!
(
last_key
=
new
Key
(
type
,
name
,
algorithm
,
false
,
ddl
)))
return
true
;
return
true
;
alter_info
.
key_list
.
push_back
(
last_key
);
alter_info
.
key_list
.
push_back
(
last_key
);
return
false
;
return
false
;
...
...
sql/sql_table.cc
View file @
7f613ebd
...
@@ -5830,7 +5830,7 @@ handle_if_exists_options(THD *thd, TABLE *table, Alter_info *alter_info)
...
@@ -5830,7 +5830,7 @@ handle_if_exists_options(THD *thd, TABLE *table, Alter_info *alter_info)
const
char
*
keyname
;
const
char
*
keyname
;
while
((
key
=
key_it
++
))
while
((
key
=
key_it
++
))
{
{
if
(
!
key
->
if_not_exists
())
if
(
!
key
->
if_not_exists
()
&&
!
key
->
or_replace
()
)
continue
;
continue
;
/* If the name of the key is not specified, */
/* If the name of the key is not specified, */
/* let us check the name of the first key part. */
/* let us check the name of the first key part. */
...
@@ -5891,17 +5891,32 @@ handle_if_exists_options(THD *thd, TABLE *table, Alter_info *alter_info)
...
@@ -5891,17 +5891,32 @@ handle_if_exists_options(THD *thd, TABLE *table, Alter_info *alter_info)
continue
;
continue
;
remove_key:
remove_key:
push_warning_printf
(
thd
,
Sql_condition
::
WARN_LEVEL_NOTE
,
if
(
key
->
if_not_exists
())
ER_DUP_KEYNAME
,
ER
(
ER_DUP_KEYNAME
),
keyname
);
key_it
.
remove
();
if
(
key
->
type
==
Key
::
FOREIGN_KEY
)
{
{
/* ADD FOREIGN KEY appends two items. */
push_warning_printf
(
thd
,
Sql_condition
::
WARN_LEVEL_NOTE
,
ER_DUP_KEYNAME
,
ER
(
ER_DUP_KEYNAME
),
keyname
);
key_it
.
remove
();
key_it
.
remove
();
if
(
key
->
type
==
Key
::
FOREIGN_KEY
)
{
/* ADD FOREIGN KEY appends two items. */
key_it
.
remove
();
}
if
(
alter_info
->
key_list
.
is_empty
())
alter_info
->
flags
&=
~
(
Alter_info
::
ALTER_ADD_INDEX
|
Alter_info
::
ADD_FOREIGN_KEY
);
}
else
if
(
key
->
or_replace
())
{
Alter_drop
::
drop_type
type
=
(
key
->
type
==
Key
::
FOREIGN_KEY
)
?
Alter_drop
::
FOREIGN_KEY
:
Alter_drop
::
KEY
;
Alter_drop
*
ad
=
new
Alter_drop
(
type
,
key
->
name
.
str
,
FALSE
);
if
(
ad
!=
NULL
)
{
// Adding the index into the drop list for replacing
alter_info
->
flags
|=
Alter_info
::
ALTER_DROP_INDEX
;
alter_info
->
drop_list
.
push_back
(
ad
);
}
}
}
if
(
alter_info
->
key_list
.
is_empty
())
alter_info
->
flags
&=
~
(
Alter_info
::
ALTER_ADD_INDEX
|
Alter_info
::
ADD_FOREIGN_KEY
);
}
}
}
}
...
...
sql/sql_yacc.yy
View file @
7f613ebd
...
@@ -2487,31 +2487,33 @@ create:
...
@@ -2487,31 +2487,33 @@ create:
}
}
create_table_set_open_action_and_adjust_tables(lex);
create_table_set_open_action_and_adjust_tables(lex);
}
}
|
CREATE
opt_unique INDEX_SYM opt_if_not_exists ident
|
create_or_replace
opt_unique INDEX_SYM opt_if_not_exists ident
opt_key_algorithm_clause
opt_key_algorithm_clause
ON table_ident
ON table_ident
{
{
if (add_create_index_prepare(Lex, $8))
if (add_create_index_prepare(Lex, $8))
MYSQL_YYABORT;
MYSQL_YYABORT;
if (Lex->add_create_index($2, $5, $6, $4))
if (Lex->add_create_index($2, $5, $6, $
1 | $
4))
MYSQL_YYABORT;
MYSQL_YYABORT;
}
}
'(' key_list ')' normal_key_options
'(' key_list ')' normal_key_options
opt_index_lock_algorithm { }
opt_index_lock_algorithm { }
| CREATE fulltext INDEX_SYM opt_if_not_exists ident ON table_ident
| create_or_replace fulltext INDEX_SYM opt_if_not_exists ident
ON table_ident
{
{
if (add_create_index_prepare(Lex, $7))
if (add_create_index_prepare(Lex, $7))
MYSQL_YYABORT;
MYSQL_YYABORT;
if (Lex->add_create_index($2, $5, HA_KEY_ALG_UNDEF, $4))
if (Lex->add_create_index($2, $5, HA_KEY_ALG_UNDEF, $
1 | $
4))
MYSQL_YYABORT;
MYSQL_YYABORT;
}
}
'(' key_list ')' fulltext_key_options
'(' key_list ')' fulltext_key_options
opt_index_lock_algorithm { }
opt_index_lock_algorithm { }
| CREATE spatial INDEX_SYM opt_if_not_exists ident ON table_ident
| create_or_replace spatial INDEX_SYM opt_if_not_exists ident
ON table_ident
{
{
if (add_create_index_prepare(Lex, $7))
if (add_create_index_prepare(Lex, $7))
MYSQL_YYABORT;
MYSQL_YYABORT;
if (Lex->add_create_index($2, $5, HA_KEY_ALG_UNDEF, $4))
if (Lex->add_create_index($2, $5, HA_KEY_ALG_UNDEF, $
1 | $
4))
MYSQL_YYABORT;
MYSQL_YYABORT;
}
}
'(' key_list ')' spatial_key_options
'(' key_list ')' spatial_key_options
...
...
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