summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <mhansson/autopush@riffraff.(none)>2008-03-24 16:19:50 +0100
committerunknown <mhansson/autopush@riffraff.(none)>2008-03-24 16:19:50 +0100
commit00be93541928b0564f4453578bcbb3e7fc841e15 (patch)
tree4c06ebe395d9c2a01e22eb15cda1ed039a07fd78 /sql
parent21bd55afecf1907e10bfa9f1ff14b3fecbf26157 (diff)
parent3c5894baaa9dcc2d910d504ef073facfcd329f8e (diff)
downloadmariadb-git-00be93541928b0564f4453578bcbb3e7fc841e15.tar.gz
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into riffraff.(none):/data0/autopush/my50-bug34529
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_show.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 36d154181f8..a80319785bd 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -4073,9 +4073,11 @@ bool get_schema_tables_result(JOIN *join,
{
result= 1;
join->error= 1;
+ tab->read_record.file= table_list->table->file;
table_list->schema_table_state= executed_place;
break;
}
+ tab->read_record.file= table_list->table->file;
table_list->schema_table_state= executed_place;
}
}