diff options
| author | unknown <kostja@bodhi.(none)> | 2007-12-15 16:59:43 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-12-15 16:59:43 +0300 |
| commit | cb48c979e506b1df3e314745bb5974e1b6cfeb41 (patch) | |
| tree | 478d4e5aed82ca23a53a9264eb04f9131c5a43f9 /storage/myisam/ha_myisam.cc | |
| parent | cfd4951d1f33334b529dbb1ca0b1a1bed28cfbb3 (diff) | |
| parent | 0a578711a2e44dcb6bfe6c1491b3b8e799ae13b8 (diff) | |
| download | mariadb-git-cb48c979e506b1df3e314745bb5974e1b6cfeb41.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'storage/myisam/ha_myisam.cc')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 9d7f2d4b90d..0b69f9d135f 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -1407,10 +1407,8 @@ int ha_myisam::enable_indexes(uint mode) might have been set by the first repair. They can still be seen with SHOW WARNINGS then. */ -#ifndef EMBEDDED_LIBRARY if (! error) thd->clear_error(); -#endif /* EMBEDDED_LIBRARY */ } info(HA_STATUS_CONST); thd->proc_info=save_proc_info; |