Merge serg.mysql.com:/usr/home/serg/Abk/mysql (5fd23197) · Commits · Software / OSDI20 Artifacts / mariadb

sql/sql_table.cc

+9 −6

Original line number	Diff line number	Diff line
		@@ -448,8 +448,6 @@ int mysql_create_table(THD thd,const char db, const char *table_name,
		column->field_name);
		DBUG_RETURN(-1);
		}
		if (key->type == Key::FULLTEXT)
		column->length=1; /* ft-code ignores it anyway :-) */
		if (f_is_blob(sql_field->pack_flag))
		{
		if (!(file->option_flag() & HA_BLOB_KEY))
		@@ -459,6 +457,10 @@ int mysql_create_table(THD thd,const char db, const char *table_name,
		DBUG_RETURN(-1);
		}
		if (!column->length)
		{
		if (key->type == Key::FULLTEXT)
		column->length=1; /* ft-code ignores it anyway :-) */
		else
		{
		my_printf_error(ER_BLOB_KEY_WITHOUT_LENGTH,
		ER(ER_BLOB_KEY_WITHOUT_LENGTH),MYF(0),
		@@ -466,6 +468,7 @@ int mysql_create_table(THD thd,const char db, const char *table_name,
		DBUG_RETURN(-1);
		}
		}
		}
		if (!(sql_field->flags & NOT_NULL_FLAG))
		{
		if (key->type == Key::PRIMARY)