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
d36c774f
Commit
d36c774f
authored
Aug 21, 2000
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge
sql/sql_yacc.yy: Auto merged sql/sql_parse.cc: merged
parents
90bc6094
44170cb9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
77 additions
and
77 deletions
+77
-77
sql/item_func.h
sql/item_func.h
+1
-2
sql/sql_parse.cc
sql/sql_parse.cc
+40
-40
sql/sql_yacc.yy
sql/sql_yacc.yy
+36
-35
No files found.
sql/item_func.h
View file @
d36c774f
...
...
@@ -829,7 +829,7 @@ class Item_func_inet_aton : public Item_int_func
};
/*
SerG:
for fulltext search */
/* for fulltext search */
#include <ft_global.h>
class
Item_func_match
:
public
Item_real_func
...
...
@@ -855,4 +855,3 @@ class Item_func_match :public Item_real_func
double
val
();
longlong
val_int
()
{
return
val
()
!=
0.0
;
}
};
sql/sql_parse.cc
View file @
d36c774f
...
...
@@ -1137,7 +1137,7 @@ mysql_execute_command(void)
if
(
mysql_rename_tables
(
thd
,
tables
))
res
=
-
1
;
break
;
case
SQLCOM_SHOW_CREATE
:
case
SQLCOM_SHOW_CREATE
:
/* SerG:show */
#ifdef DONT_ALLOW_SHOW_COMMANDS
send_error
(
&
thd
->
net
,
ER_NOT_ALLOWED_COMMAND
);
/* purecov: inspected */
DBUG_VOID_RETURN
;
...
...
@@ -1385,7 +1385,7 @@ mysql_execute_command(void)
break
;
}
#endif
case
SQLCOM_SHOW_FIELDS
:
case
SQLCOM_SHOW_FIELDS
:
/* SerG:show */
#ifdef DONT_ALLOW_SHOW_COMMANDS
send_error
(
&
thd
->
net
,
ER_NOT_ALLOWED_COMMAND
);
/* purecov: inspected */
DBUG_VOID_RETURN
;
...
...
@@ -1411,7 +1411,7 @@ mysql_execute_command(void)
break
;
}
#endif
case
SQLCOM_SHOW_KEYS
:
case
SQLCOM_SHOW_KEYS
:
/* SerG:show */
#ifdef DONT_ALLOW_SHOW_COMMANDS
send_error
(
&
thd
->
net
,
ER_NOT_ALLOWED_COMMAND
);
/* purecov: inspected */
DBUG_VOID_RETURN
;
...
...
sql/sql_yacc.yy
View file @
d36c774f
...
...
@@ -964,6 +964,7 @@ delete_option:
key_type:
opt_constraint PRIMARY_SYM KEY_SYM { $$= Key::PRIMARY; }
| key_or_index { $$= Key::MULTIPLE; }
| COLLECTION { $$= Key::FULLTEXT; }
| opt_constraint UNIQUE_SYM { $$= Key::UNIQUE; }
| opt_constraint UNIQUE_SYM key_or_index { $$= Key::UNIQUE; }
...
...
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