diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-03 17:47:37 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-03 17:47:37 +0100 |
| commit | 2160646c1dba788a9b12bed999547ac01df33e7c (patch) | |
| tree | 944314db59d0fd4d8fa1d87e53e1e1cb49610c49 /sql | |
| parent | d1ca1c1faeb1e43df1533a10dfa0ac79433227f9 (diff) | |
| parent | 50556e7e9ac3cf0bad629cc3eb4b57f82cf807e4 (diff) | |
| download | mariadb-git-2160646c1dba788a9b12bed999547ac01df33e7c.tar.gz | |
5.5 merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_base.cc | 1 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 1 | ||||
| -rw-r--r-- | sql/sql_select.cc | 3 | ||||
| -rw-r--r-- | sql/sql_table.cc | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 8424a71faaf..424f572deca 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -8428,7 +8428,6 @@ bool setup_on_expr(THD *thd, TABLE_LIST *table, bool is_update) do { embedded= embedding; - DBUG_PRINT("XXX", ("check: %s", table->alias)); if (embedded->on_expr) { thd->where="on clause"; diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 170f2d61f23..3e200c6a000 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1759,6 +1759,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, } MYSQL_COMMAND_DONE(res); } + DEBUG_SYNC(thd,"dispatch_command_end"); /* Check that some variables are reset properly */ DBUG_ASSERT(thd->abort_on_warning == 0); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index c04fbe10a3b..ef69f8c11c8 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8877,6 +8877,9 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j, } else j->type=JT_EQ_REF; + + j->read_record.unlock_row= (j->type == JT_EQ_REF)? + join_read_key_unlock_row : rr_unlock_row; DBUG_RETURN(0); } diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 7e3d1dbd308..10a6ffbf02d 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3047,10 +3047,6 @@ int prepare_create_field(Create_field *sql_field, (sql_field->decimals << FIELDFLAG_DEC_SHIFT)); 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) || (sql_field->vcol_info)) /* Make virtual columns allow NULL values */ sql_field->pack_flag|= FIELDFLAG_MAYBE_NULL; |