summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-05-17 17:08:43 +0200
committerunknown <serg@serg.mylan>2005-05-17 17:08:43 +0200
commitafaa3c8923288aaaa41f8f519bbc96f3b72b1d50 (patch)
tree8ea1ff1c24dbce69b716e8728988c74b6b86195f /sql/sql_base.cc
parent3a9ddef2394bc141fa8593e35e4edeae473463d8 (diff)
downloadmariadb-git-afaa3c8923288aaaa41f8f519bbc96f3b72b1d50.tar.gz
sql_yacc.yy:
missing semicolon added sql_base.cc: bad merge fixed sp_head.cc, view.test, view.result: Correct restoring view name in SP table locking BUG#9758 configure.in: restore -fno-implicit-templates -fno-exceptions -fno-rtti in configure configure.in: restore -fno-implicit-templates -fno-exceptions -fno-rtti in configure mysql-test/r/view.result: Correct restoring view name in SP table locking BUG#9758 mysql-test/t/view.test: Correct restoring view name in SP table locking BUG#9758 sql/sp_head.cc: Correct restoring view name in SP table locking BUG#9758 sql/sql_base.cc: bad merge fixed sql/sql_yacc.yy: missing semicolon added
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 4a8303695e9..29d9a7bf9c4 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -3307,7 +3307,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table,
0)
{
my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(),
- table->real_name);
+ table->s->table_name);
map->set_all();
return 1;
}