1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sql_yacc.yy => CREATE TABLE (... COLLECTION ... ) syntax

Browse Source 
sql/item_func.h:
  cosmetic changes
sql/sql_parse.cc:
  cosmetic changes
sql/sql_yacc.yy:
  CREATE TABLE (... COLLECTION ... ) syntax
This commit is contained in:
unknown 2000-08-21 15:35:27 +04:00
parent ada1183947
commit 44170cb982
3 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/item_func.h
View File

@ -829,7 +829,7 @@ public:
}; };
/* SerG: for fulltext search */ /* for fulltext search */
#include <ft_global.h> #include <ft_global.h>
class Item_func_match :public Item_real_func class Item_func_match :public Item_real_func
@ -855,4 +855,3 @@ public:
double val(); double val();
longlong val_int() { return val()!=0.0; } longlong val_int() { return val()!=0.0; }
}; };

6
sql/sql_parse.cc
View File

@ -1132,7 +1132,7 @@ mysql_execute_command(void)
break; break;
} }
#endif #endif
case SQLCOM_SHOW_CREATE: case SQLCOM_SHOW_CREATE: /* SerG:show */
{ {
if(! tables->db) if(! tables->db)
tables->db = thd->db; tables->db = thd->db;
@ -1389,7 +1389,7 @@ mysql_execute_command(void)
break; break;
} }
#endif #endif
case SQLCOM_SHOW_FIELDS: case SQLCOM_SHOW_FIELDS: /* SerG:show */
#ifdef DONT_ALLOW_SHOW_COMMANDS #ifdef DONT_ALLOW_SHOW_COMMANDS
send_error(&thd->net,ER_NOT_ALLOWED_COMMAND); /* purecov: inspected */ send_error(&thd->net,ER_NOT_ALLOWED_COMMAND); /* purecov: inspected */
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
@ -1415,7 +1415,7 @@ mysql_execute_command(void)
break; break;
} }
#endif #endif
case SQLCOM_SHOW_KEYS: case SQLCOM_SHOW_KEYS: /* SerG:show */
#ifdef DONT_ALLOW_SHOW_COMMANDS #ifdef DONT_ALLOW_SHOW_COMMANDS
send_error(&thd->net,ER_NOT_ALLOWED_COMMAND); /* purecov: inspected */ send_error(&thd->net,ER_NOT_ALLOWED_COMMAND); /* purecov: inspected */
DBUG_VOID_RETURN; DBUG_VOID_RETURN;

1
sql/sql_yacc.yy
View File

@ -961,6 +961,7 @@ delete_option:
key_type: key_type:
opt_constraint PRIMARY_SYM KEY_SYM { $$= Key::PRIMARY; } opt_constraint PRIMARY_SYM KEY_SYM { $$= Key::PRIMARY; }
| key_or_index { $$= Key::MULTIPLE; } | key_or_index { $$= Key::MULTIPLE; }
| COLLECTION { $$= Key::FULLTEXT; }
| opt_constraint UNIQUE_SYM { $$= Key::UNIQUE; } | opt_constraint UNIQUE_SYM { $$= Key::UNIQUE; }
| opt_constraint UNIQUE_SYM key_or_index { $$= Key::UNIQUE; } | opt_constraint UNIQUE_SYM key_or_index { $$= Key::UNIQUE; }