diff --git a/COPYING b/COPYING index d60c31a..d159169 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/Makefile.am b/Makefile.am index 7ba20a7..d92d993 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2004 MySQL AB +# Copyright (C) 2004-2009 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ACLOCAL_AMFLAGS = -I m4 diff --git a/doc/xsl/Makefile.am b/doc/xsl/Makefile.am index f3a1bd7..e995c28 100644 --- a/doc/xsl/Makefile.am +++ b/doc/xsl/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2008 MySQL AB +# Copyright (C) 2008 Alexey Kopytov # # 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 @@ -12,6 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA EXTRA_DIST=catalog.xml.in xhtml-chunk.xsl xhtml-common.xsl xhtml.xsl diff --git a/sysbench/CMakeLists.txt b/sysbench/CMakeLists.txt index acc1a89..7c77498 100644 --- a/sysbench/CMakeLists.txt +++ b/sysbench/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (C) 2008 MySQL AB +# Copyright (C) 2008-2011 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA cmake_minimum_required(VERSION 2.6) if(COMMAND cmake_policy) diff --git a/sysbench/Makefile.am b/sysbench/Makefile.am index 722a307..6e30194 100644 --- a/sysbench/Makefile.am +++ b/sysbench/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2004 MySQL AB +# Copyright (C) 2004-2014 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA SUBDIRS = drivers tests scripting . diff --git a/sysbench/db_driver.c b/sysbench/db_driver.c index a3d2769..8fdc438 100644 --- a/sysbench/db_driver.c +++ b/sysbench/db_driver.c @@ -1,4 +1,6 @@ -/* Copyright (C) 2004 MySQL AB +/* + Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2015 Alexey Kopytov 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 @@ -12,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/db_driver.h b/sysbench/db_driver.h index 7e6bf61..ca87629 100644 --- a/sysbench/db_driver.h +++ b/sysbench/db_driver.h @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2008 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DB_DRIVER_H diff --git a/sysbench/drivers/Makefile.am b/sysbench/drivers/Makefile.am index 68e1e16..708b663 100644 --- a/sysbench/drivers/Makefile.am +++ b/sysbench/drivers/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2004 MySQL AB +# Copyright (C) 2004-2014 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if USE_MYSQL MYSQL_DIR = mysql diff --git a/sysbench/drivers/attachsql/Makefile.am b/sysbench/drivers/attachsql/Makefile.am index c7210ef..1714b5f 100644 --- a/sysbench/drivers/attachsql/Makefile.am +++ b/sysbench/drivers/attachsql/Makefile.am @@ -1,5 +1,7 @@ -# Copyright (C) 2009 Sun Microsystems, Inc. -# +# Copyright 2014 Hewlett-Packard Development Company, L.P. +# based on the Drizzle driver: +# Copyright (C) 2009 Sun Microsystems, Inc. +# # 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 @@ -12,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA noinst_LIBRARIES = libsbattachsql.a diff --git a/sysbench/drivers/attachsql/drv_attachsql.c b/sysbench/drivers/attachsql/drv_attachsql.c index b1fe15d..0f55634 100644 --- a/sysbench/drivers/attachsql/drv_attachsql.c +++ b/sysbench/drivers/attachsql/drv_attachsql.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/drivers/drizzle/Makefile.am b/sysbench/drivers/drizzle/Makefile.am index 201d18b..0653ad7 100644 --- a/sysbench/drivers/drizzle/Makefile.am +++ b/sysbench/drivers/drizzle/Makefile.am @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA noinst_LIBRARIES = libsbdrizzle.a diff --git a/sysbench/drivers/drizzle/drv_drizzle.c b/sysbench/drivers/drizzle/drv_drizzle.c index 9aeae39..507dca5 100644 --- a/sysbench/drivers/drizzle/drv_drizzle.c +++ b/sysbench/drivers/drizzle/drv_drizzle.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/drivers/mysql/Makefile.am b/sysbench/drivers/mysql/Makefile.am index 763d2f7..0a8317a 100644 --- a/sysbench/drivers/mysql/Makefile.am +++ b/sysbench/drivers/mysql/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2004 MySQL AB +# Copyright (C) 2004-2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA noinst_LIBRARIES = libsbmysql.a diff --git a/sysbench/drivers/mysql/drv_mysql.c b/sysbench/drivers/mysql/drv_mysql.c index 2fd8340..e7ed359 100644 --- a/sysbench/drivers/mysql/drv_mysql.c +++ b/sysbench/drivers/mysql/drv_mysql.c @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef STDC_HEADERS diff --git a/sysbench/drivers/oracle/Makefile.am b/sysbench/drivers/oracle/Makefile.am index bd9f9a1..f5d4529 100644 --- a/sysbench/drivers/oracle/Makefile.am +++ b/sysbench/drivers/oracle/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2005 MySQL AB +# Copyright (C) 2005-2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA noinst_LIBRARIES = libsboracle.a diff --git a/sysbench/drivers/oracle/drv_oracle.c b/sysbench/drivers/oracle/drv_oracle.c index 6afcf18..445eba9 100644 --- a/sysbench/drivers/oracle/drv_oracle.c +++ b/sysbench/drivers/oracle/drv_oracle.c @@ -1,4 +1,5 @@ /* Copyright (C) 2005 MySQL AB + Copyright (C) 2005-2008 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/drivers/pgsql/Makefile.am b/sysbench/drivers/pgsql/Makefile.am index c1921ad..0231dc1 100644 --- a/sysbench/drivers/pgsql/Makefile.am +++ b/sysbench/drivers/pgsql/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2005 MySQL AB +# Copyright (C) 2005-2015 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA noinst_LIBRARIES = libsbpgsql.a diff --git a/sysbench/drivers/pgsql/drv_pgsql.c b/sysbench/drivers/pgsql/drv_pgsql.c index c457354..eab7755 100644 --- a/sysbench/drivers/pgsql/drv_pgsql.c +++ b/sysbench/drivers/pgsql/drv_pgsql.c @@ -1,4 +1,5 @@ /* Copyright (C) 2005 MySQL AB + Copyright (C) 2005-20015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/sb_list.h b/sysbench/sb_list.h index 5d6a5ae..5c2a456 100644 --- a/sysbench/sb_list.h +++ b/sysbench/sb_list.h @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2014 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SB_LIST_H diff --git a/sysbench/sb_logger.c b/sysbench/sb_logger.c index 7d64169..d2d7df1 100644 --- a/sysbench/sb_logger.c +++ b/sysbench/sb_logger.c @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/sb_logger.h b/sysbench/sb_logger.h index 740eec5..6cf267a 100644 --- a/sysbench/sb_logger.h +++ b/sysbench/sb_logger.h @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2011 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SB_LOGGER_H diff --git a/sysbench/sb_options.c b/sysbench/sb_options.c index 2b2e9ad..bc541fc 100644 --- a/sysbench/sb_options.c +++ b/sysbench/sb_options.c @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/sb_options.h b/sysbench/sb_options.h index cc4664f..5c8466f 100644 --- a/sysbench/sb_options.h +++ b/sysbench/sb_options.h @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OPTIONS_H diff --git a/sysbench/sb_percentile.c b/sysbench/sb_percentile.c index 4b13c55..def2d6d 100644 --- a/sysbench/sb_percentile.c +++ b/sysbench/sb_percentile.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/sb_percentile.h b/sysbench/sb_percentile.h index 7df89bd..487d98d 100644 --- a/sysbench/sb_percentile.h +++ b/sysbench/sb_percentile.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SB_PERCENTILE_H diff --git a/sysbench/sb_timer.c b/sysbench/sb_timer.c index 91cd3cf..9054c28 100644 --- a/sysbench/sb_timer.c +++ b/sysbench/sb_timer.c @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2012 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/sb_timer.h b/sysbench/sb_timer.h index 743f921..d7856a9 100644 --- a/sysbench/sb_timer.h +++ b/sysbench/sb_timer.h @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SB_TIMER_H diff --git a/sysbench/sb_win.c b/sysbench/sb_win.c index ad8afa8..8324d41 100644 --- a/sysbench/sb_win.c +++ b/sysbench/sb_win.c @@ -1,4 +1,6 @@ -/* Copyright (C) 2008 MySQL AB +/* + Copyright (C) 2008 MySQL AB + Copyright (C) 2008-2010 Alexey Kopytov 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 @@ -12,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /* diff --git a/sysbench/scripting/CMakeLists.txt b/sysbench/scripting/CMakeLists.txt index 7346d5c..7126aa2 100644 --- a/sysbench/scripting/CMakeLists.txt +++ b/sysbench/scripting/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (C) 2008 MySQL AB +# Copyright (C) 2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA include_directories(lua/src ..) add_subdirectory(lua/src) diff --git a/sysbench/scripting/Makefile.am b/sysbench/scripting/Makefile.am index 170ad2c..d8f1868 100644 --- a/sysbench/scripting/Makefile.am +++ b/sysbench/scripting/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2006 MySQL AB +# Copyright (C) 2006-2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if USE_LUA SUBDIRS = lua . diff --git a/sysbench/scripting/lua/Makefile.am b/sysbench/scripting/lua/Makefile.am index ca80c14..177d9c8 100644 --- a/sysbench/scripting/lua/Makefile.am +++ b/sysbench/scripting/lua/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2006 MySQL AB +# Copyright (C) 2006 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA SUBDIRS = src diff --git a/sysbench/scripting/lua/src/CMakeLists.txt b/sysbench/scripting/lua/src/CMakeLists.txt index 2fed0ca..cdc11f8 100644 --- a/sysbench/scripting/lua/src/CMakeLists.txt +++ b/sysbench/scripting/lua/src/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (C) 2008 MySQL AB +# Copyright (C) 2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if(MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLUA_WIN") diff --git a/sysbench/scripting/lua/src/Makefile.am b/sysbench/scripting/lua/src/Makefile.am index 88309df..ddd80e9 100644 --- a/sysbench/scripting/lua/src/Makefile.am +++ b/sysbench/scripting/lua/src/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2006 MySQL AB +# Copyright (C) 2006 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA noinst_LIBRARIES = liblua.a @@ -25,4 +26,4 @@ liblua_a_SOURCES = lapi.c lcode.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lm luaconf.h lundump.h lzio.h lauxlib.h ldebug.h lfunc.h llex.h lmem.h lopcodes.h \ lstate.h ltable.h lua.h lualib.h lvm.h -AM_CFLAGS += -Wno-bad-function-cast \ No newline at end of file +AM_CFLAGS += -Wno-bad-function-cast diff --git a/sysbench/scripting/sb_script.c b/sysbench/scripting/sb_script.c index 8dd8fb7..6933f1c 100644 --- a/sysbench/scripting/sb_script.c +++ b/sysbench/scripting/sb_script.c @@ -1,4 +1,5 @@ /* Copyright (C) 2006 MySQL AB + Copyright (C) 2006 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/scripting/sb_script.h b/sysbench/scripting/sb_script.h index 73c6597..75b9c5b 100644 --- a/sysbench/scripting/sb_script.h +++ b/sysbench/scripting/sb_script.h @@ -1,4 +1,5 @@ /* Copyright (C) 2006 MySQL AB + Copyright (C) 2006 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SB_SCRIPT_H diff --git a/sysbench/scripting/script_lua.c b/sysbench/scripting/script_lua.c index 5e31a7a..31a1aab 100644 --- a/sysbench/scripting/script_lua.c +++ b/sysbench/scripting/script_lua.c @@ -1,4 +1,5 @@ /* Copyright (C) 2006 MySQL AB + Copyright (C) 2006-2015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H @@ -297,7 +298,8 @@ int sb_lua_op_execute_request(sb_request_t *sb_req, int thread_id) LOG_EVENT_STOP(msg, thread_id); - sb_percentile_update(&local_percentile, sb_timer_value(&timers[thread_id])); + if (db_driver != NULL) + sb_percentile_update(&local_percentile, sb_timer_value(&timers[thread_id])); return 0; } diff --git a/sysbench/scripting/script_lua.h b/sysbench/scripting/script_lua.h index 7eaefef..e35c1ed 100644 --- a/sysbench/scripting/script_lua.h +++ b/sysbench/scripting/script_lua.h @@ -1,4 +1,5 @@ /* Copyright (C) 2006 MySQL AB + Copyright (C) 2006 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/sysbench.c b/sysbench/sysbench.c index 4cdd457..c008037 100644 --- a/sysbench/sysbench.c +++ b/sysbench/sysbench.c @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/sysbench.h b/sysbench/sysbench.h index 74d9fb9..0d165aa 100644 --- a/sysbench/sysbench.h +++ b/sysbench/sysbench.h @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SYSBENCH_H diff --git a/sysbench/tests/Makefile.am b/sysbench/tests/Makefile.am index 5bc1a0c..4199e54 100644 --- a/sysbench/tests/Makefile.am +++ b/sysbench/tests/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2004 MySQL AB +# Copyright (C) 2004-2008 Alexey Kopytov # # 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 @@ -12,6 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA SUBDIRS = cpu fileio memory threads mutex db diff --git a/sysbench/tests/cpu/CMakeLists.txt b/sysbench/tests/cpu/CMakeLists.txt index 19ede0a..ac431a0 100644 --- a/sysbench/tests/cpu/CMakeLists.txt +++ b/sysbench/tests/cpu/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (C) 2008 MySQL AB +# Copyright (C) 2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tests) ADD_LIBRARY(sbcpu sb_cpu.c) diff --git a/sysbench/tests/cpu/Makefile.am b/sysbench/tests/cpu/Makefile.am index e30c930..af2174b 100644 --- a/sysbench/tests/cpu/Makefile.am +++ b/sysbench/tests/cpu/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2004 MySQL AB +# Copyright (C) 2004-2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA noinst_LIBRARIES = libsbcpu.a diff --git a/sysbench/tests/cpu/sb_cpu.c b/sysbench/tests/cpu/sb_cpu.c index a1552cc..970b1a4 100644 --- a/sysbench/tests/cpu/sb_cpu.c +++ b/sysbench/tests/cpu/sb_cpu.c @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/tests/db/Makefile.am b/sysbench/tests/db/Makefile.am index 71dc3d4..e7647ac 100644 --- a/sysbench/tests/db/Makefile.am +++ b/sysbench/tests/db/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2008 MySQL AB +# Copyright (C) 2008-2014 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA EXTRA_DIST = delete.lua insert.lua oltp.lua \ oltp_simple.lua \ diff --git a/sysbench/tests/fileio/CMakeLists.txt b/sysbench/tests/fileio/CMakeLists.txt index f5270d4..c2af9be 100644 --- a/sysbench/tests/fileio/CMakeLists.txt +++ b/sysbench/tests/fileio/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (C) 2008 MySQL AB +# Copyright (C) 2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tests) ADD_LIBRARY(sbfileio sb_fileio.c crc32.c) diff --git a/sysbench/tests/fileio/Makefile.am b/sysbench/tests/fileio/Makefile.am index 7d61827..72f0fbb 100644 --- a/sysbench/tests/fileio/Makefile.am +++ b/sysbench/tests/fileio/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2004 MySQL AB +# Copyright (C) 2004-2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA noinst_LIBRARIES = libsbfileio.a diff --git a/sysbench/tests/fileio/sb_fileio.c b/sysbench/tests/fileio/sb_fileio.c index e4c8f08..a7a1a57 100644 --- a/sysbench/tests/fileio/sb_fileio.c +++ b/sysbench/tests/fileio/sb_fileio.c @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/tests/memory/CMakeLists.txt b/sysbench/tests/memory/CMakeLists.txt index cbb576a..634ea3d 100644 --- a/sysbench/tests/memory/CMakeLists.txt +++ b/sysbench/tests/memory/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (C) 2008 MySQL AB +# Copyright (C) 2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tests) add_library(sbmemory sb_memory.c) diff --git a/sysbench/tests/memory/Makefile.am b/sysbench/tests/memory/Makefile.am index 53468e0..a12f25c 100644 --- a/sysbench/tests/memory/Makefile.am +++ b/sysbench/tests/memory/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2004 MySQL AB +# Copyright (C) 2004-2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA noinst_LIBRARIES = libsbmemory.a diff --git a/sysbench/tests/memory/sb_memory.c b/sysbench/tests/memory/sb_memory.c index 977e17a..eace821 100644 --- a/sysbench/tests/memory/sb_memory.c +++ b/sysbench/tests/memory/sb_memory.c @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/tests/mutex/CMakeLists.txt b/sysbench/tests/mutex/CMakeLists.txt index 2d4b947..fa487ef 100644 --- a/sysbench/tests/mutex/CMakeLists.txt +++ b/sysbench/tests/mutex/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (C) 2008 MySQL AB +# Copyright (C) 2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tests) add_library(sbmutex sb_mutex.c) diff --git a/sysbench/tests/mutex/Makefile.am b/sysbench/tests/mutex/Makefile.am index f56c05d..32bb443 100644 --- a/sysbench/tests/mutex/Makefile.am +++ b/sysbench/tests/mutex/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2004 MySQL AB +# Copyright (C) 2004-2008 Alexey Kopytov # # 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 @@ -12,10 +13,10 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA noinst_LIBRARIES = libsbmutex.a libsbmutex_a_SOURCES = sb_mutex.c ../sb_mutex.h -libsbmutex_a_CPPFLAGS = $(AM_CPPFLAGS) \ No newline at end of file +libsbmutex_a_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/sysbench/tests/mutex/sb_mutex.c b/sysbench/tests/mutex/sb_mutex.c index 92b7271..01d1b01 100644 --- a/sysbench/tests/mutex/sb_mutex.c +++ b/sysbench/tests/mutex/sb_mutex.c @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2008 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff --git a/sysbench/tests/sb_cpu.h b/sysbench/tests/sb_cpu.h index 4d1334b..7add52d 100644 --- a/sysbench/tests/sb_cpu.h +++ b/sysbench/tests/sb_cpu.h @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SB_CPU_H diff --git a/sysbench/tests/sb_fileio.h b/sysbench/tests/sb_fileio.h index c0f70ed..ed00d5d 100644 --- a/sysbench/tests/sb_fileio.h +++ b/sysbench/tests/sb_fileio.h @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2008 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SB_FILEIO_H diff --git a/sysbench/tests/sb_memory.h b/sysbench/tests/sb_memory.h index 17bdedd..fbb0ed2 100644 --- a/sysbench/tests/sb_memory.h +++ b/sysbench/tests/sb_memory.h @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2008 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SB_MEMORY_H diff --git a/sysbench/tests/sb_mutex.h b/sysbench/tests/sb_mutex.h index 1440dc2..3ead641 100644 --- a/sysbench/tests/sb_mutex.h +++ b/sysbench/tests/sb_mutex.h @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SB_MUTEX_H diff --git a/sysbench/tests/sb_threads.h b/sysbench/tests/sb_threads.h index 2fe7734..91ebd19 100644 --- a/sysbench/tests/sb_threads.h +++ b/sysbench/tests/sb_threads.h @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SB_THREADS_H diff --git a/sysbench/tests/threads/CMakeLists.txt b/sysbench/tests/threads/CMakeLists.txt index 7143ece..043cbe2 100644 --- a/sysbench/tests/threads/CMakeLists.txt +++ b/sysbench/tests/threads/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (C) 2008 MySQL AB +# Copyright (C) 2008 Alexey Kopytov # # 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 @@ -12,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tests) add_library(sbthreads sb_threads.c) diff --git a/sysbench/tests/threads/Makefile.am b/sysbench/tests/threads/Makefile.am index 8b03f59..2db7ffc 100644 --- a/sysbench/tests/threads/Makefile.am +++ b/sysbench/tests/threads/Makefile.am @@ -1,4 +1,5 @@ # Copyright (C) 2004 MySQL AB +# Copyright (C) 2004-2008 Alexey Kopytov # # 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 @@ -12,10 +13,10 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA noinst_LIBRARIES = libsbthreads.a libsbthreads_a_SOURCES = sb_threads.c ../sb_threads.h -libsbthreads_a_CPPFLAGS = $(AM_CPPFLAGS) \ No newline at end of file +libsbthreads_a_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/sysbench/tests/threads/sb_threads.c b/sysbench/tests/threads/sb_threads.c index aa3d5b9..b677d41 100644 --- a/sysbench/tests/threads/sb_threads.c +++ b/sysbench/tests/threads/sb_threads.c @@ -1,4 +1,5 @@ /* Copyright (C) 2004 MySQL AB + Copyright (C) 2004-2015 Alexey Kopytov 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 @@ -12,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H