mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 16:44:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

merged

Browse source 
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
Docs/manual.texi:
  Auto merged
innobase/configure.in:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/pars/pars0grm.c:
  Auto merged
innobase/pars/pars0grm.y:
  Auto merged
innobase/pars/pars0lex.l:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
This commit is contained in:
unknown 2002-08-31 23:38:10 +00:00
commit f7d6288db2
12 changed files with 96 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/ha_innodb.cc
View file

@ -975,7 +975,9 @@ Cannot find table %s from the internal data dictionary\n\
of InnoDB though the .frm file for the table exists. Maybe you\n\
have deleted and recreated InnoDB data files but have forgotten\n\
to delete the corresponding .frm files of InnoDB tables, or you\n\
have moved .frm files to another database?",
have moved .frm files to another database?\n\
Look from section 15.1 of http://www.innodb.com/ibman.html\n\
how you can resolve the problem.\n",
norm_name);
free_share(share);

13
sql/sql_table.cc
View file

@ -1871,11 +1871,6 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
VOID(pthread_cond_broadcast(&COND_refresh));
goto err;
}
#ifdef HAVE_BERKELEY_DB
extern bool berkeley_flush_logs(void);
if (old_db_type == DB_TYPE_BERKELEY_DB && berkeley_flush_logs())
goto err;
#endif
thd->proc_info="end";
mysql_update_log.write(thd, thd->query,thd->query_length);
if (mysql_bin_log.is_open())
@ -1885,6 +1880,14 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
}
VOID(pthread_cond_broadcast(&COND_refresh));
VOID(pthread_mutex_unlock(&LOCK_open));
#ifdef HAVE_BERKELEY_DB
if (old_db_type == DB_TYPE_BERKELEY_DB)
{
extern bool berkeley_flush_logs(void);
(void)berkeley_flush_logs();
table=open_ltable(thd,table_list,TL_READ);
}
#endif
table_list->table=0; // For query cache
query_cache_invalidate3(thd, table_list, 0);