diff options
author | Mats Kindahl <mats.kindahl@oracle.com> | 2010-08-16 14:50:27 +0200 |
---|---|---|
committer | Mats Kindahl <mats.kindahl@oracle.com> | 2010-08-16 14:50:27 +0200 |
commit | b0836bd309e5b7857771ccae7096f0fdcdfc58e2 (patch) | |
tree | 60ab98cb19a6a71445b167b4cbc5308f59767cc9 /include/Makefile.am | |
parent | 0ea3fb557deb017cd96f1e57694d56a5ace8c80c (diff) | |
parent | 7017775fd11c4249c1b64ff45564c88b94cf526f (diff) | |
download | mariadb-git-b0836bd309e5b7857771ccae7096f0fdcdfc58e2.tar.gz |
Merging with mysql-5.5-stage.
Diffstat (limited to 'include/Makefile.am')
-rw-r--r-- | include/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index e30588de065..5ddef2d381c 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -26,6 +26,8 @@ HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ my_xml.h mysql_embed.h mysql/services.h \ mysql/service_my_snprintf.h mysql/service_thd_alloc.h \ + mysql/service_thread_scheduler.h \ + mysql/service_thd_wait.h \ my_pthread.h my_no_pthread.h \ decimal.h errmsg.h my_global.h my_net.h \ my_getopt.h sslopt-longopts.h my_dir.h \ |