Commit 3099886c authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  mysql.com:/home/kent/bk/main/mysql-5.1


include/mysql/plugin.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
parents fcbfb41f 92e68d49

client/mysqlslap.c

+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

include/atomic/nolock.h

+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

include/atomic/rwlock.h

+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

include/atomic/x86-gcc.h

+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

include/atomic/x86-msvc.h

+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