diff options
| author | unknown <monty@mysql.com> | 2005-05-16 20:21:38 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-05-16 20:21:38 +0300 |
| commit | 9c71571f8391252752be68c36d29c6629dd2668b (patch) | |
| tree | 9bd9972fc600140efd8de75a12844fa0d12c619c /sql/sql_base.cc | |
| parent | 50ff727405c959f826466e78ec9891ac5736d56c (diff) | |
| parent | f80fa96d1c1eb867d65598fd8ad1e3044fb7362a (diff) | |
| download | mariadb-git-9c71571f8391252752be68c36d29c6629dd2668b.tar.gz | |
Merge with 4.1 to get fix for memory leak
client/mysql.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_base.cc:
merge
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 6439bc8a2d7..4a8303695e9 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -3306,8 +3306,8 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table, name->length(), 1)) <= 0) { - my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), - name->c_ptr_safe(), table->s->table_name); + my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(), + table->real_name); map->set_all(); return 1; } |