diff options
| author | unknown <igor@rurik.mysql.com> | 2006-05-31 18:10:02 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-05-31 18:10:02 -0700 |
| commit | eb51f9e0d130386c274c9d3fbb1977a406fc67f0 (patch) | |
| tree | a7218b6f6c71fcca4def61742512d2f7ab662bf8 /sql | |
| parent | 4aef3b224085bbcf01d9d2233a14fc886474f47b (diff) | |
| parent | f27a0eed21da5053b5d7b5baa217ca4b87f6a3e5 (diff) | |
| download | mariadb-git-eb51f9e0d130386c274c9d3fbb1977a406fc67f0.tar.gz | |
Merge rurik.mysql.com:/home/igor/tmp_merge
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
Auto merged
BitKeeper/deleted/.del-sql_state.h~4307ea5f1fe99019:
Auto merged
mysql-test/r/explain.result:
Auto merged
mysql-test/r/key_cache.result:
Auto merged
mysql-test/r/preload.result:
Auto merged
mysql-test/t/explain.test:
Auto merged
mysql-test/t/select.test:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/sql_base.cc:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~11edc4db89248c16:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~184eb1f09242dc72:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~2cdeb8d6f80eba72:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~587903f9311db2d1:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~606dfaeb9e81aa4e:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~6bbd9eac7f0e6b89:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~7397c423c52c6d2c:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~898865062c970766:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~94a93cc742fca24d:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~9dab24f7fb11b1e1:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~b6181e29d8282b06:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~ba132dc9bc936c8a:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~e2609fdf7870795:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~e3183b99fbba0a9c:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~eeb2c47537ed9c23:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~ef28b592c7591b7:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~f19bfd5d4c918964:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
Manual merge
BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
Manual merge
BitKeeper/deleted/.del-mysqld_error.h~9dac75782467aab7:
Manual merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 75b69c91846..e9a3953d981 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4584,7 +4584,7 @@ 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(), + my_error(ER_KEY_DOES_NOT_EXITS, MYF(0), name->c_ptr(), table->s->table_name); map->set_all(); return 1; |