diff options
| author | Annamalai Gurusami <annamalai.gurusami@oracle.com> | 2013-02-14 16:35:40 +0530 |
|---|---|---|
| committer | Annamalai Gurusami <annamalai.gurusami@oracle.com> | 2013-02-14 16:35:40 +0530 |
| commit | 84ef847056d367f5e88d1ff6d74cd8dcce0c3e0c (patch) | |
| tree | 7296ddbfe90611af13f9124b543b1f2d1bf696fd /storage | |
| parent | b2e8e0de4fa33d898985c45ac2386afce52ae5a1 (diff) | |
| parent | 5d47242dde0e9d1d019d3a644373e0114a24f882 (diff) | |
| download | mariadb-git-84ef847056d367f5e88d1ff6d74cd8dcce0c3e0c.tar.gz | |
Merge from mysql-5.1 to mysql-5.5
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 5d9bf04e664..65d6726b5bf 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -1076,7 +1076,6 @@ convert_error_code_to_mysql( case DB_OUT_OF_MEMORY: return(HA_ERR_OUT_OF_MEM); case DB_IDENTIFIER_TOO_LONG: - my_error(ER_TOO_LONG_IDENT, MYF(0)); return(HA_ERR_INTERNAL_ERROR); } } |