Commit 7e8007ab authored by casualet's avatar casualet

tweak

parent ac373770
...@@ -3,3 +3,12 @@ normal.sh ...@@ -3,3 +3,12 @@ normal.sh
obj/ obj/
tags tags
shadow/ shadow/
core
curMysql
mysql-proxy.cnf
mysql-proxy1.cnf
reset.sh
reset.sql
startMM.sh
test
tutorial-basic.lua
...@@ -103,6 +103,7 @@ class ANON : public CItemSubtypeIT<Item_field, Item::Type::FIELD_ITEM> { ...@@ -103,6 +103,7 @@ class ANON : public CItemSubtypeIT<Item_field, Item::Type::FIELD_ITEM> {
constr.o); constr.o);
const SECLEVEL onion_level = a.getOnionLevel(om); const SECLEVEL onion_level = a.getOnionLevel(om);
assert(onion_level != SECLEVEL::INVALID); assert(onion_level != SECLEVEL::INVALID);
if (constr.l < onion_level) { if (constr.l < onion_level) {
//need adjustment, throw exception //need adjustment, throw exception
const TableMeta &tm = const TableMeta &tm =
......
...@@ -1575,7 +1575,6 @@ std::pair<AbstractQueryExecutor::ResultType, AbstractAnything *> ...@@ -1575,7 +1575,6 @@ std::pair<AbstractQueryExecutor::ResultType, AbstractAnything *>
OnionAdjustmentExecutor:: OnionAdjustmentExecutor::
nextImpl(const ResType &res, const NextParams &nparams) nextImpl(const ResType &res, const NextParams &nparams)
{ {
std::cout<<__PRETTY_FUNCTION__<<":"<<__LINE__<<":"<<__FILE__<<":"<<__LINE__<<std::endl<<std::endl;
reenter(this->corot) { reenter(this->corot) {
yield { yield {
assert(this->adjust_queries.size() == 1 assert(this->adjust_queries.size() == 1
...@@ -1670,7 +1669,6 @@ nextImpl(const ResType &res, const NextParams &nparams) ...@@ -1670,7 +1669,6 @@ nextImpl(const ResType &res, const NextParams &nparams)
} }
} }
} }
assert(false); assert(false);
} }
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