cleanup: remove useless internal fied flag

vuvova · vuvova · commit 13989b36c1b8 · 2015-11-24T22:21:42.000+01:00
diff --git a/client/mysql.cc b/client/mysql.cc
@@ -3452,7 +3452,6 @@ static char *fieldflags2str(uint f) {
   ff2s_check_flag(NUM);
   ff2s_check_flag(PART_KEY);
   ff2s_check_flag(GROUP);
-  ff2s_check_flag(UNIQUE);
   ff2s_check_flag(BINCMP);
   ff2s_check_flag(ON_UPDATE_NOW);
 #undef ff2s_check_flag
diff --git a/include/mysql_com.h b/include/mysql_com.h
@@ -139,7 +139,6 @@ enum enum_server_command
 #define NUM_FLAG	32768		/* Field is num (for clients) */
 #define PART_KEY_FLAG	16384		/* Intern; Part of some key */
 #define GROUP_FLAG	32768		/* Intern: Group field */
-#define UNIQUE_FLAG	65536		/* Intern: Used by sql_yacc */
 #define BINCMP_FLAG	131072		/* Intern: Used by sql_yacc */
 #define GET_FIXED_FIELDS_FLAG (1 << 18) /* Used to get fields in item tree */
 #define FIELD_IN_PART_FUNC_FLAG (1 << 19)/* Field part of partition func */
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
@@ -6148,7 +6148,7 @@ field_spec:
 
             if (f->flags & PRI_KEY_FLAG)
               add_key_to_list(lex, &$1, Key::PRIMARY, Lex->check_exists);
-            else if (f->flags & (UNIQUE_FLAG | UNIQUE_KEY_FLAG))
+            else if (f->flags & UNIQUE_KEY_FLAG)
               add_key_to_list(lex, &$1, Key::UNIQUE, Lex->check_exists);
           }
         ;
@@ -6194,13 +6194,13 @@ vcol_attribute:
           UNIQUE_SYM
           {
             LEX *lex=Lex;
-            lex->last_field->flags|= UNIQUE_FLAG;
+            lex->last_field->flags|= UNIQUE_KEY_FLAG;
             lex->alter_info.flags|= Alter_info::ALTER_ADD_INDEX;
           }
         | UNIQUE_SYM KEY_SYM
           {
             LEX *lex=Lex;
-            lex->last_field->flags|= UNIQUE_FLAG;
+            lex->last_field->flags|= UNIQUE_KEY_FLAG;
             lex->alter_info.flags|= Alter_info::ALTER_ADD_INDEX;
           }
         | COMMENT_SYM TEXT_STRING_sys { Lex->last_field->comment= $2; }
@@ -6407,7 +6407,7 @@ field_type:
           {
             $$.set(MYSQL_TYPE_LONGLONG);
             Lex->last_field->flags|= (AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNSIGNED_FLAG |
-              UNIQUE_FLAG);
+              UNIQUE_KEY_FLAG);
           }
         ;
 
@@ -6544,7 +6544,7 @@ attribute:
         | SERIAL_SYM DEFAULT VALUE_SYM
           { 
             LEX *lex=Lex;
-            lex->last_field->flags|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNIQUE_FLAG;
+            lex->last_field->flags|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNIQUE_KEY_FLAG;
             lex->alter_info.flags|= Alter_info::ALTER_ADD_INDEX;
           }
         | opt_primary KEY_SYM
@@ -6556,7 +6556,7 @@ attribute:
         | UNIQUE_SYM
           {
             LEX *lex=Lex;
-            lex->last_field->flags|= UNIQUE_FLAG;
+            lex->last_field->flags|= UNIQUE_KEY_FLAG;
             lex->alter_info.flags|= Alter_info::ALTER_ADD_INDEX;
           }
         | UNIQUE_SYM KEY_SYM

Original file line number	Diff line number	Diff line change
`@@ -6148,7 +6148,7 @@ field_spec:`
`6148`	`6148`
`6149`	`6149`	`if (f->flags & PRI_KEY_FLAG)`
`6150`	`6150`	`add_key_to_list(lex, &$1, Key::PRIMARY, Lex->check_exists);`
`6151`		`- else if (f->flags & (UNIQUE_FLAG \| UNIQUE_KEY_FLAG))`
	`6151`	`+ else if (f->flags & UNIQUE_KEY_FLAG)`
`6152`	`6152`	`add_key_to_list(lex, &$1, Key::UNIQUE, Lex->check_exists);`
`6153`	`6153`	`}`
`6154`	`6154`	`;`
`@@ -6194,13 +6194,13 @@ vcol_attribute:`
`6194`	`6194`	`UNIQUE_SYM`
`6195`	`6195`	`{`
`6196`	`6196`	`LEX *lex=Lex;`
`6197`		`- lex->last_field->flags\|= UNIQUE_FLAG;`
	`6197`	`+ lex->last_field->flags\|= UNIQUE_KEY_FLAG;`
`6198`	`6198`	`lex->alter_info.flags\|= Alter_info::ALTER_ADD_INDEX;`
`6199`	`6199`	`}`
`6200`	`6200`	`\| UNIQUE_SYM KEY_SYM`
`6201`	`6201`	`{`
`6202`	`6202`	`LEX *lex=Lex;`
`6203`		`- lex->last_field->flags\|= UNIQUE_FLAG;`
	`6203`	`+ lex->last_field->flags\|= UNIQUE_KEY_FLAG;`
`6204`	`6204`	`lex->alter_info.flags\|= Alter_info::ALTER_ADD_INDEX;`
`6205`	`6205`	`}`
`6206`	`6206`	`\| COMMENT_SYM TEXT_STRING_sys { Lex->last_field->comment= $2; }`
`@@ -6407,7 +6407,7 @@ field_type:`
`6407`	`6407`	`{`
`6408`	`6408`	`$$.set(MYSQL_TYPE_LONGLONG);`
`6409`	`6409`	`Lex->last_field->flags\|= (AUTO_INCREMENT_FLAG \| NOT_NULL_FLAG \| UNSIGNED_FLAG \|`
`6410`		`- UNIQUE_FLAG);`
	`6410`	`+ UNIQUE_KEY_FLAG);`
`6411`	`6411`	`}`
`6412`	`6412`	`;`
`6413`	`6413`
`@@ -6544,7 +6544,7 @@ attribute:`
`6544`	`6544`	`\| SERIAL_SYM DEFAULT VALUE_SYM`
`6545`	`6545`	`{`
`6546`	`6546`	`LEX *lex=Lex;`
`6547`		`- lex->last_field->flags\|= AUTO_INCREMENT_FLAG \| NOT_NULL_FLAG \| UNIQUE_FLAG;`
	`6547`	`+ lex->last_field->flags\|= AUTO_INCREMENT_FLAG \| NOT_NULL_FLAG \| UNIQUE_KEY_FLAG;`
`6548`	`6548`	`lex->alter_info.flags\|= Alter_info::ALTER_ADD_INDEX;`
`6549`	`6549`	`}`
`6550`	`6550`	`\| opt_primary KEY_SYM`
`@@ -6556,7 +6556,7 @@ attribute:`
`6556`	`6556`	`\| UNIQUE_SYM`
`6557`	`6557`	`{`
`6558`	`6558`	`LEX *lex=Lex;`
`6559`		`- lex->last_field->flags\|= UNIQUE_FLAG;`
	`6559`	`+ lex->last_field->flags\|= UNIQUE_KEY_FLAG;`
`6560`	`6560`	`lex->alter_info.flags\|= Alter_info::ALTER_ADD_INDEX;`
`6561`	`6561`	`}`
`6562`	`6562`	`\| UNIQUE_SYM KEY_SYM`