From: Mattias Jonsson
Date: March 7 2011 10:06am
Subject: bzr commit into mysql-5.1 branch (mattias.jonsson:3611)
List-Archive: http://lists.mysql.com/commits/132528
Message-Id: <201103071007.p27A4vTv032295@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1172746706=="

--===============1172746706==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///C:/ade/mysql-bzr/b59316-5.1/ based on revid:build@stripped

 3611 Mattias Jonsson	2011-03-07
      Fix of .bzrignore on Windows with VS 2011

    modified:
      .bzrignore
=== modified file '.bzrignore'
--- a/.bzrignore	2010-11-03 13:31:42 +0000
+++ b/.bzrignore	2011-03-07 10:06:39 +0000
@@ -37,7 +37,10 @@
 *.user
 *.vcproj
 *.vcproj.cmake
+*.vcxproj
+*.vcxproj.filters
 */*.dir/*
+*.dir
 */*_pure_*warnings
 */.deps
 */.libs/*
@@ -46,6 +49,7 @@
 */minsizerel/*
 */release/*
 */relwithdebinfo/*
+RelWithDebInfo
 *~
 .*.swp
 ./CMakeCache.txt
@@ -607,6 +611,7 @@ include/mysql_h.ic
 include/mysql_version.h
 include/mysqld_ername.h
 include/mysqld_error.h
+include/mysqld_error.h.rule
 include/openssl
 include/readline
 include/readline/*.h
@@ -1879,7 +1884,9 @@ scripts/mysql_find_rows
 scripts/mysql_fix_extensions
 scripts/mysql_fix_privilege_tables
 scripts/mysql_fix_privilege_tables.sql
+scripts/mysql_fix_privilege_tables.sql.rule
 scripts/mysql_fix_privilege_tables_sql.c
+scripts/mysql_fix_privilege_tables_sql.c.rule
 scripts/mysql_install_db
 scripts/mysql_secure_installation
 scripts/mysql_setpermission
@@ -2116,6 +2123,7 @@ sql/handlerton.cc
 sql/html
 sql/latex
 sql/lex_hash.h
+sql/lex_hash.h.rule
 sql/link_sources
 sql/max/*
 sql/message.h
@@ -2147,6 +2155,7 @@ sql/sql_builtin.cc
 sql/sql_select.cc.orig
 sql/sql_yacc.cc
 sql/sql_yacc.h
+sql/sql_yacc.h.rule
 sql/sql_yacc.output
 sql/sql_yacc.yy.orig
 sql/test_time


--===============1172746706==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   2nja6fe8hx14zgy5
# target_branch: file:///C:/ade/mysql-bzr/b59316-5.1/
# testament_sha1: 636e048c31790485377cdb9582e28d9ac749a858
# timestamp: 2011-03-07 11:06:47 +0100
# base_revision_id: build@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaOPI+AAAcbfgEAQUHP/91cy
GYC////wUAQW266Bd6qqPW0wkpMgajEU2wmTJTwaFNHqDxRg0gyJqelPCaCGFQ2p6QAAA0GgNJia
RM1P1EmTRkwQNDTCA000YJFE1Tyhgj1PIJkyDIMIaZMQ0wkoQyamRiZTNT1MyhoAANABOuvrA7u7
7sy8h8+W/ObKNs74YEmSyhvCSbpRFi7sR8L+uqBCECH17gM5kPxlymDeOpa4WBrEJIFZGhFtWM7O
sFfbx2p8Q3tRLkuhpzT9+QQMDZJerZT0EVCsswnrkaNrDXsOcKY8/zihQnz6U677k9eDXFoid2eN
HCWuwWIJS1jcxUmRSrjEaCLB7mksimrYoC5ihSD2NBhMO8yGR0BdPEmu1AZUqowFQR24jt2cg455
RaKvWmfomVOupySSuVXCadwJZSXUYcDKYXP1mJ2X0lY5711XhP2kHAuRu4VaJFY7LkgPAZzBcyTM
gdYXwjVSgkgit4mOQTPbWo2BuviZWvjA0WcJ6i+6zZOOIanFjsaydk4haJeOYVm/Zc4dLCIKh4zE
BcNV0uDVebAcBxvs7YX4u2Aqgt5QtcNZwjXp2Qq2IOWuE8sjoL96/3oDlpQrYFPdntcZWsZhqKen
G/J5Wg2KKOQ0jpdzcBbrTbBBiDxrSS3oDpHxvjSYcPOEEM3leDUisUC3G7ykYmZnhKi26hsiIGMo
NCIkA0oaQ+a6WDdMqunJq8QpPjBh15twqngi9WlmRhjkzvQ055XEEhNZhMHYLA/FeY/1B07usDPx
mJXIHZbO6quKJgHXr2YlxmMc5hhw1DIgmJofMYuRsSPODVS/kP5HzDV9oWsAc2dIom4TpK9DrXQn
UqZi5bgsI01WnpVGd04tgMQVymnaWbm33AXGbFO0VRbGQTvFseekVppm4kVDGxNT6LGbt7T81mSY
rL7rsv5uNRthwj4hK9SbbVstPPElHazPzaLAlzHrv/G+orwHGOIzj2XkjWOj0ThwMgtZrw59tic5
wMso6hWiMnlWhoDKqtMUyXAmHFdyvXkMjK56w+YMntbodUFBFlDvK42sPhxQSb+nBjLBXpXmKtBu
KV4PB8CGq9MuRBKAwMp33VxQyxlCR5KQ/ozTbNla8rlc4n6r4T1JGha8ZXCd4gbv/IsQdinAvIi0
1ImPKqwysFgjOoJPN/7kpzqTpA9A2hROtrlnh43ULVn1MYooSPon7N40jmKS0wsoSKf3pzqGxvAm
AsmA5FO646iV9kTORLSZXtJmYQUvOhija82lKhOm2QuOUCqx1g6DC+cDNlcryuWSBJ2cQDKUWGh0
lA5uBmKWy9F4yshdKBdSThmCkkaoKAGnDMw1J6OKNNxmUPCg0g8xy0wIv3iYSqDR66DUsCFZlshF
bQoJBMqa8uqFC+mo/4u5IpwoSFHHkfAA


--===============1172746706==--