Commit 0c676d7a authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-maint 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 0c280278 3aca00e1

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ client/sql_string.cpp 
client/ssl_test

client/thimble

client/thread_test

client/tmp.diff

client_debug/*

client_release/*

client_test
@@ -1324,10 +1325,12 @@ mysql-test/r/slave-running.eval 
mysql-test/r/slave-stopped.eval

mysql-test/r/symlink.log

mysql-test/r/system_mysql_db.log

mysql-test/r/tmp.result

mysql-test/r/udf.log

mysql-test/share/mysql

mysql-test/std_data/*.pem

mysql-test/t/index_merge.load

mysql-test/t/tmp.test

mysql-test/var

mysql-test/var/*

mysql.kdevprj

BitKeeper/etc/collapsed

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
45214442pBGT9KuZEGixBH71jTzbOA

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

452c6c6dAjuNghfc1ObZ_UQ5SCl85g

4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg

454a7ef8gdvE_ddMlJyghvOAkKPNOQ

454bb488ijVLOUK_GFjcoISE0GxPUA

454bb9a8AwlGRC_wWLS2sNMoRBMRGw

BitKeeper/triggers/post-commit

+11 −3
Original line number Diff line number Diff line
@@ -35,9 +35,17 @@ fi 


CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`

CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet`

BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/\1/p'`

WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'`



#

# composing subject lines of commit mails.

# if a fix targets to a WL and there is a bug referred

# then X-Bug mail header will contain the first found bug's number

#

BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | \

     sed -ne 's/[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/BUG#\1/

              s/.*BUG#\([0-9][0-9]*\)/\1/p'`

WL=`bk -R prs -r+ -h -d':C:' ChangeSet | \

     sed -ne 's/[Ww][Ll] *# *\([0-9][0-9]*\).*$/WL#\1/

              s/.*\(WL#[0-9][0-9]*\)/ \1/p'`

if [ "$BUG" = "" ]

then

  TO=dev-public@mysql.com

client/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl taocrypt zlib wsock 
ADD_EXECUTABLE(mysqlimport mysqlimport.c)

TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)

TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient mysys dbug yassl taocrypt zlib wsock32)

ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c ../mysys/my_getpagesize.c)

TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlshow mysqlshow.c)

TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl taocrypt zlib wsock32)

client/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ mysqltest_SOURCES= mysqltest.c \ 
				$(top_srcdir)/mysys/my_copy.c

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)



mysql_upgrade_SOURCES=          mysql_upgrade.c

mysql_upgrade_SOURCES=          mysql_upgrade.c \

                                $(top_srcdir)/mysys/my_getpagesize.c



# Fix for mit-threads

DEFS =			-DUNDEF_THREADS_HACK \