mirror of
https://github.com/MariaDB/server.git
synced 2026-04-28 11:15:33 +02:00
A clean-up after the patch for MDEV-8747 and MDEV-8749:
removing IMPOSSIBLE_RESULT from Item_result, as it's not needed any more. The fact that an Item is not in a comparison context is now always designated by IDENTITY_SUBST in Subst_constraint. Previously IMPOSSIBLE_RESULT and IDENTITY_SUBST co-existed but actually meant the same thing.
This commit is contained in:
parent
c108019a48
commit
e0df116056
11 changed files with 47 additions and 100 deletions
|
|
@ -526,7 +526,6 @@ Field *Item_sum::create_tmp_field(bool group, TABLE *table,
|
|||
break;
|
||||
case ROW_RESULT:
|
||||
case TIME_RESULT:
|
||||
case IMPOSSIBLE_RESULT:
|
||||
// This case should never be choosen
|
||||
DBUG_ASSERT(0);
|
||||
return 0;
|
||||
|
|
@ -1202,7 +1201,6 @@ Item_sum_hybrid::fix_fields(THD *thd, Item **ref)
|
|||
break;
|
||||
case ROW_RESULT:
|
||||
case TIME_RESULT:
|
||||
case IMPOSSIBLE_RESULT:
|
||||
DBUG_ASSERT(0);
|
||||
};
|
||||
setup_hybrid(thd, args[0], NULL);
|
||||
|
|
@ -1380,7 +1378,6 @@ void Item_sum_sum::fix_length_and_dec()
|
|||
break;
|
||||
}
|
||||
case ROW_RESULT:
|
||||
case IMPOSSIBLE_RESULT:
|
||||
DBUG_ASSERT(0);
|
||||
}
|
||||
DBUG_PRINT("info", ("Type: %s (%d, %d)",
|
||||
|
|
@ -1871,7 +1868,6 @@ void Item_sum_variance::fix_length_and_dec()
|
|||
}
|
||||
case ROW_RESULT:
|
||||
case TIME_RESULT:
|
||||
case IMPOSSIBLE_RESULT:
|
||||
DBUG_ASSERT(0);
|
||||
}
|
||||
DBUG_PRINT("info", ("Type: REAL_RESULT (%d, %d)", max_length, (int)decimals));
|
||||
|
|
@ -2314,7 +2310,6 @@ void Item_sum_hybrid::reset_field()
|
|||
}
|
||||
case ROW_RESULT:
|
||||
case TIME_RESULT:
|
||||
case IMPOSSIBLE_RESULT:
|
||||
DBUG_ASSERT(0);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue