From: Georgi Kodinov
Date: November 3 2010 2:19pm
Subject: bzr push into mysql-5.5-bugteam branch (Georgi.Kodinov:3119 to 3121)
List-Archive: http://lists.mysql.com/commits/122705
Message-Id: <201011031421.oA39iqWZ016954@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3121 Georgi Kodinov	2010-11-03 [merge]
      merge

 3120 Georgi Kodinov	2010-11-03 [merge]
      merge

    modified:
      .bzrignore
 3119 Alexander Nozdrin	2010-11-03
      Fix version tag (remove -rc suffix).

    modified:
      configure.in
=== modified file '.bzrignore'
--- a/.bzrignore	2010-08-13 09:51:48 +0000
+++ b/.bzrignore	2010-11-03 13:45:03 +0000
@@ -9,15 +9,19 @@
 *.core
 *.d
 *.da
+*.dll
 *.exe
+*.exp
 *.gcda
 *.gcno
 *.gcov
 *.idb
+*.ilk
 *.la
 *.lai
 *.lib
 *.lo
+*.manifest
 *.map
 *.o
 *.obj
@@ -148,6 +152,7 @@ Makefile
 Makefile.in
 Makefile.in'
 PENDING/*
+scripts/scripts
 TAGS
 VC++Files/client/mysql_amd64.dsp
 ac_available_languages_fragment
@@ -1981,6 +1986,7 @@ sql-bench/test-transactions
 sql-bench/test-wisconsin
 sql/*.cpp
 sql/*.ds?
+sql/*.def
 sql/*.vcproj
 sql/.deps/client.Po
 sql/.deps/derror.Po
@@ -2116,6 +2122,7 @@ sql/.libs/udf_example.lai
 sql/.libs/udf_example.so.0
 sql/.libs/udf_example.so.0.0.0
 sql/client.c
+sql/cmake_dummy.cc
 sql/Doxyfile
 sql/f.c
 sql/gen_lex_hash
@@ -3046,6 +3053,7 @@ vio/viotest.cpp
 win/configure.data
 win/vs71cache.txt
 win/vs8cache.txt
+win/nmake_cache.txt
 ylwrap
 zlib/*.ds?
 zlib/*.vcproj

No bundle (reason: useless for push emails).