Commit 543264c6 authored by unknown's avatar unknown
Browse files

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 

into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines


sql/lock.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
parents 569eefdc 79a1be4a

BUILD/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
#

# This library is free software; you can redistribute it and/or

# modify it under the terms of the GNU Library General Public

# License as published by the Free Software Foundation; either

# version 2 of the License, or (at your option) any later version.

# License as published by the Free Software Foundation; version 2

# of the License.

#

# This library is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

Docs/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 
# 

# 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

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

# the Free Software Foundation; version 2 of the License.

# 

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 
# 

# 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

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

# the Free Software Foundation; version 2 of the License.

# 

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

SSL/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 
# 

# 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

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

# the Free Software Foundation; version 2 of the License.

# 

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

bdb/Makefile.in

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 
# 

# 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

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

# the Free Software Foundation; version 2 of the License.

# 

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of