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
4e6f5f2d
Commit
4e6f5f2d
authored
Nov 15, 2002
by
Sinisa@sinisa.nasamreza.org
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
few small bug fixes ...
parent
75c70839
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
sql/sql_delete.cc
sql/sql_delete.cc
+1
-1
sql/sql_table.cc
sql/sql_table.cc
+5
-4
No files found.
sql/sql_delete.cc
View file @
4e6f5f2d
...
...
@@ -90,7 +90,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
if
(
!
table
->
quick_keys
)
{
thd
->
lex
.
select_lex
.
options
|=
QUERY_NO_INDEX_USED
;
if
(
safe_update
&&
use
_limit
)
if
(
safe_update
&&
!
using
_limit
)
{
delete
select
;
send_error
(
thd
,
ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
);
...
...
sql/sql_table.cc
View file @
4e6f5f2d
...
...
@@ -523,19 +523,19 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
key_iterator
.
rewind
();
key_number
=
0
;
for
(;
(
key
=
key_iterator
++
)
;
key_
info
++
,
key_
number
++
)
for
(;
(
key
=
key_iterator
++
)
;
key_number
++
)
{
uint
key_length
=
0
;
key_part_spec
*
column
;
switch
(
key
->
type
){
case
Key
:
:
MULTIPLE
:
case
Key
:
:
MULTIPLE
:
key_info
->
flags
=
0
;
break
;
case
Key
:
:
FULLTEXT
:
case
Key
:
:
FULLTEXT
:
key_info
->
flags
=
HA_FULLTEXT
;
break
;
case
Key
:
:
SPATIAL
:
case
Key
:
:
SPATIAL
:
key_info
->
flags
=
HA_SPATIAL
;
break
;
case
Key
:
:
FOREIGN_KEY
:
...
...
@@ -734,6 +734,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
my_error
(
ER_TOO_LONG_KEY
,
MYF
(
0
),
max_key_length
);
DBUG_RETURN
(
-
1
);
}
key_info
++
;
}
if
(
!
unique_key
&&
!
primary_key
&&
(
file
->
table_flags
()
&
HA_REQUIRE_PRIMARY_KEY
))
...
...
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