diff options
| author | unknown <monty@mishka.mysql.fi> | 2003-09-24 10:24:56 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.mysql.fi> | 2003-09-24 10:24:56 +0300 |
| commit | ae2a272b538ae23d34d7e2d893b39329ee74fd08 (patch) | |
| tree | cc7389163da24340a03858b997927a41eeedc545 /sql/table.cc | |
| parent | 0a9b64cc5984678f3ca72be6c0c7f14fdde138f1 (diff) | |
| parent | 8f74c61d3653abc05a4c1ff131d01789770f82ea (diff) | |
| download | mariadb-git-ae2a272b538ae23d34d7e2d893b39329ee74fd08.tar.gz | |
merge
sql/item_strfunc.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
sql/net_serv.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 5e7991436a1..c31b68fc2dc 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -236,7 +236,6 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, #ifdef HAVE_CRYPTED_FRM else if (*(head+26) == 2) { - extern SQL_CRYPT *get_crypt_for_frm(void); my_pthread_setspecific_ptr(THR_MALLOC,old_root); crypted=get_crypt_for_frm(); my_pthread_setspecific_ptr(THR_MALLOC,&outparam->mem_root); |