diff options
| author | unknown <pem@mysql.com> | 2003-12-19 20:13:48 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-12-19 20:13:48 +0100 |
| commit | 24e886a3fb812d1ef86bb90bd288f951603929a0 (patch) | |
| tree | 73743d8dde65062bfe86e66e9d220a27139cfede /sql/ha_myisam.cc | |
| parent | bc3b221b161d8c021b3d914492f4b8647b94e2ab (diff) | |
| parent | 8d987f9e532689545becf521aa6a6aa6b23bf330 (diff) | |
| download | mariadb-git-24e886a3fb812d1ef86bb90bd288f951603929a0.tar.gz | |
Merging lex-pointer change from 4.1 to 5.0.
libmysqld/lib_sql.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/protocol.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_error.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/ha_myisam.cc')
| -rw-r--r-- | sql/ha_myisam.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 6356f209ba2..1a597415ff3 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -390,7 +390,7 @@ int ha_myisam::analyze(THD *thd, HA_CHECK_OPT* check_opt) int ha_myisam::restore(THD* thd, HA_CHECK_OPT *check_opt) { HA_CHECK_OPT tmp_check_opt; - char* backup_dir = thd->lex->backup_dir; + char* backup_dir= thd->lex->backup_dir; char src_path[FN_REFLEN], dst_path[FN_REFLEN]; char* table_name = table->real_name; int error; @@ -430,7 +430,7 @@ int ha_myisam::restore(THD* thd, HA_CHECK_OPT *check_opt) int ha_myisam::backup(THD* thd, HA_CHECK_OPT *check_opt) { - char* backup_dir = thd->lex->backup_dir; + char* backup_dir= thd->lex->backup_dir; char src_path[FN_REFLEN], dst_path[FN_REFLEN]; char* table_name = table->real_name; int error; |