diff options
| author | unknown <hf@bison.(none)> | 2002-06-17 17:14:20 +0500 |
|---|---|---|
| committer | unknown <hf@bison.(none)> | 2002-06-17 17:14:20 +0500 |
| commit | 0bf296a02bfb82e8f71c63809f82b2b472fb276a (patch) | |
| tree | 2b5260bdbaeb45cf5cd339349eb23bd4a98199ca /sql/sql_base.cc | |
| parent | e19b23821a5f367969eb323ca8bd315f080405d0 (diff) | |
| parent | ea10430d9c77b973edc8ce18caa918e4db6676bf (diff) | |
| download | mariadb-git-0bf296a02bfb82e8f71c63809f82b2b472fb276a.tar.gz | |
Resolving of conflicts from pull
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
include/violite.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
libmysqld/lib_vio.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/net_pkg.cc:
Merging of pull conflicts
sql/sql_base.cc:
Merging of pull conflicts
sql/sql_class.h:
Merging of pull conflicts
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 92606716c63..7f843fee7b3 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -179,6 +179,7 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild) DBUG_RETURN(open_list); } +#ifndef EMBEDDED_LIBRARY /* Send name and type of result to client. Sum fields has table name empty and field_name. @@ -383,6 +384,7 @@ err: return 1; /* purecov: inspected */ } +#endif /* EMBEDDED_LIBRARY */ /***************************************************************************** * Functions to free open table cache |