diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-20 18:51:43 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-20 18:51:43 +0200 |
| commit | 58bb0769bdf13a9747e900aa2f0955137738ce9d (patch) | |
| tree | 1b46ea0f72dce27532f0c87c60ba8a1baa453fa0 /Makefile.am | |
| parent | 7e497abcfb3e761ba5a368316192ae930fb58f6b (diff) | |
| parent | de3c4428b8c759e85631d8d70b5845c872de5400 (diff) | |
| download | mariadb-git-58bb0769bdf13a9747e900aa2f0955137738ce9d.tar.gz | |
Merge with MySQL 5.1.55
- Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria"
- Fixed wrong assert in Aria
Now need to merge with latest xtradb before pushing
sql/ha_partition.cc:
Ensure that m_ordered_rec_buffer is not freed before close.
sql/mysqld.cc:
Changed to use opt_stack_trace instead of opt_pstack.
Removed references to pstack
sql/partition_element.h:
Ensure that connect_string is initialized
storage/maria/ma_key_recover.c:
Fixed wrong assert
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index af511dcd306..1371f06c743 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ -# Copyright 2000-2008 MySQL AB, 2009 Sun Microsystems, Inc. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. +# Copyright (c) 2009-2011 Monty Program Ab # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,11 +23,9 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ README COPYING EXCEPTIONS-CLIENT \ CMakeLists.txt \ config/ac-macros/libevent_configure.m4 - SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common scripts \ - @pstack_dir@ \ - @sql_union_dirs@ storage \ + @sql_union_dirs@ unittest \ @sql_server@ @man_dirs@ tests \ netware @libmysqld_dirs@ \ mysql-test support-files sql-bench @tools_dirs@ \ @@ -34,7 +33,6 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ DIST_SUBDIRS = . include Docs zlib \ cmd-line-utils sql-common scripts \ - pstack \ strings mysys dbug extra regex libmysql libmysql_r client unittest storage plugin \ vio sql man tests \ netware libmysqld \ |