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 /.bzrignore | |
| 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 '.bzrignore')
| -rw-r--r-- | .bzrignore | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index bb1763bc66b..e1f1490d191 100644 --- a/.bzrignore +++ b/.bzrignore @@ -22,6 +22,7 @@ *.lai *.lib *.lo +*.manifest *.map *.o *.obj @@ -96,7 +97,8 @@ BitKeeper/tmp/gone BitKeeper/tmp BitKeeper/log BitKeeper/etc/SCCS -CMakeFiles/ +CMakeFiles/* +CMakeFiles COPYING COPYING.LIB Docs/#manual.texi# @@ -156,6 +158,7 @@ Makefile Makefile.in Makefile.in' PENDING/* +scripts/scripts TAGS ac_available_languages_fragment acinclude.m4 @@ -1224,9 +1227,11 @@ sql-bench/test-transactions sql-bench/test-wisconsin sql/*.cpp sql/*.ds? +sql/*.def sql/*.vcproj sql/.gdbinit sql/client.c +sql/cmake_dummy.cc sql/Doxyfile sql/f.c sql/gen_lex_hash @@ -1888,6 +1893,7 @@ vio/viotest.cpp win/configure.data win/vs71cache.txt win/vs8cache.txt +win/nmake_cache.txt ylwrap zlib/*.ds? zlib/*.vcproj |