Commit ee309b10 authored by unknown's avatar unknown

Cleanup.

parent bad5fdec
...@@ -8770,7 +8770,6 @@ bool setup_on_expr(THD *thd, TABLE_LIST *table, bool is_update) ...@@ -8770,7 +8770,6 @@ bool setup_on_expr(THD *thd, TABLE_LIST *table, bool is_update)
do do
{ {
embedded= embedding; embedded= embedding;
DBUG_PRINT("XXX", ("check: %s", table->alias));
if (embedded->on_expr) if (embedded->on_expr)
{ {
thd->where="on clause"; thd->where="on clause";
......
...@@ -2801,10 +2801,6 @@ int prepare_create_field(Create_field *sql_field, ...@@ -2801,10 +2801,6 @@ int prepare_create_field(Create_field *sql_field,
(sql_field->decimals << FIELDFLAG_DEC_SHIFT)); (sql_field->decimals << FIELDFLAG_DEC_SHIFT));
break; break;
} }
if (sql_field->flags & NOT_NULL_FLAG)
DBUG_PRINT("info", ("1"));
if (sql_field->vcol_info)
DBUG_PRINT("info", ("2"));
if (!(sql_field->flags & NOT_NULL_FLAG) || if (!(sql_field->flags & NOT_NULL_FLAG) ||
(sql_field->vcol_info)) /* Make virtual columns allow NULL values */ (sql_field->vcol_info)) /* Make virtual columns allow NULL values */
sql_field->pack_flag|= FIELDFLAG_MAYBE_NULL; sql_field->pack_flag|= FIELDFLAG_MAYBE_NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment