[packages/percona-server] - move percona server here and leave mysql.spec for mysql.com version

arekm arekm at pld-linux.org
Wed Oct 21 15:11:58 CEST 2015


commit 26c94b7a598465780be9aecd54e9b602fd72d5ee
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Oct 21 15:11:48 2015 +0200

    - move percona server here and leave mysql.spec for mysql.com version

 mysql-client.conf => percona-server-client.conf    |   0
 ...l-clusters.conf => percona-server-clusters.conf |   0
 mysql-ndb-cpc.init => percona-server-ndb-cpc.init  |  30 +-
 ...c.sysconfig => percona-server-ndb-cpc.sysconfig |   0
 mysql-ndb-mgm.init => percona-server-ndb-mgm.init  |  30 +-
 ...m.sysconfig => percona-server-ndb-mgm.sysconfig |   0
 mysql-ndb.init => percona-server-ndb.init          |  30 +-
 ...l-ndb.sysconfig => percona-server-ndb.sysconfig |   0
 mysql.init => percona-server.init                  | 184 +++---
 mysql.logrotate => percona-server.logrotate        |   0
 mysql.spec => percona-server.spec                  | 698 +++++++++------------
 mysql.sysconfig => percona-server.sysconfig        |   0
 12 files changed, 420 insertions(+), 552 deletions(-)
---
diff --git a/mysql.spec b/percona-server.spec
similarity index 57%
rename from mysql.spec
rename to percona-server.spec
index a5f8be2..783e31f 100644
--- a/mysql.spec
+++ b/percona-server.spec
@@ -23,32 +23,30 @@
 %bcond_with	tests		# FIXME: don't run correctly
 %bcond_with	ndb		# NDB is now a separate product, this here is broken, so disable it
 
-%define		rel	1
+%define		rel	0.1
 %define		percona_rel	74.0
 %include	/usr/lib/rpm/macros.perl
-Summary:	MySQL: a very fast and reliable SQL database engine
-Summary(de.UTF-8):	MySQL: ist eine SQL-Datenbank
-Summary(fr.UTF-8):	MySQL: un serveur SQL rapide et fiable
-Summary(pl.UTF-8):	MySQL: bardzo szybka i niezawodna baza danych (SQL)
-Summary(pt_BR.UTF-8):	MySQL: Um servidor SQL rápido e confiável
-Summary(ru.UTF-8):	MySQL - быстрый SQL-сервер
-Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
-Summary(zh_CN.UTF-8):	MySQL数据库服务器
-Name:		mysql
+Summary:	Percona Server: a very fast and reliable SQL database engine
+Summary(de.UTF-8):	Percona Server: ist eine SQL-Datenbank
+Summary(fr.UTF-8):	Percona Server: un serveur SQL rapide et fiable
+Summary(pl.UTF-8):	Percona Server: bardzo szybka i niezawodna baza danych (SQL)
+Summary(pt_BR.UTF-8):	Percona Server: Um servidor SQL rápido e confiável
+Summary(ru.UTF-8):	Percona Server - быстрый SQL-сервер
+Summary(uk.UTF-8):	Percona Server - швидкий SQL-сервер
+Summary(zh_CN.UTF-8):	Percona Server数据库服务器
+Name:		percona-server
 Version:	5.6.26
 Release:	%{percona_rel}.%{rel}
-License:	GPL + MySQL FLOSS Exception
+License:	GPL + Percona Server FLOSS Exception
 Group:		Applications/Databases
-# Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
-# Source0:	http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz
-Source0:	http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz
+Source0:	http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/tarball/%{name}-%{version}-%{percona_rel}.tar.gz
 # Source0-md5:	172f420ec779e8902b6a92048088d528
 Source100:	http://www.sphinxsearch.com/files/sphinx-2.2.10-release.tar.gz
 # Source100-md5:	dda52b24d8348fc09e26d8a649a231d2
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.logrotate
-Source4:	%{name}d.conf
+Source4:	mysqld.conf
 Source5:	%{name}-clusters.conf
 Source7:	%{name}-ndb.init
 Source8:	%{name}-ndb.sysconfig
@@ -58,31 +56,31 @@ Source11:	%{name}-ndb-cpc.init
 Source12:	%{name}-ndb-cpc.sysconfig
 Source13:	%{name}-client.conf
 Source14:	my.cnf
-Patch0:		%{name}-opt.patch
-Patch1:		%{name}-versioning.patch
-Patch2:		%{name}hotcopy-5.0-5.5.patch
+Patch0:		mysql-opt.patch
+Patch1:		mysql-versioning.patch
+Patch2:		mysqlhotcopy-5.0-5.5.patch
 Patch3:		bug-67402.patch
-Patch4:		%{name}-no-default-secure-auth.patch
-Patch5:		%{name}-system-libhsclient.patch
+Patch4:		mysql-no-default-secure-auth.patch
+Patch5:		mysql-system-libhsclient.patch
 # from fedora
-Patch6:		%{name}-system-users.patch
-
-Patch9:		%{name}-build.patch
-Patch11:	%{name}-upgrade.patch
-Patch12:	%{name}-config.patch
-Patch14:	%{name}-bug-43594.patch
-Patch18:	%{name}-sphinx.patch
-Patch19:	%{name}-chain-certs.patch
+Patch6:		mysql-system-users.patch
+
+Patch9:		mysql-build.patch
+Patch11:	mysql-upgrade.patch
+Patch12:	mysql-config.patch
+Patch14:	mysql-bug-43594.patch
+Patch18:	mysql-sphinx.patch
+Patch19:	mysql-chain-certs.patch
 # from fedora
-Patch20:	%{name}-dubious-exports.patch
+Patch20:	mysql-dubious-exports.patch
 
 Patch22:	bug-66589.patch
 Patch23:	bug-44278.patch
-Patch24:	%{name}-cmake.patch
+Patch24:	mysql-cmake.patch
 
 Patch26:	mysqldumpslow-clusters.patch
 Patch27:	x32.patch
-URL:		http://www.mysql.com/products/community/
+URL:		https://www.percona.com/software/mysql-database/percona-server
 BuildRequires:	bison >= 1.875
 BuildRequires:	cmake >= 2.6
 BuildRequires:	readline-devel >= 6.2
@@ -117,7 +115,7 @@ Requires:	%{name}-charsets = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	/usr/bin/setsid
 Requires:	rc-scripts >= 0.2.0
-Suggests:	mysql-client
+Suggests:	percona-server-client
 %{?with_tcpd:Suggests:	tcp_wrappers}
 Suggests:	vim-syntax-mycnf
 Provides:	MySQL-server
@@ -129,115 +127,119 @@ Obsoletes:	mysql-server
 Conflicts:	logrotate < 3.8.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_orgname	percona-server
 %define		_libexecdir	%{_sbindir}
-%define		_localstatedir	/var/lib/mysql
-%define		_mysqlhome	/home/services/mysql
+%define		_localstatedir	/var/lib/%{name}
+%define		_perconahome	/home/services/%{name}
 
 %description
-MySQL is a true multi-user, multi-threaded SQL (Structured Query
-Language) database server. SQL is the most popular database language
-in the world. MySQL is a client/server implementation that consists of
-a server daemon mysqld and many different client programs/libraries.
-
-The main goals of MySQL are speed, robustness and easy to use. MySQL
-was originally developed because we at Tcx needed a SQL server that
-could handle very big databases with magnitude higher speed than what
-any database vendor could offer to us. We have now been using MySQL
-since 1996 in a environment with more than 40 databases, 10,000
-tables, of which more than 500 have more than 7 million rows. This is
-about 50G of mission critical data.
-
-The base upon which MySQL is built is a set of routines that have been
-used in a highly demanding production environment for many years.
-While MySQL is still in development, it already offers a rich and
-highly useful function set.
+Percona Server is a true multi-user, multi-threaded SQL (Structured
+Query Language) database server. SQL is the most popular database
+language in the world. Percona Server is a client/server
+implementation that consists of a server daemon mysqld and many
+different client programs/libraries.
+
+The main goals of Percona Server are speed, robustness and easy to
+use. Percona Server was originally developed because we at Tcx needed
+a SQL server that could handle very big databases with magnitude
+higher speed than what any database vendor could offer to us. We have
+now been using Percona Server since 1996 in a environment with more
+than 40 databases, 10,000 tables, of which more than 500 have more
+than 7 million rows. This is about 50G of mission critical data.
+
+The base upon which Percona Server is built is a set of routines that
+have been used in a highly demanding production environment for many
+years. While Percona Server is still in development, it already offers
+a rich and highly useful function set.
 
 %description -l fr.UTF-8
-MySQL est un serveur de bases de donnees SQL vraiment multi-usagers et
-multi-taches. Le langage SQL est le langage de bases de donnees le
-plus populaire au monde. MySQL est une implementation client/serveur
-qui consiste en un serveur (mysqld) et differents
-programmes/bibliotheques clientes.
-
-Les objectifs principaux de MySQL sont: vitesse, robustesse et
-facilite d'utilisation. MySQL fut originalement developpe parce que
-nous, chez Tcx, avions besoin d'un serveur SQL qui pouvait gerer de
-tres grandes bases de donnees avec une vitesse d'un ordre de magnitude
-superieur a ce que n'importe quel vendeur pouvait nous offrir. Nous
-utilisons MySQL depuis 1996 dans un environnement avec plus de 40
-bases de donnees, 10000 tables, desquelles plus de 500 ont plus de 7
-millions de lignes. Ceci represente environ 50G de donnees critiques.
-
-A la base de la conception de MySQL, on retrouve une serie de routines
-qui ont ete utilisees dans un environnement de production pendant
-plusieurs annees. Meme si MySQL est encore en developpement, il offre
-deja une riche et utile serie de fonctions.
+Percona Server est un serveur de bases de donnees SQL vraiment
+multi-usagers et multi-taches. Le langage SQL est le langage de bases
+de donnees le plus populaire au monde. Percona Server est une
+implementation client/serveur qui consiste en un serveur (mysqld) et
+differents programmes/bibliotheques clientes.
+
+Les objectifs principaux de Percona Server sont: vitesse, robustesse
+et facilite d'utilisation. Percona Server fut originalement developpe
+parce que nous, chez Tcx, avions besoin d'un serveur SQL qui pouvait
+gerer de tres grandes bases de donnees avec une vitesse d'un ordre de
+magnitude superieur a ce que n'importe quel vendeur pouvait nous
+offrir. Nous utilisons Percona Server depuis 1996 dans un
+environnement avec plus de 40 bases de donnees, 10000 tables,
+desquelles plus de 500 ont plus de 7 millions de lignes. Ceci
+represente environ 50G de donnees critiques.
+
+A la base de la conception de Percona Server, on retrouve une serie de
+routines qui ont ete utilisees dans un environnement de production
+pendant plusieurs annees. Meme si Percona Server est encore en
+developpement, il offre deja une riche et utile serie de fonctions.
 
 %description -l pl.UTF-8
-MySQL to prawdziwie wieloużytkownikowy, wielowątkowy serwer baz danych
-SQL. SQL jest najpopularniejszym na świecie językiem używanym do baz
-danych. MySQL to implementacja klient/serwer składająca się z demona
-mysqld i wielu różnych programów i bibliotek klienckich.
-
-Głównymi celami MySQL-a są szybkość, potęga i łatwość użytkowania.
-MySQL oryginalnie był tworzony, ponieważ autorzy w Tcx potrzebowali
-serwera SQL do obsługi bardzo dużych baz danych z szybkością o wiele
-większą, niż mogli zaoferować inni producenci baz danych. Używają go
-od 1996 roku w środowisku z ponad 40 bazami danych, 10 000 tabel, z
-których ponad 500 zawiera ponad 7 milionów rekordów - w sumie około
-50GB krytycznych danych.
-
-Baza, na której oparty jest MySQL, składa się ze zbioru procedur,
-które były używane w bardzo wymagającym środowisku produkcyjnym przez
-wiele lat. Pomimo, że MySQL jest ciągle rozwijany, już oferuje bogaty
-i użyteczny zbiór funkcji.
+Percona Server to prawdziwie wieloużytkownikowy, wielowątkowy serwer
+baz danych SQL. SQL jest najpopularniejszym na świecie językiem
+używanym do baz danych. Percona Server to implementacja klient/serwer
+składająca się z demona mysqld i wielu różnych programów i bibliotek
+klienckich.
+
+Głównymi celami Percona Server-a są szybkość, potęga i łatwość
+użytkowania. Percona Server oryginalnie był tworzony, ponieważ autorzy
+w Tcx potrzebowali serwera SQL do obsługi bardzo dużych baz danych z
+szybkością o wiele większą, niż mogli zaoferować inni producenci baz
+danych. Używają go od 1996 roku w środowisku z ponad 40 bazami danych,
+10 000 tabel, z których ponad 500 zawiera ponad 7 milionów rekordów -
+w sumie około 50GB krytycznych danych.
+
+Baza, na której oparty jest Percona Server, składa się ze zbioru
+procedur, które były używane w bardzo wymagającym środowisku
+produkcyjnym przez wiele lat. Pomimo, że Percona Server jest ciągle
+rozwijany, już oferuje bogaty i użyteczny zbiór funkcji.
 
 %description -l de.UTF-8
-MySQL ist eine SQL-Datenbank. Allerdings ist sie im Gegensatz zu
-Oracle, DB2 oder PostgreSQL keine relationale Datenbank. Die Daten
+Percona Server ist eine SQL-Datenbank. Allerdings ist sie im Gegensatz
+zu Oracle, DB2 oder PostgreSQL keine relationale Datenbank. Die Daten
 werden zwar in zweidimensionalen Tabellen gespeichert und können mit
 einem Primärschlüssel versehen werden. Es ist aber keine Definition
 eines Fremdschlüssels möglich. Der Benutzer ist somit bei einer
-MySQL-Datenbank völlig allein für die (referenzielle) Integrität der
-Daten verantwortlich. Allein durch die Nutzung externer
+Percona Server-Datenbank völlig allein für die (referenzielle)
+Integrität der Daten verantwortlich. Allein durch die Nutzung externer
 Tabellenformate, wie InnoDB bzw Berkeley DB wird eine Relationalität
-ermöglicht. Diese Projekte sind aber getrennt von MySQL zu betrachten.
+ermöglicht. Diese Projekte sind aber getrennt von Percona Server zu
+betrachten.
 
 %description -l pt_BR.UTF-8
-O MySQL é um servidor de banco de dados SQL realmente multiusuário e
-multi-tarefa. A linguagem SQL é a mais popular linguagem para banco de
-dados no mundo. O MySQL é uma implementação cliente/servidor que
-consiste de um servidor chamado mysqld e diversos
-programas/bibliotecas clientes. Os principais objetivos do MySQL são:
-velocidade, robustez e facilidade de uso. O MySQL foi originalmente
-desenvolvido porque nós na Tcx precisávamos de um servidor SQL que
-pudesse lidar com grandes bases de dados e com uma velocidade muito
-maior do que a que qualquer vendedor podia nos oferecer. Estamos
-usando o MySQL desde 1996 em um ambiente com mais de 40 bases de dados
-com 10.000 tabelas, das quais mais de 500 têm mais de 7 milhões de
-linhas. Isto é o equivalente a aproximadamente 50G de dados críticos.
-A base da construção do MySQL é uma série de rotinas que foram usadas
-em um ambiente de produção com alta demanda por muitos anos. Mesmo o
-MySQL estando ainda em desenvolvimento, ele já oferece um conjunto de
+O Percona Server é um servidor de banco de dados SQL realmente
+multiusuário e multi-tarefa. A linguagem SQL é a mais popular
+linguagem para banco de dados no mundo. O Percona Server é uma
+implementação cliente/servidor que consiste de um servidor chamado
+mysqld e diversos programas/bibliotecas clientes. Os principais
+objetivos do Percona Server são: velocidade, robustez e facilidade de
+uso. O Percona Server foi originalmente desenvolvido porque nós na Tcx
+precisávamos de um servidor SQL que pudesse lidar com grandes bases de
+dados e com uma velocidade muito maior do que a que qualquer vendedor
+podia nos oferecer. Estamos usando o Percona Server desde 1996 em um
+ambiente com mais de 40 bases de dados com 10.000 tabelas, das quais
+mais de 500 têm mais de 7 milhões de linhas. Isto é o equivalente a
+aproximadamente 50G de dados críticos. A base da construção do Percona
+Server é uma série de rotinas que foram usadas em um ambiente de
+produção com alta demanda por muitos anos. Mesmo o Percona Server
+estando ainda em desenvolvimento, ele já oferece um conjunto de
 funções muito ricas e úteis. Veja a documentação para maiores
 informações.
 
 %description -l ru.UTF-8
-MySQL - это SQL (Structured Query Language) сервер базы данных. MySQL
-была написана Michael'ом (monty) Widenius'ом. См. файл CREDITS в
-дистрибутиве на предмет других участников проекта и прочей информации
-о MySQL.
+Percona Server - это SQL (Structured Query Language) сервер базы
+данных. Percona Server была написана Michael'ом (monty) Widenius'ом.
+См. файл CREDITS в дистрибутиве на предмет других участников проекта и
+прочей информации о Percona Server.
 
 %description -l uk.UTF-8
-MySQL - це SQL (Structured Query Language) сервер бази даних. MySQL
-було написано Michael'ом (monty) Widenius'ом. Див. файл CREDITS в
-дистрибутиві для інформації про інших учасників проекту та іншої
-інформації.
+Percona Server - це SQL (Structured Query Language) сервер бази даних.
+Percona Server було написано Michael'ом (monty) Widenius'ом. Див. файл
+CREDITS в дистрибутиві для інформації про інших учасників проекту та
+іншої інформації.
 
 %package charsets
-Summary:	MySQL - character sets definitions
-Summary(pl.UTF-8):	MySQL - definicje kodowań znaków
+Summary:	Percona Server - character sets definitions
+Summary(pl.UTF-8):	Percona Server - definicje kodowań znaków
 Group:		Applications/Databases
 
 %description charsets
@@ -248,13 +250,13 @@ and server.
 Ten pakiet zawiera definicje kodowań znaków potrzebne dla serwera i
 klienta.
 
-%package -n mysqlhotcopy
-Summary:	mysqlhotcopy - A MySQL database backup program
-Summary(pl.UTF-8):	mysqlhotcopy - program do tworzenia kopii zapasowych baz MySQL
+%package mysqlhotcopy
+Summary:	mysqlhotcopy - A Percona Server database backup program
+Summary(pl.UTF-8):	mysqlhotcopy - program do tworzenia kopii zapasowych baz Percona Server
 Group:		Applications/Databases
 Requires:	perl-DBD-mysql
 
-%description -n mysqlhotcopy
+%description mysqlhotcopy
 mysqlhotcopy uses LOCK TABLES, FLUSH TABLES, and cp or scp to make a
 database backup quickly. It is the fastest way to make a backup of the
 database or single tables, but it can be run only on the same machine
@@ -263,7 +265,7 @@ for backing up MyISAM and ARCHIVE tables.
 
 See innobackup package to backup InnoDB tables.
 
-%description -n mysqlhotcopy -l pl.UTF-8
+%description mysqlhotcopy -l pl.UTF-8
 mysqlhotcopy wykorzystuje LOCK TABLES, FLUSH TABLES oraz cp i scp do
 szybkiego tworzenia kopii zapasowych baz danych. Jest to najszybszy
 sposób wykonania kopii zapasowej bazy danych lub pojedynczych tabel,
@@ -275,41 +277,41 @@ Narzędzie do tworzenia kopii tabel InnoDB znajduje się w pakiecie
 innobackup.
 
 %package extras
-Summary:	MySQL additional utilities
-Summary(pl.UTF-8):	Dodatkowe narzędzia do MySQL
+Summary:	Percona Server additional utilities
+Summary(pl.UTF-8):	Dodatkowe narzędzia do Percona Server
 Group:		Applications/Databases
 Requires:	%{name}-client = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description extras
-MySQL additional utilities except Perl scripts (they may be found in
-%{name}-extras-perl package).
+Percona Server additional utilities except Perl scripts (they may be
+found in %{name}-extras-perl package).
 
 %description extras -l pl.UTF-8
-Dodatkowe narzędzia do MySQL - z wyjątkiem skryptów Perla (które są w
-pakiecie %{name}-extras-perl).
+Dodatkowe narzędzia do Percona Server - z wyjątkiem skryptów Perla
+(które są w pakiecie %{name}-extras-perl).
 
 %package extras-perl
-Summary:	MySQL additional utilities written in Perl
-Summary(pl.UTF-8):	Dodatkowe narzędzia do MySQL napisane w Perlu
+Summary:	Percona Server additional utilities written in Perl
+Summary(pl.UTF-8):	Dodatkowe narzędzia do Percona Server napisane w Perlu
 Group:		Applications/Databases
 Requires:	%{name}-extras = %{version}-%{release}
 # this is just for the sake of smooth upgrade, not to break systems
 Requires:	mysqlhotcopy = %{version}-%{release}
-Requires:	perl(DBD::mysql)
+Requires:	perl-DBD-mysql
 
 %description extras-perl
-MySQL additional utilities written in Perl.
+Percona Server additional utilities written in Perl.
 
 %description extras-perl -l pl.UTF-8
-Dodatkowe narzędzia do MySQL napisane w Perlu.
+Dodatkowe narzędzia do Percona Server napisane w Perlu.
 
 %package client
-Summary:	MySQL - Client
-Summary(pl.UTF-8):	MySQL - Klient
-Summary(pt.UTF-8):	MySQL - Cliente
-Summary(ru.UTF-8):	MySQL клиент
-Summary(uk.UTF-8):	MySQL клієнт
+Summary:	Percona Server - Client
+Summary(pl.UTF-8):	Percona Server - Klient
+Summary(pt.UTF-8):	Percona Server - Cliente
+Summary(ru.UTF-8):	Percona Server клиент
+Summary(uk.UTF-8):	Percona Server клієнт
 Group:		Applications/Databases
 Requires:	%{name}-charsets = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
@@ -317,45 +319,45 @@ Requires:	readline >= 6.2
 Obsoletes:	MySQL-client
 
 %description client
-This package contains the standard MySQL clients.
+This package contains the standard Percona Server clients.
 
 %description client -l fr.UTF-8
-Ce package contient les clients MySQL standards.
+Ce package contient les clients Percona Server standards.
 
 %description client -l pl.UTF-8
-Standardowe programy klienckie MySQL.
+Standardowe programy klienckie Percona Server.
 
 %description client -l pt_BR.UTF-8
-Este pacote contém os clientes padrão para o MySQL.
+Este pacote contém os clientes padrão para o Percona Server.
 
 %description client -l ru.UTF-8
-Этот пакет содержит только клиент MySQL.
+Этот пакет содержит только клиент Percona Server.
 
 %description client -l uk.UTF-8
-Цей пакет містить тільки клієнта MySQL.
+Цей пакет містить тільки клієнта Percona Server.
 
 %package libs
-Summary:	Shared libraries for MySQL
-Summary(pl.UTF-8):	Biblioteki współdzielone MySQL
+Summary:	Shared libraries for Percona Server
+Summary(pl.UTF-8):	Biblioteki współdzielone Percona Server
 Group:		Libraries
 Obsoletes:	libmysql10
 Obsoletes:	mysql-doc < 4.1.12
 
 %description libs
-Shared libraries for MySQL.
+Shared libraries for Percona Server.
 
 %description libs -l pl.UTF-8
-Biblioteki współdzielone MySQL.
+Biblioteki współdzielone Percona Server.
 
 %package devel
-Summary:	MySQL - development header files and other files
-Summary(pl.UTF-8):	MySQL - Pliki nagłówkowe i inne dla programistów
-Summary(pt.UTF-8):	MySQL - Medições de desempenho
-Summary(ru.UTF-8):	MySQL - хедеры и библиотеки разработчика
-Summary(uk.UTF-8):	MySQL - хедери та бібліотеки програміста
+Summary:	Percona Server - development header files and other files
+Summary(pl.UTF-8):	Percona Server - Pliki nagłówkowe i inne dla programistów
+Summary(pt.UTF-8):	Percona Server - Medições de desempenho
+Summary(ru.UTF-8):	Percona Server - хедеры и библиотеки разработчика
+Summary(uk.UTF-8):	Percona Server - хедери та бібліотеки програміста
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-%{?with_ssl:Requires:	openssl-devel}
+%{?with_ssl:Requires: openssl-devel}
 Requires:	zlib-devel
 Obsoletes:	MySQL-devel
 Obsoletes:	libmysql10-devel
@@ -363,20 +365,21 @@ Obsoletes:	webscalesql-devel
 
 %description devel
 This package contains the development header files and other files
-necessary to develop MySQL client applications.
+necessary to develop Percona Server client applications.
 
 %description devel -l fr.UTF-8
 Ce package contient les fichiers entetes et les librairies de
 developpement necessaires pour developper des applications clientes
-MySQL.
+Percona Server.
 
 %description devel -l pl.UTF-8
 Pliki nagłówkowe i inne pliki konieczne do kompilacji aplikacji
-klienckich MySQL.
+klienckich Percona Server.
 
 %description devel -l pt_BR.UTF-8
 Este pacote contém os arquivos de cabeçalho (header files) e
-bibliotecas necessárias para desenvolver aplicações clientes do MySQL.
+bibliotecas necessárias para desenvolver aplicações clientes do
+Percona Server.
 
 %description devel -l ru.UTF-8
 Этот пакет содержит хедеры и библиотеки разработчика, необходимые для
@@ -387,19 +390,19 @@ bibliotecas necessárias para desenvolver aplicações clientes do MySQL.
 розробки програм-клієнтів.
 
 %package static
-Summary:	MySQL static libraries
-Summary(pl.UTF-8):	Biblioteki statyczne MySQL
-Summary(ru.UTF-8):	MySQL - статические библиотеки
-Summary(uk.UTF-8):	MySQL - статичні бібліотеки
+Summary:	Percona Server static libraries
+Summary(pl.UTF-8):	Biblioteki statyczne Percona Server
+Summary(ru.UTF-8):	Percona Server - статические библиотеки
+Summary(uk.UTF-8):	Percona Server - статичні бібліотеки
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Obsoletes:	MySQL-static
 
 %description static
-MySQL static libraries.
+Percona Server static libraries.
 
 %description static -l pl.UTF-8
-Biblioteki statyczne MySQL.
+Biblioteki statyczne Percona Server.
 
 %description static -l ru.UTF-8
 Этот пакет содержит статические библиотеки разработчика, необходимые
@@ -410,11 +413,11 @@ Biblioteki statyczne MySQL.
 розробки програм-клієнтів.
 
 %package bench
-Summary:	MySQL - Benchmarks
-Summary(pl.UTF-8):	MySQL - Programy testujące szybkość działania bazy
-Summary(pt.UTF-8):	MySQL - Medições de desempenho
-Summary(ru.UTF-8):	MySQL - бенчмарки
-Summary(uk.UTF-8):	MySQL - бенчмарки
+Summary:	Percona Server - Benchmarks
+Summary(pl.UTF-8):	Percona Server - Programy testujące szybkość działania bazy
+Summary(pt.UTF-8):	Percona Server - Medições de desempenho
+Summary(ru.UTF-8):	Percona Server - бенчмарки
+Summary(uk.UTF-8):	Percona Server - бенчмарки
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-client
@@ -422,87 +425,88 @@ Requires:	perl(DBD::mysql)
 Obsoletes:	MySQL-bench
 
 %description bench
-This package contains MySQL benchmark scripts and data.
+This package contains Percona Server benchmark scripts and data.
 
 %description bench -l pl.UTF-8
-Programy testujące szybkość serwera MySQL.
+Programy testujące szybkość serwera Percona Server.
 
 %description bench -l pt_BR.UTF-8
-Este pacote contém medições de desempenho de scripts e dados do MySQL.
+Este pacote contém medições de desempenho de scripts e dados do
+Percona Server.
 
 %description bench -l ru.UTF-8
 Этот пакет содержит скрипты и данные для оценки производительности
-MySQL.
+Percona Server.
 
 %description bench -l uk.UTF-8
-Цей пакет містить скрипти та дані для оцінки продуктивності MySQL.
+Цей пакет містить скрипти та дані для оцінки продуктивності Percona
+Server.
 
 %package doc
-Summary:	MySQL manual
-Summary(pl.UTF-8):	Podręcznik użytkownika MySQL
+Summary:	Percona Server manual
+Summary(pl.UTF-8):	Podręcznik użytkownika Percona Server
 Group:		Applications/Databases
 
 %description doc
 This package contains manual in HTML format.
 
 %description doc -l pl.UTF-8
-Podręcznik MySQL-a w formacie HTML.
+Podręcznik Percona Server-a w formacie HTML.
 
 %package ndb
-Summary:	MySQL - NDB Storage Engine Daemon
-Summary(pl.UTF-8):	MySQL - demon silnika przechowywania danych NDB
+Summary:	Percona Server - NDB Storage Engine Daemon
+Summary(pl.UTF-8):	Percona Server - demon silnika przechowywania danych NDB
 Group:		Applications/Databases
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description ndb
-This package contains the standard MySQL NDB Storage Engine Daemon.
+This package contains the standard Percona Server NDB Storage Engine
+Daemon.
 
 %description ndb -l pl.UTF-8
 Ten pakiet zawiera standardowego demona silnika przechowywania danych
 NDB.
 
 %package ndb-client
-Summary:	MySQL - NDB Clients
-Summary(pl.UTF-8):	MySQL - programy klienckie NDB
+Summary:	Percona Server - NDB Clients
+Summary(pl.UTF-8):	Percona Server - programy klienckie NDB
 Group:		Applications/Databases
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description ndb-client
-This package contains the standard MySQL NDB Clients.
+This package contains the standard Percona Server NDB Clients.
 
 %description ndb-client -l pl.UTF-8
-Ten pakiet zawiera standardowe programy klienckie MySQL NDB.
+Ten pakiet zawiera standardowe programy klienckie Percona Server NDB.
 
 %package ndb-mgm
-Summary:	MySQL - NDB Management Daemon
-Summary(pl.UTF-8):	MySQL - demon zarządzający NDB
+Summary:	Percona Server - NDB Management Daemon
+Summary(pl.UTF-8):	Percona Server - demon zarządzający NDB
 Group:		Applications/Databases
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description ndb-mgm
-This package contains the standard MySQL NDB Management Daemon.
+This package contains the standard Percona Server NDB Management
+Daemon.
 
 %description ndb-mgm -l pl.UTF-8
-Ten pakiet zawiera standardowego demona zarządzającego MySQL NDB.
+Ten pakiet zawiera standardowego demona zarządzającego Percona Server
+NDB.
 
 %package ndb-cpc
-Summary:	MySQL - NDB CPC Daemon
-Summary(pl.UTF-8):	MySQL - demon NDB CPC
+Summary:	Percona Server - NDB CPC Daemon
+Summary(pl.UTF-8):	Percona Server - demon NDB CPC
 Group:		Applications/Databases
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description ndb-cpc
-This package contains the standard MySQL NDB CPC Daemon.
+This package contains the standard Percona Server NDB CPC Daemon.
 
 %description ndb-cpc -l pl.UTF-8
-Ten pakiet zawiera standardowego demona MySQL NDB CPC.
+Ten pakiet zawiera standardowego demona Percona Server NDB CPC.
 
 %prep
-%setup -q -n percona-server-%{version}-%{percona_rel} %{?with_sphinx:-a100}
-
-# we want to use old, mysql compatible client library name
-find . -name CMakeLists.txt -exec sed -i -e 's#perconaserverclient#mysqlclient#g' "{}" ";"
-sed -i -e 's#perconaserverclient#mysqlclient#g' libmysql/libmysql.{ver.in,map} scripts/mysql_config.*
+%setup -q -n %{name}-%{version}-%{percona_rel} %{?with_sphinx:-a100}
 
 %patch0 -p1
 
@@ -558,7 +562,7 @@ CPPFLAGS="%{rpmcppflags}" \
 	-DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \
-	-DCOMPILATION_COMMENT="PLD/Linux Distribution MySQL RPM" \
+	-DCOMPILATION_COMMENT="PLD/Linux Distribution Percona Server RPM" \
 	-DCURSES_INCLUDE_PATH=/usr/include/ncurses \
 	%{?with_systemtap:-DENABLE_DTRACE=ON} \
 	-DFEATURE_SET="community" \
@@ -567,8 +571,8 @@ CPPFLAGS="%{rpmcppflags}" \
 	-DINSTALL_MYSQLTESTDIR_RPM="" \
 	-DINSTALL_PLUGINDIR=%{_lib}/%{name}/plugin \
 	-DINSTALL_SQLBENCHDIR=%{_datadir} \
-	-DINSTALL_SUPPORTFILESDIR=share/%{_orgname}-support \
-	-DINSTALL_MYSQLSHAREDIR=share/%{_orgname} \
+	-DINSTALL_SUPPORTFILESDIR=share/%{name}-support \
+	-DINSTALL_MYSQLSHAREDIR=share/%{name} \
 	-DMYSQL_UNIX_ADDR=/var/lib/%{name}/%{name}.sock \
 	%{?debug:-DWITH_DEBUG=ON} \
 	-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
@@ -592,17 +596,17 @@ CPPFLAGS="%{rpmcppflags}" \
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,mysql,skel} \
-	   $RPM_BUILD_ROOT/var/{log/{archive,}/mysql,lib/mysql} \
-	   $RPM_BUILD_ROOT%{_mysqlhome} \
+install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,%{name},skel} \
+	   $RPM_BUILD_ROOT/var/{log/{archive,}/%{name},lib/%{name}} \
+	   $RPM_BUILD_ROOT%{_perconahome} \
 	   $RPM_BUILD_ROOT%{_libdir}
 
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql
-cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/mysql
-cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/mysql
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 # This is template for configuration file which is created after 'service mysql init'
 cp -a %{SOURCE4} mysqld.conf
 cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/clusters.conf
@@ -618,19 +622,19 @@ touch $RPM_BUILD_ROOT/var/log/%{name}/{mysqld,query,slow}.log
 cp mysqld.conf mysqld.tmp
 awk 'BEGIN { RS="\n\n" } !/bdb/ { printf("%s\n\n", $0) }' < mysqld.tmp > mysqld.conf
 
-cp -a mysqld.conf $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysqld.conf
+cp -a mysqld.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.conf
 cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/mysql-client.conf
 ln -s mysql-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/my.cnf
 cp -a %{SOURCE14} $RPM_BUILD_ROOT/etc/skel/.my.cnf
 
 # NDB
 %if %{with ndb}
-install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql-ndb
-cp -a %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb
-install -p %{SOURCE9} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql-ndb-mgm
-cp -a %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb-mgm
-install -p %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql-ndb-cpc
-cp -a %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb-cpc
+install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-ndb
+cp -a %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ndb
+install -p %{SOURCE9} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-ndb-mgm
+cp -a %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ndb-mgm
+install -p %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-ndb-cpc
+cp -a %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ndb-cpc
 %endif
 
 sed -i -e 's,/usr//usr,%{_prefix},g' $RPM_BUILD_ROOT%{_bindir}/mysql_config
@@ -638,7 +642,7 @@ sed -i -e '/libs/s/$ldflags//' $RPM_BUILD_ROOT%{_bindir}/mysql_config
 sed -i -e '/libs/s/-lprobes_mysql//' $RPM_BUILD_ROOT%{_bindir}/mysql_config
 
 # remove known unpackaged files
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{_orgname}-support
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}-support
 
 # rename not to be so generic name
 mv $RPM_BUILD_ROOT%{_bindir}/{,mysql_}resolve_stack_dump
@@ -651,9 +655,9 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}}/mysqlaccess.conf
 %{!?debug:%{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql_resolve_stack_dump}
 %{!?debug:%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_resolve_stack_dump.1}
 # generate symbols file, so one can generate backtrace using it
-# mysql_resolve_stack_dump -s %{_datadir}/%{_orgname}/mysqld.sym -n mysqld.stack.
+# mysql_resolve_stack_dump -s %{_datadir}/%{name}/mysqld.sym -n mysqld.stack.
 # http://dev.mysql.com/doc/refman/5.0/en/using-stack-trace.html
-%{?debug:nm -n $RPM_BUILD_ROOT%{_sbindir}/mysqld > $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysqld.sym}
+%{?debug:nm -n $RPM_BUILD_ROOT%{_sbindir}/mysqld > $RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.sym}
 
 # do not clobber users $PATH
 mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_plugin
@@ -672,10 +676,10 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mysqld_safe
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mysqld_multi
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysqld_{multi,safe}*
-#rm $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysql-log-rotate
-#rm $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysql.server
-#rm $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/binary-configure
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/errmsg-utf8.txt
+#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql-log-rotate
+#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server
+#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/errmsg-utf8.txt
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql_waitpid
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_waitpid.1*
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql.server*
@@ -704,7 +708,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 %groupadd -g 89 mysql
-%useradd -u 89 -d %{_mysqlhome} -s /bin/sh -g mysql -c "MySQL Server" mysql
+%useradd -u 89 -d %{_perconahome} -s /bin/sh -g mysql -c "Percona Server Server" mysql
 
 %post
 /sbin/ldconfig
@@ -757,142 +761,6 @@ fi
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
-%triggerpostun -- mysql < 4.0.20-2.4
-# For clusters in /etc/%{name}/clusters.conf
-if [ -f /etc/sysconfig/mysql ]; then
-	. /etc/sysconfig/mysql
-	if [ -n "$MYSQL_DB_CLUSTERS" ]; then
-		for i in "$MYSQL_DB_CLUSTERS"; do
-			echo "$i/mysqld.conf=$i" >> /etc/%{name}/clusters.conf
-		done
-		echo "# Do not use **obsolete** option MYSQL_DB_CLUSTERS" >> /etc/sysconfig/mysql
-		echo "# USE /etc/%{name}/clusters.conf instead" >> /etc/sysconfig/mysql
-		echo "Converted clusters from MYSQL_DB_CLUSTERS to /etc/%{name}/clusters.conf."
-		echo "You NEED to fix your /etc/sysconfig/mysql and verify /etc/%{name}/clusters.conf."
-	fi
-fi
-
-%triggerpostun -- mysql < 4.1.1
-# For better compatibility with prevoius versions:
-for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do
-	if echo "$config" | grep -q '^/'; then
-		config_file="$config"
-	elif [ -f "/etc/%{name}/$config" ]; then
-		config_file=/etc/%{name}/$config
-	else
-		clusterdir=$(awk -F= "/^$config/{print \$2}" /etc/%{name}/clusters.conf)
-		if [ -z "$clusterdir" ]; then
-			echo >&2 "Can't find cluster dir for $config!"
-			echo >&2 "Please remove extra (leading) spaces from /etc/%{name}/clusters.conf"
-			exit 1
-		fi
-		config_file="$clusterdir/mysqld.conf"
-	fi
-
-	if [ ! -f "$config_file" ]; then
-			echo >&2 "Lost myself! Please report this (with above errors, if any) to http://bugs.pld-linux.org/"
-			exit 1
-	fi
-	echo "Adding option old-passwords to config: $config_file"
-	echo "If you want to use new, better passwords - remove it"
-
-	# sed magic to add 'old-passwords' to [mysqld] section
-	sed -i -e '/./{H;$!d;};x;/\[mysqld\]/{
-		a
-		a; Compatibility options:
-		aold-passwords
-	}
-	' $config_file
-done
-
-%banner -e %{name}-4.1.x <<-EOF
-	If you want to use new help tables in MySQL 4.1.x then You'll need to import the help data:
-	mysql -u mysql mysql < %{_datadir}/%{_orgname}/fill_help_tables.sql
-EOF
-#'
-
-%triggerpostun -- mysql < 5.1.0
-configs=""
-for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do
-	if echo "$config" | grep -q '^/'; then
-		config_file="$config"
-	elif [ -f "/etc/%{name}/$config" ]; then
-		config_file=/etc/%{name}/$config
-	else
-		clusterdir=$(awk -F= "/^$config/{print \$2}" /etc/%{name}/clusters.conf)
-		if [ -z "$clusterdir" ]; then
-			echo >&2 "Can't find cluster dir for $config!"
-			echo >&2 "Please remove extra (leading) spaces from /etc/%{name}/clusters.conf"
-			exit 1
-		fi
-		config_file="$clusterdir/mysqld.conf"
-	fi
-
-	if [ ! -f "$config_file" ]; then
-		echo >&2 "ERROR: Can't find real config file for $config! Please report this (with above errors, if any) to http://bugs.pld-linux.org/"
-		continue
-	fi
-	configs="$configs $config_file"
-done
-
-(
-echo 'You should run MySQL upgrade script *after* restarting MySQL server for all MySQL clusters.'
-echo 'Thus, you should invoke:'
-for config in $configs; do
-	sed -i -e '
-		s/set-variable\s*=\s* //
-		# use # as comment in config
-		s/^;/#/
-	' $config
-
-	datadir=$(awk -F= '!/^#/ && $1 ~ /datadir/{print $2}' $config | xargs)
-	echo "# mysql_upgrade --datadir=$datadir"
-done
-) | %banner -e %{name}-5.1
-
-%triggerpostun -- mysql < 5.5.0
-configs=""
-for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do
-	if echo "$config" | grep -q '^/'; then
-		config_file="$config"
-	elif [ -f "/etc/%{name}/$config" ]; then
-		config_file=/etc/%{name}/$config
-	else
-		clusterdir=$(awk -F= "/^$config/{print \$2}" /etc/%{name}/clusters.conf)
-		if [ -z "$clusterdir" ]; then
-			echo >&2 "Can't find cluster dir for $config!"
-			echo >&2 "Please remove extra (leading) spaces from /etc/%{name}/clusters.conf"
-			exit 1
-		fi
-		config_file="$clusterdir/mysqld.conf"
-	fi
-
-	if [ ! -f "$config_file" ]; then
-		echo >&2 "ERROR: Can't find real config file for $config! Please report this (with above errors, if any) to http://bugs.pld-linux.org/"
-		continue
-	fi
-	configs="$configs $config_file"
-done
-
-(
-echo 'You should run MySQL upgrade script *after* restarting MySQL server for all MySQL clusters.'
-echo 'Thus, you should invoke:'
-for config in $configs; do
-	sed -i -e '
-		s/^language *= *polish/lc-messages = pl_PL/i
-		s/set-variable\s*=\s* //
-		s/^skip-locking/skip-external-locking/
-		# this is not valid for server. it is client option
-		s/^default-character-set/# client-config: &/
-		# use # as comment in config
-		s/^;/#/
-	' $config
-
-	socket=$(awk -F= '!/^#/ && $1 ~ /socket/{print $2}' $config | xargs)
-	echo "# mysql_upgrade ${socket:+--socket=$socket}"
-done
-) | %banner -e %{name}-5.5
-
 %files
 %defattr(644,root,root,755)
 %doc build/support-files/*.cnf
@@ -956,57 +824,57 @@ done
 
 %if %{?debug:1}0
 %attr(755,root,root) %{_bindir}/*resolve_stack_dump
-%{_datadir}/%{_orgname}/mysqld.sym
+%{_datadir}/%{name}/mysqld.sym
 %{_mandir}/man1/*resolve_stack_dump.1*
 %endif
 
-%attr(700,mysql,mysql) %{_mysqlhome}
+%attr(700,mysql,mysql) %{_perconahome}
 # root:root is proper here for mysql.rpm while mysql:mysql is potential security hole
-%attr(751,root,root) /var/lib/mysql
-%attr(750,mysql,mysql) %dir /var/log/mysql
-%attr(750,mysql,mysql) %dir /var/log/archive/mysql
-%attr(640,mysql,mysql) %ghost /var/log/mysql/*
+%attr(751,root,root) /var/lib/%{name}
+%attr(750,mysql,mysql) %dir /var/log/%{name}
+%attr(750,mysql,mysql) %dir /var/log/archive/%{name}
+%attr(640,mysql,mysql) %ghost /var/log/%{name}/*
 
 # This is template for configuration file which is created after 'service mysql init'
-%{_datadir}/%{_orgname}/mysqld.conf
-%{_datadir}/%{_orgname}/mysql_security_commands.sql
-%{_datadir}/%{_orgname}/mysql_system_tables_data.sql
-%{_datadir}/%{_orgname}/mysql_system_tables.sql
-%{_datadir}/%{_orgname}/mysql_test_data_timezone.sql
-
-%{_datadir}/%{_orgname}/english
-%{_datadir}/%{_orgname}/dictionary.txt
-%{_datadir}/%{_orgname}/fill_help_tables.sql
-%{_datadir}/%{_orgname}/innodb_memcached_config.sql
-#%{_datadir}/%{_orgname}/mysql_fix_privilege_tables.sql
-%lang(bg) %{_datadir}/%{_orgname}/bulgarian
-%lang(cs) %{_datadir}/%{_orgname}/czech
-%lang(da) %{_datadir}/%{_orgname}/danish
-%lang(de) %{_datadir}/%{_orgname}/german
-%lang(el) %{_datadir}/%{_orgname}/greek
-%lang(es) %{_datadir}/%{_orgname}/spanish
-%lang(et) %{_datadir}/%{_orgname}/estonian
-%lang(fr) %{_datadir}/%{_orgname}/french
-%lang(hu) %{_datadir}/%{_orgname}/hungarian
-%lang(it) %{_datadir}/%{_orgname}/italian
-%lang(ja) %{_datadir}/%{_orgname}/japanese
-%lang(ko) %{_datadir}/%{_orgname}/korean
-%lang(nl) %{_datadir}/%{_orgname}/dutch
-%lang(nb) %{_datadir}/%{_orgname}/norwegian
-%lang(nn) %{_datadir}/%{_orgname}/norwegian-ny
-%lang(pl) %{_datadir}/%{_orgname}/polish
-%lang(pt) %{_datadir}/%{_orgname}/portuguese
-%lang(ro) %{_datadir}/%{_orgname}/romanian
-%lang(ru) %{_datadir}/%{_orgname}/russian
-%lang(sr) %{_datadir}/%{_orgname}/serbian
-%lang(sk) %{_datadir}/%{_orgname}/slovak
-%lang(sv) %{_datadir}/%{_orgname}/swedish
-%lang(uk) %{_datadir}/%{_orgname}/ukrainian
+%{_datadir}/%{name}/mysqld.conf
+%{_datadir}/%{name}/mysql_security_commands.sql
+%{_datadir}/%{name}/mysql_system_tables_data.sql
+%{_datadir}/%{name}/mysql_system_tables.sql
+%{_datadir}/%{name}/mysql_test_data_timezone.sql
+
+%{_datadir}/%{name}/english
+%{_datadir}/%{name}/dictionary.txt
+%{_datadir}/%{name}/fill_help_tables.sql
+%{_datadir}/%{name}/innodb_memcached_config.sql
+#%{_datadir}/%{name}/mysql_fix_privilege_tables.sql
+%lang(bg) %{_datadir}/%{name}/bulgarian
+%lang(cs) %{_datadir}/%{name}/czech
+%lang(da) %{_datadir}/%{name}/danish
+%lang(de) %{_datadir}/%{name}/german
+%lang(el) %{_datadir}/%{name}/greek
+%lang(es) %{_datadir}/%{name}/spanish
+%lang(et) %{_datadir}/%{name}/estonian
+%lang(fr) %{_datadir}/%{name}/french
+%lang(hu) %{_datadir}/%{name}/hungarian
+%lang(it) %{_datadir}/%{name}/italian
+%lang(ja) %{_datadir}/%{name}/japanese
+%lang(ko) %{_datadir}/%{name}/korean
+%lang(nl) %{_datadir}/%{name}/dutch
+%lang(nb) %{_datadir}/%{name}/norwegian
+%lang(nn) %{_datadir}/%{name}/norwegian-ny
+%lang(pl) %{_datadir}/%{name}/polish
+%lang(pt) %{_datadir}/%{name}/portuguese
+%lang(ro) %{_datadir}/%{name}/romanian
+%lang(ru) %{_datadir}/%{name}/russian
+%lang(sr) %{_datadir}/%{name}/serbian
+%lang(sk) %{_datadir}/%{name}/slovak
+%lang(sv) %{_datadir}/%{name}/swedish
+%lang(uk) %{_datadir}/%{name}/ukrainian
 
 %files charsets
 %defattr(644,root,root,755)
-%dir %{_datadir}/%{_orgname}
-%{_datadir}/%{_orgname}/charsets
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/charsets
 
 %files extras
 %defattr(644,root,root,755)
@@ -1027,7 +895,7 @@ done
 %{_mandir}/man1/replace.1*
 %{_mandir}/man1/resolveip.1*
 
-%files -n mysqlhotcopy
+%files mysqlhotcopy
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mysqlhotcopy
 %{_mandir}/man1/mysqlhotcopy.1*
@@ -1072,13 +940,13 @@ done
 
 %files libs
 %defattr(644,root,root,755)
-%attr(751,root,root) %dir %{_sysconfdir}/mysql
+%attr(751,root,root) %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/mysql-client.conf
 %{_sysconfdir}/%{name}/my.cnf
-%attr(755,root,root) %{_libdir}/libmysqlclient.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmysqlclient.so.18
-%attr(755,root,root) %{_libdir}/libmysqlclient_r.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmysqlclient_r.so.18
+%attr(755,root,root) %{_libdir}/libperconaserverclient.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libperconaserverclient.so.18
+%attr(755,root,root) %{_libdir}/libperconaserverclient_r.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libperconaserverclient_r.so.18
 %if %{with ndb}
 %attr(755,root,root) %{_libdir}/libndbclient.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libndbclient.so.3
@@ -1087,8 +955,8 @@ done
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mysql_config
-%attr(755,root,root) %{_libdir}/libmysqlclient.so
-%attr(755,root,root) %{_libdir}/libmysqlclient_r.so
+%attr(755,root,root) %{_libdir}/libperconaserverclient.so
+%attr(755,root,root) %{_libdir}/libperconaserverclient_r.so
 %if %{with ndb}
 %attr(755,root,root) %{_libdir}/libndbclient.so
 %endif
@@ -1100,8 +968,8 @@ done
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libmysqlclient.a
-%{_libdir}/libmysqlclient_r.a
+%{_libdir}/libperconaserverclient.a
+%{_libdir}/libperconaserverclient_r.a
 %if %{with ndb}
 %{_libdir}/libndbclient.a
 %endif
@@ -1125,8 +993,8 @@ done
 %files ndb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/ndbd
-%attr(754,root,root) /etc/rc.d/init.d/mysql-ndb
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql-ndb
+%attr(754,root,root) /etc/rc.d/init.d/%{name}-ndb
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}-ndb
 %{_mandir}/man1/ndbd_redo_log_reader.1*
 %{_mandir}/man8/ndbd.8*
 
@@ -1169,14 +1037,14 @@ done
 %files ndb-mgm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/ndb_mgmd
-%attr(754,root,root) /etc/rc.d/init.d/mysql-ndb-mgm
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql-ndb-mgm
+%attr(754,root,root) /etc/rc.d/init.d/%{name}-ndb-mgm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}-ndb-mgm
 %{_mandir}/man8/ndb_mgmd.8*
 
 %files ndb-cpc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/ndb_cpcd
 %attr(754,root,root) /etc/rc.d/init.d/mysql-ndb-cpc
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql-ndb-cpc
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}-ndb-cpc
 %{_mandir}/man1/ndb_cpcd.1*
 %endif
diff --git a/mysql-client.conf b/percona-server-client.conf
similarity index 100%
rename from mysql-client.conf
rename to percona-server-client.conf
diff --git a/mysql-clusters.conf b/percona-server-clusters.conf
similarity index 100%
rename from mysql-clusters.conf
rename to percona-server-clusters.conf
diff --git a/mysql-ndb-cpc.init b/percona-server-ndb-cpc.init
similarity index 52%
rename from mysql-ndb-cpc.init
rename to percona-server-ndb-cpc.init
index ad159b3..e307be3 100755
--- a/mysql-ndb-cpc.init
+++ b/percona-server-ndb-cpc.init
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# mysql-ndb-cpc		This shell script takes care of starting and stopping mysql-ndb-cpc.
+# percona-server-ndb-cpc		This shell script takes care of starting and stopping percona-server-ndb-cpc.
 #
 # chkconfig:	2345 80 30
-# description:	mysql-ndb-cpc is a mysql NDB engine
+# description:	percona-server-ndb-cpc is a percona-server NDB engine
 #
 # processname:	ndbd
 
@@ -14,14 +14,14 @@
 . /etc/sysconfig/network
 
 # Source oident configureation.
-if [ -f /etc/sysconfig/mysql-ndb-cpc ]; then
-	. /etc/sysconfig/mysql-ndb-cpc
+if [ -f /etc/sysconfig/percona-server-ndb-cpc ]; then
+	. /etc/sysconfig/percona-server-ndb-cpc
 fi
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-		msg_network_down mysql-ndb-cpc
+		msg_network_down percona-server-ndb-cpc
 		exit 1
 	fi
 else
@@ -30,33 +30,33 @@ fi
 
 start() {
 	# Start daemons.
-	if [ ! -f /var/lock/subsys/mysql-ndb-cpc ]; then
-		msg_starting "mysql ndb_cpcd"
+	if [ ! -f /var/lock/subsys/percona-server-ndb-cpc ]; then
+		msg_starting "percona-server ndb_cpcd"
 		daemon ndb_cpcd $MYSQL_NDB_CPC_OPT
 		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mysql-ndb-cpc
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/percona-server-ndb-cpc
 	else
-		msg_already_running "mysql ndb_cpcd"
+		msg_already_running "percona-server ndb_cpcd"
 	fi
 }
 
 stop() {
 	# Stop daemons.
-	if [ -f /var/lock/subsys/mysql-ndb-cpc ]; then
-		msg_stopping "mysql ndb_cpcd"
+	if [ -f /var/lock/subsys/percona-server-ndb-cpc ]; then
+		msg_stopping "percona-server ndb_cpcd"
 		killproc ndbd
-		rm -f /var/lock/subsys/mysql-ndb-cpc >/dev/null 2>&1
+		rm -f /var/lock/subsys/percona-server-ndb-cpc >/dev/null 2>&1
 	else
-		msg_not_running "mysql ndb_cpcd"
+		msg_not_running "percona-server ndb_cpcd"
 	fi
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/mysql-ndb-cpc ]; then
+	if [ -f /var/lock/subsys/percona-server-ndb-cpc ]; then
 		stop
 		start
 	else
-		msg_not_running "mysql ndb_cpcd"
+		msg_not_running "percona-server ndb_cpcd"
 		RETVAL=$1
 	fi
 }
diff --git a/mysql-ndb-cpc.sysconfig b/percona-server-ndb-cpc.sysconfig
similarity index 100%
rename from mysql-ndb-cpc.sysconfig
rename to percona-server-ndb-cpc.sysconfig
diff --git a/mysql-ndb-mgm.init b/percona-server-ndb-mgm.init
similarity index 52%
rename from mysql-ndb-mgm.init
rename to percona-server-ndb-mgm.init
index 0f9681c..fccdacf 100755
--- a/mysql-ndb-mgm.init
+++ b/percona-server-ndb-mgm.init
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# mysql-ndb-mgm		This shell script takes care of starting and stopping mysql-ndb-mgm.
+# percona-server-ndb-mgm		This shell script takes care of starting and stopping percona-server-ndb-mgm.
 #
 # chkconfig:	2345 80 30
-# description:	mysql-ndb-mgm is a mysql NDB engine
+# description:	percona-server-ndb-mgm is a percona-server NDB engine
 #
 # processname:	ndbd
 
@@ -14,14 +14,14 @@
 . /etc/sysconfig/network
 
 # Source oident configureation.
-if [ -f /etc/sysconfig/mysql-ndb-mgm ]; then
-	. /etc/sysconfig/mysql-ndb-mgm
+if [ -f /etc/sysconfig/percona-server-ndb-mgm ]; then
+	. /etc/sysconfig/percona-server-ndb-mgm
 fi
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-		msg_network_down mysql-ndb-mgm
+		msg_network_down percona-server-ndb-mgm
 		exit 1
 	fi
 else
@@ -30,33 +30,33 @@ fi
 
 start() {
 	# Start daemons.
-	if [ ! -f /var/lock/subsys/mysql-ndb-mgm ]; then
-		msg_starting "mysql ndb_mgmd"
+	if [ ! -f /var/lock/subsys/percona-server-ndb-mgm ]; then
+		msg_starting "percona-server ndb_mgmd"
 		daemon ndb_mgmd $MYSQL_NDB_MGM_OPT
 		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mysql-ndb-mgm
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/percona-server-ndb-mgm
 	else
-		msg_already_running "mysql ndb_mgmd"
+		msg_already_running "percona-server ndb_mgmd"
 	fi
 }
 
 stop() {
 	# Stop daemons.
-	if [ -f /var/lock/subsys/mysql-ndb-mgm ]; then
-		msg_stopping "mysql ndb_mgmd"
+	if [ -f /var/lock/subsys/percona-server-ndb-mgm ]; then
+		msg_stopping "percona-server ndb_mgmd"
 		killproc ndbd
-		rm -f /var/lock/subsys/mysql-ndb-mgm >/dev/null 2>&1
+		rm -f /var/lock/subsys/percona-server-ndb-mgm >/dev/null 2>&1
 	else
-		msg_not_running "mysql ndb_mgmd"
+		msg_not_running "percona-server ndb_mgmd"
 	fi
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/mysql-ndb-mgm ]; then
+	if [ -f /var/lock/subsys/percona-server-ndb-mgm ]; then
 		stop
 		start
 	else
-		msg_not_running "mysql ndb_mgmd"
+		msg_not_running "percona-server ndb_mgmd"
 		RETVAL=$1
 	fi
 }
diff --git a/mysql-ndb-mgm.sysconfig b/percona-server-ndb-mgm.sysconfig
similarity index 100%
rename from mysql-ndb-mgm.sysconfig
rename to percona-server-ndb-mgm.sysconfig
diff --git a/mysql-ndb.init b/percona-server-ndb.init
similarity index 53%
rename from mysql-ndb.init
rename to percona-server-ndb.init
index 0374a48..ffaf92c 100755
--- a/mysql-ndb.init
+++ b/percona-server-ndb.init
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# mysql-ndb		This shell script takes care of starting and stopping mysql-ndb.
+# percona-server-ndb		This shell script takes care of starting and stopping percona-server-ndb.
 #
 # chkconfig:	2345 80 30
-# description:	mysql-ndb is a mysql NDB engine
+# description:	percona-server-ndb is a percona-server NDB engine
 #
 # processname:	ndbd
 
@@ -14,14 +14,14 @@
 . /etc/sysconfig/network
 
 # Source oident configureation.
-if [ -f /etc/sysconfig/mysql-ndb ]; then
-	. /etc/sysconfig/mysql-ndb
+if [ -f /etc/sysconfig/percona-server-ndb ]; then
+	. /etc/sysconfig/percona-server-ndb
 fi
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-		msg_network_down mysql-ndb
+		msg_network_down percona-server-ndb
 		exit 1
 	fi
 else
@@ -30,33 +30,33 @@ fi
 
 start() {
 	# Start daemons.
-	if [ ! -f /var/lock/subsys/mysql-ndb ]; then
-		msg_starting "mysql ndbd"
+	if [ ! -f /var/lock/subsys/percona-server-ndb ]; then
+		msg_starting "percona-server ndbd"
 		daemon ndbd $MYSQL_NDB_OPT
 		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mysql-ndb
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/percona-server-ndb
 	else
-		msg_already_running "mysql ndbd"
+		msg_already_running "percona-server ndbd"
 	fi
 }
 
 stop() {
 	# Stop daemons.
-	if [ -f /var/lock/subsys/mysql-ndb ]; then
-		msg_stopping "mysql ndbd"
+	if [ -f /var/lock/subsys/percona-server-ndb ]; then
+		msg_stopping "percona-server ndbd"
 		killproc ndbd
-		rm -f /var/lock/subsys/mysql-ndb >/dev/null 2>&1
+		rm -f /var/lock/subsys/percona-server-ndb >/dev/null 2>&1
 	else
-		msg_not_running "mysql ndbd"
+		msg_not_running "percona-server ndbd"
 	fi
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/mysql-ndb ]; then
+	if [ -f /var/lock/subsys/percona-server-ndb ]; then
 		stop
 		start
 	else
-		msg_not_running "mysql ndbd"
+		msg_not_running "percona-server ndbd"
 		RETVAL=$1
 	fi
 }
diff --git a/mysql-ndb.sysconfig b/percona-server-ndb.sysconfig
similarity index 100%
rename from mysql-ndb.sysconfig
rename to percona-server-ndb.sysconfig
diff --git a/mysql.init b/percona-server.init
similarity index 72%
rename from mysql.init
rename to percona-server.init
index 62d68e2..bcd8475 100755
--- a/mysql.init
+++ b/percona-server.init
@@ -13,30 +13,30 @@
 . /etc/sysconfig/network
 
 # Get service config
-if [ -f /etc/sysconfig/mysql ]; then
-	. /etc/sysconfig/mysql
+if [ -f /etc/sysconfig/percona-server ]; then
+	. /etc/sysconfig/percona-server
 else
-	nls "Error: %s not found" /etc/sysconfig/mysql
-	nls "%s can't be run." MySQL
+	nls "Error: %s not found" /etc/sysconfig/percona-server
+	nls "%s can't be run." percona-server
 	exit 1
 fi
 
 if [ -n "$MYSQL_DB_CLUSTERS" ]; then
-	nls "Warning: MYSQL_DB_CLUSTERS is set. It's obsolete. Use %s instead." /etc/mysql/clusters.conf
+	nls "Warning: MYSQL_DB_CLUSTERS is set. It's obsolete. Use %s instead." /etc/percona-server/clusters.conf
 fi
 
-if [ -f /etc/mysql/clusters.conf ]; then
-	MYSQL_DB_CLUSTERS=$(awk -F= '!/^#/ && /=/{print $2}' /etc/mysql/clusters.conf)
+if [ -f /etc/percona-server/clusters.conf ]; then
+	MYSQL_DB_CLUSTERS=$(awk -F= '!/^#/ && /=/{print $2}' /etc/percona-server/clusters.conf)
 	if [ -z "$MYSQL_DB_CLUSTERS" ]; then
 		nls "Warning: there are no configured clusters."
 	fi
 
 else
-	nls "Warning: Missing clusters config file %s" /etc/mysql/clusters.conf
+	nls "Warning: Missing clusters config file %s" /etc/percona-server/clusters.conf
 	if [ -z "$MYSQL_DB_CLUSTERS" ]; then
 		nls "Warning: there are no configured clusters."
-		nls "Using default cluster /var/lib/mysql (compatibility mode)"
-		MYSQL_DB_CLUSTERS=/var/lib/mysql
+		nls "Using default cluster /var/lib/percona-server (compatibility mode)"
+		MYSQL_DB_CLUSTERS=/var/lib/percona-server
 	fi
 fi
 
@@ -44,7 +44,7 @@ fi
 # Check that networking is up
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status -a "$1" != init ]; then
-		msg_network_down MySQL
+		msg_network_down percona-server
 		exit 1
 	fi
 else
@@ -60,9 +60,9 @@ if [ $# -gt 1 ]; then
 	shift
 	# perform action for specified clusters only
 	for a in "$@"; do
-		# try auto resolving from /etc/mysql/clusters.conf
+		# try auto resolving from /etc/percona-server/clusters.conf
 		if [[ "$a" != /* ]]; then
-			m=$(awk -va="$a" -F= 'substr($0, 1, length(a)) == a {print $1}' /etc/mysql/clusters.conf)
+			m=$(awk -va="$a" -F= 'substr($0, 1, length(a)) == a {print $1}' /etc/percona-server/clusters.conf)
 			if [ -z "$m" ]; then
 				echo >&2 "Cluster name '$a' did not match anything!"
 				exit 1
@@ -71,7 +71,7 @@ if [ $# -gt 1 ]; then
 				echo >&2 "Cluster name '$a' ambiguous:" $m
 				exit 1
 			fi
-			a=$(awk -va="$a" -F= 'substr($0, 1, length(a)) == a {print $2}' /etc/mysql/clusters.conf)
+			a=$(awk -va="$a" -F= 'substr($0, 1, length(a)) == a {print $2}' /etc/percona-server/clusters.conf)
 		fi
 		DB_CLUSTERS="$DB_CLUSTERS $a"
 	done
@@ -80,7 +80,7 @@ else
 fi
 
 # global error log, if mysqld.conf hasn't migrated to log-error style
-MYSQL_ERRLOG=/var/log/mysql/mysqld.log
+MYSQL_ERRLOG=/var/log/percona-server/percona-serverd.log
 MYSQL_STOP_WAIT_TIME=${MYSQL_STOP_WAIT_TIME:-900}
 
 #
@@ -88,7 +88,7 @@ MYSQL_STOP_WAIT_TIME=${MYSQL_STOP_WAIT_TIME:-900}
 #
 
 #
-# check for mysql status
+# check for percona-server status
 #
 # arguments:
 # $1 - db cluster
@@ -96,7 +96,7 @@ MYSQL_STOP_WAIT_TIME=${MYSQL_STOP_WAIT_TIME:-900}
 #
 # sets variables:
 # MYSQL_STATUS = starting | running | not running | died
-# MYSQL_PID    = pid of mysqld process
+# MYSQL_PID    = pid of percona-server process
 #
 mysqlstatus() {
 	clusterdir="$1"
@@ -125,7 +125,7 @@ mysqlstatus() {
 	fi
 
 	if [ "$mode" = "start" ]; then
-		MYSQL_GREP_PID=$(grep -alE "^/usr/sbin/mysqld.*${MYSQL_PIDFILE}" /proc/[0-9]*/cmdline 2> /dev/null | awk -F "/" '{ print $3; exit; }')
+		MYSQL_GREP_PID=$(grep -alE "^/usr/sbin/percona-serverd.*${MYSQL_PIDFILE}" /proc/[0-9]*/cmdline 2> /dev/null | awk -F "/" '{ print $3; exit; }')
 		if [ -n "$MYSQL_GREP_PID" ]; then
 			MYSQL_PID=$MYSQL_GREP_PID
 			if grep -qa "$MYSQL_PIDFILE" /proc/$MYSQL_PID/cmdline 2> /dev/null; then
@@ -160,17 +160,17 @@ mysqlgetconfig() {
 	local mode="$2"
 
 	# emulate old behaviour if only one cluster specified
-	if [ "$clusterdir" = "$MYSQL_DB_CLUSTERS" -a "$clusterdir" = "/var/lib/mysql" -a -f /etc/mysqld.conf ]; then
+	if [ "$clusterdir" = "$MYSQL_DB_CLUSTERS" -a "$clusterdir" = "/var/lib/percona-server" -a -f /etc/percona-serverd.conf ]; then
 		MYSQL_RA_COMPAT=yes
-		config_file=/etc/mysqld.conf
+		config_file=/etc/percona-serverd.conf
 	else
-		local config=$(awk -F= -vclusterdir="$clusterdir" '!/^#/{ if (clusterdir == $2) print $1}' /etc/mysql/clusters.conf)
+		local config=$(awk -F= -vclusterdir="$clusterdir" '!/^#/{ if (clusterdir == $2) print $1}' /etc/percona-server/clusters.conf)
 		if [[ $config = /* ]]; then
 			config_file="$config"
-		elif [ -f "/etc/mysql/$config" ]; then
-			config_file="/etc/mysql/$config"
+		elif [ -f "/etc/percona-server/$config" ]; then
+			config_file="/etc/percona-server/$config"
 		else
-			config_file="$clusterdir/mysqld.conf"
+			config_file="$clusterdir/percona-serverd.conf"
 		fi
 	fi
 
@@ -189,7 +189,7 @@ mysqlgetconfig() {
 
 	if [ ! -f "$config_file" ]; then
 		nls "Error: config file %s not found" "$config_file"
-		nls "MySQL can't be run. Did you initialize DB by doing \`$0 init'?"
+		nls "percona-server can't be run. Did you initialize DB by doing \`$0 init'?"
 		if [ "$mode" = "status" ]; then 
 			exit 3
 		else
@@ -251,23 +251,23 @@ mysqlgetconfig() {
 	if is_yes "$MYSQL_RA_COMPAT"; then
 		MYSQL_DATA_DIR_SUB=""
 	else
-		MYSQL_DATA_DIR_SUB="/mysqldb"
+		MYSQL_DATA_DIR_SUB="/percona-serverdb"
 	fi
 
 	if [ -z "$MYSQL_DATA_DIR" -o "$MYSQL_DATA_DIR" != "${clusterdir}${MYSQL_DATA_DIR_SUB}/db" ]; then
 		nls "Error: datadir specified in %s should be %s" "$config_file" "$clusterdir${MYSQL_DATA_DIR_SUB}/db"
-		nls " MySQL can't be run."
+		nls " percona-server can't be run."
 		exit 6
 	fi
 
-	if [ -z "$MYSQL_PIDFILE" -o "$MYSQL_PIDFILE" != "$clusterdir${MYSQL_DATA_DIR_SUB}/mysql.pid" ]; then
-		nls "Error: pid-file specified in %s should be %s" "$config_file" "$clusterdir${MYSQL_DATA_DIR_SUB}/mysql.pid"
-		nls " MySQL can't be run."
+	if [ -z "$MYSQL_PIDFILE" -o "$MYSQL_PIDFILE" != "$clusterdir${MYSQL_DATA_DIR_SUB}/percona-server.pid" ]; then
+		nls "Error: pid-file specified in %s should be %s" "$config_file" "$clusterdir${MYSQL_DATA_DIR_SUB}/percona-server.pid"
+		nls " percona-server can't be run."
 		exit 6
 	fi
 
 	if [ -z "$MYSQL_USER" ]; then
-		echo "$(nls 'MySQL user not configured properly')"'!' >&2
+		echo "$(nls 'percona-server user not configured properly')"'!' >&2
 		nls "Edit %s and configure it." "$config_file" >&2
 		exit 6
 	fi
@@ -277,19 +277,19 @@ mysqlgetconfig() {
 mysqlstart() {
 	local clusterdir="$1"
 	mysqlgetconfig "$clusterdir"
-	if [ ! -d "$MYSQL_DATA_DIR/mysql" ]; then
-		nls "MySQL cluster %s not initialized." "$clusterdir"
+	if [ ! -d "$MYSQL_DATA_DIR/percona-server" ]; then
+		nls "percona-server cluster %s not initialized." "$clusterdir"
 		nls "Try \`%s init %s' before start." "$0" "$clusterdir"
 		exit 6
 	fi
 
-	msg_starting "MySQL $clusterdir"; busy
+	msg_starting "percona-server $clusterdir"; busy
 	[ -z "$DEFAULT_SERVICE_RUN_NICE_LEVEL" ] && DEFAULT_SERVICE_RUN_NICE_LEVEL=0
 	rm -f "$MYSQL_PIDFILE"
 
 
 	TMPDIR=/tmp nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} \
-		/usr/bin/setsid /usr/sbin/mysqld \
+		/usr/bin/setsid /usr/sbin/percona-serverd \
 			--defaults-file=$MYSQL_CONFIG \
 			--datadir=$MYSQL_DATA_DIR \
 			--pid-file=$MYSQL_PIDFILE \
@@ -302,7 +302,7 @@ mysqlstart() {
 	# it takes longer for mysqld to start and create pidfile if it has to recover innodb transactions
 	if [ "$MYSQL_STATUS" = "starting" ]; then
 		echo ""
-		show "Waiting for MySQL to start"
+		show "Waiting for percona-server to start"
 		busy
 
 		# while the pid is running, mysql is starting up
@@ -331,12 +331,12 @@ mysqlstart() {
 mysqlstop() {
 	local clusterdir="$1"
 	mysqlstatus "$clusterdir" stop
-	msg_stopping "MySQL $clusterdir"
+	msg_stopping "percona-server $clusterdir"
 	busy
 
 	# try graceful shutdown -- send shutdown command
 	# requires mysql_sysadmin user proper privs
-	/usr/bin/mysqladmin --defaults-file=$MYSQL_CONFIG ${MYSQL_SOCKET:+--socket=$MYSQL_SOCKET} shutdown >/dev/null 2>&1
+	/usr/bin/percona-serveradmin --defaults-file=$MYSQL_CONFIG ${MYSQL_SOCKET:+--socket=$MYSQL_SOCKET} shutdown >/dev/null 2>&1
 	mysqlstatus "$clusterdir" stop
 
 	if [ "$MYSQL_PID" != "unknown" ]; then
@@ -360,7 +360,7 @@ mysqlstop() {
 # report slave status
 # uses MYSQL_SOCKET - path to mysql socket
 slave_status() {
-	if [ ! -x /usr/bin/mysql ]; then
+	if [ ! -x /usr/bin/percona-server ]; then
 		echo >&2 "Slave status not available: 'mysql' program not installed."
 		return
 	fi
@@ -426,76 +426,76 @@ mysqlsubsys() {
 	for mysqldir in $DB_CLUSTERS; do
 		mysqlstatus "$mysqldir"
 		if [ "$MYSQL_STATUS" = "running" ]; then
-			touch /var/lock/subsys/mysql
+			touch /var/lock/subsys/percona-server
 			return
 		fi
 	done
-	rm -f /var/lock/subsys/mysql
+	rm -f /var/lock/subsys/percona-server
 }
 
 mysqlinit() {
 	local clusterdir="$1"
 
-	if [ -f /etc/mysqld.conf ]; then
+	if [ -f /etc/percona-serverd.conf ]; then
 		nls "Running in \`no cluster compat' mode: can't initialize database."
-		nls "Move /etc/mysqld.conf away and rerun \`$0 init' (new config will be in $clusterdir)."
+		nls "Move /etc/percona-serverd.conf away and rerun \`$0 init' (new config will be in $clusterdir)."
 		exit 1
 	fi
 
-	if [ -f "$clusterdir/mysqld.conf" ]; then
+	if [ -f "$clusterdir/percona-serverd.conf" ]; then
 		mysqlgetconfig "$clusterdir"
 	else
 		MYSQL_USER="mysql"
 		MYSQL_CLUSTER_DIR="$clusterdir"
-		MYSQL_DATA_DIR="$clusterdir/mysqldb/db"
-		MYSQL_PIDFILE="$clusterdir/mysqldb/mysql.pid"
-		MYSQL_SOCKET="$clusterdir/mysqldb/mysql.sock"
+		MYSQL_DATA_DIR="$clusterdir/percona-serverdb/db"
+		MYSQL_PIDFILE="$clusterdir/percona-serverdb/percona-server.pid"
+		MYSQL_SOCKET="$clusterdir/percona-serverdb/percona-server.sock"
 
 		# this $MYSQL_CONFIG will be created later
-		MYSQL_CONFIG="$MYSQL_CLUSTER_DIR/mysqld.conf"
+		MYSQL_CONFIG="$MYSQL_CLUSTER_DIR/percona-serverd.conf"
 	fi
 
 	show "Initializing cluster %s" "$clusterdir"; started
 
 	# Check if not exist init database
-	if [ -d "$MYSQL_DATA_DIR/mysql" ]; then
-		nls "Seems that database is initialized now. Remove by hand %s" "$MYSQL_DATA_DIR/mysql"
+	if [ -d "$MYSQL_DATA_DIR/percona-server" ]; then
+		nls "Seems that database is initialized now. Remove by hand %s" "$MYSQL_DATA_DIR/percona-server"
 		nls "before initializing database."
 		nls "For now skipping cluster %s." "$clusterdir"
 		exit 6
 	fi
 
-	show "Installing MySQL system tables for $MYSQL_DATA_DIR"
+	show "Installing percona-server system tables for $MYSQL_DATA_DIR"
 	busy
 	TMP=/tmp TMPDIR=/tmp
 
 	mkdir -p "$MYSQL_DATA_DIR" > /dev/null 2>&1
 	# Using mysql:mysql for MYSQL_CLUSTER_DIR is creating SECURITY hole, root:root is proper
 	chown root:root "$MYSQL_CLUSTER_DIR"
-	chown mysql:mysql "$MYSQL_CLUSTER_DIR/mysqldb" "$MYSQL_DATA_DIR" > /dev/null 2>&1
-	chmod 751 "$MYSQL_CLUSTER_DIR" "$MYSQL_CLUSTER_DIR/mysqldb"
+	chown mysql:mysql "$MYSQL_CLUSTER_DIR/percona-serverdb" "$MYSQL_DATA_DIR" > /dev/null 2>&1
+	chmod 751 "$MYSQL_CLUSTER_DIR" "$MYSQL_CLUSTER_DIR/percona-serverdb"
 
-	if [ -f $sharedir/mysqld.conf -a ! -f "$MYSQL_CLUSTER_DIR/mysqld.conf" ]; then
+	if [ -f $sharedir/percona-serverd.conf -a ! -f "$MYSQL_CLUSTER_DIR/percona-serverd.conf" ]; then
 		sed -e "
 			s#\(datadir.*\)=.*#\1= $MYSQL_DATA_DIR#g;
 			s#\(pid-file.*\)=.*#\1= $MYSQL_PIDFILE#g;
 			s#\(socket.*\)=.*#\1= $MYSQL_SOCKET#g;
 			s#@clusterdir@#$MYSQL_CLUSTER_DIR#g;
-		" $sharedir/mysqld.conf > "$MYSQL_CLUSTER_DIR/mysqld.conf"
-		chown root:root "$MYSQL_CLUSTER_DIR/mysqld.conf"
-		chmod 640 "$MYSQL_CLUSTER_DIR/mysqld.conf"
+		" $sharedir/percona-serverd.conf > "$MYSQL_CLUSTER_DIR/percona-serverd.conf"
+		chown root:root "$MYSQL_CLUSTER_DIR/percona-serverd.conf"
+		chmod 640 "$MYSQL_CLUSTER_DIR/percona-serverd.conf"
 	fi
 
-	cat > $MYSQL_DATA_DIR/mysql-init.sql <<-EOF
+	cat > $MYSQL_DATA_DIR/percona-server-init.sql <<-EOF
 		CREATE DATABASE mysql;
 		use mysql;
-		$(cat $sharedir/mysql_system_tables.sql)
-		$(sed -e "/@current_hostname/d" $sharedir/mysql_system_tables_data.sql)
+		$(cat $sharedir/percona-server_system_tables.sql)
+		$(sed -e "/@current_hostname/d" $sharedir/percona-server_system_tables_data.sql)
 EOF
 
 	ok=0
-	/usr/sbin/mysqld \
-		--defaults-file=$MYSQL_CLUSTER_DIR/mysqld.conf \
+	/usr/sbin/percona-serverd \
+		--defaults-file=$MYSQL_CLUSTER_DIR/percona-serverd.conf \
 		--bootstrap \
 		--skip-grant-tables \
 		--datadir=$MYSQL_DATA_DIR \
@@ -503,15 +503,15 @@ EOF
 		--slave-load-tmpdir=$MYSQL_DATA_DIR \
 		--tmpdir=$MYSQL_DATA_DIR \
 		--log-error=$MYSQL_ERRLOG \
-		< $MYSQL_DATA_DIR/mysql-init.sql && ok=1
-	[ -f $MYSQL_DATA_DIR/mysql/user.frm ] || ok=0
+		< $MYSQL_DATA_DIR/percona-server-init.sql && ok=1
+	[ -f $MYSQL_DATA_DIR/percona-server/user.frm ] || ok=0
 
 	if [ "$ok" = 1 ]; then
-		rm -f $MYSQL_DATA_DIR/mysql-init.sql
+		rm -f $MYSQL_DATA_DIR/percona-server-init.sql
 		ok
 		cat << END_OF_MSG
 
-PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL USERS!
+PLEASE REMEMBER TO SET A PASSWORD FOR THE percona-server USERS!
 This is done, after starting database, in the order shown,
 with:
 
@@ -529,8 +529,8 @@ END_OF_MSG
 		show "Filling help tables..."
 		ok=0
 		( echo "use mysql;"; cat $sharedir/fill_help_tables.sql ) | \
-			/usr/sbin/mysqld \
-			--defaults-file=$MYSQL_CLUSTER_DIR/mysqld.conf \
+			/usr/sbin/percona-serverd \
+			--defaults-file=$MYSQL_CLUSTER_DIR/percona-serverd.conf \
 			--bootstrap \
 			--skip-grant-tables \
 			--datadir=$MYSQL_DATA_DIR \
@@ -558,9 +558,9 @@ ERROR: Installation of grant tables FAILED!
 ERROR:
 ERROR:
 
-The initialization SQL script was preserved at $MYSQL_DATA_DIR/mysql-init.sql
+The initialization SQL script was preserved at $MYSQL_DATA_DIR/percona-server-init.sql
 
-Examine the logs in /var/log/mysql for more information. You can
+Examine the logs in /var/log/percona-server for more information. You can
 also try to start the mysqld daemon with:
 
 /usr/sbin/mysqld --skip-grant &
@@ -572,28 +572,28 @@ shell> mysql -u mysql mysql
 mysql> show tables
 
 Try 'mysqld --help' if you have problems with paths. Setting on
-logging in $MYSQL_DATA_DIR/mysqld.conf gives you a log in /var/log/mysql/query.log that
-may be helpful. The latest information about MySQL is available on the
-web at http://www.mysql.com/.
+logging in $MYSQL_DATA_DIR/percona-serverd.conf gives you a log in /var/log/percona-server/query.log that
+may be helpful. The latest information about percona-server is available on the
+web at https://www.percona.com/software/mysql-database/percona-server.
 
 Please check PLD Linux ftp site for newer versions of this package.
 
-Please consult the MySQL manual section: 'Problems running
+Please consult the percona-server manual section: 'Problems running
 mysql_install_db', and the manual section that describes problems on
-your OS. Another information source is the MySQL email archive.
+your OS. Another information source is the percona-server email archive.
 
 END_OF_MSG
 		exit 1
 	fi
 
 	# if it's first server, register as default
-	if [ ! -e /var/lib/mysql/mysql.sock ] || [ -L /var/lib/mysql/mysql.sock ] && [ -z "$(readlink /var/lib/mysql/mysql.sock)" ]; then
-		sock=${MYSQL_SOCKET#/var/lib/mysql/} # make it relative if possible
-		ln -s "$sock" /var/lib/mysql/mysql.sock
+	if [ ! -e /var/lib/percona-server/percona-server.sock ] || [ -L /var/lib/percona-server/percona-server.sock ] && [ -z "$(readlink /var/lib/percona-server/percona-server.sock)" ]; then
+		sock=${MYSQL_SOCKET#/var/lib/percona-server/} # make it relative if possible
+		ln -s "$sock" /var/lib/percona-server/percona-server.sock
 	fi
 	# same for config, move to /etc
-	if [ ! -e /etc/mysql/mysqld.conf ]; then
-		mv "$MYSQL_CLUSTER_DIR/mysqld.conf" /etc/mysql/mysqld.conf
+	if [ ! -e /etc/percona-server/percona-serverd.conf ]; then
+		mv "$MYSQL_CLUSTER_DIR/percona-serverd.conf" /etc/percona-server/percona-serverd.conf
 	fi
 }
 
@@ -606,7 +606,7 @@ start() {
 	for mysqldir in $DB_CLUSTERS; do
 		mysqlstatus "$mysqldir" start
 		if [ "$MYSQL_STATUS" = "running" ]; then
-			msg_already_running "MySQL $mysqldir"
+			msg_already_running "percona-server $mysqldir"
 		else
 			mysqlstart "$mysqldir"
 		fi
@@ -619,7 +619,7 @@ stop() {
 	for mysqldir in $DB_CLUSTERS; do
 		mysqlstatus "$mysqldir" stop
 		if [ "$MYSQL_STATUS" = "not running" ]; then
-			msg_not_running "MySQL $mysqldir"
+			msg_not_running "percona-server $mysqldir"
 		else
 			mysqlstop "$mysqldir"
 		fi
@@ -628,8 +628,8 @@ stop() {
 }
 
 condrestart() {
-	if [ ! -f /var/lock/subsys/mysql ]; then
-		msg_not_running "MySQL"
+	if [ ! -f /var/lock/subsys/percona-server ]; then
+		msg_not_running "percona-server"
 		RETVAL=$1
 		return
 	fi
@@ -647,9 +647,9 @@ status() {
 			RETVAL=0
 			addr=${MYSQL_BIND_ADDRESS:-0.0.0.0}
 			port=${MYSQL_PORT:-3306}
-			socket=${MYSQL_SOCKET:-/var/lib/mysql/mysql.sock}
+			socket=${MYSQL_SOCKET:-/var/lib/percona-server/percona-server.sock}
 			pid=$MYSQL_PID
-			nls "MySQL cluster %s, pid %s\n" "$mysqldir" "$pid"
+			nls "percona-server cluster %s, pid %s\n" "$mysqldir" "$pid"
 			[ -z "$MYSQL_SKIP_NETWORKING" ] && nls "\ttcp:%s:%s\n" "$addr" "$port"
 			nls "\tunix: %s\n" "$socket"
 
@@ -658,7 +658,7 @@ status() {
 			pids="$pids/$MYSQL_PID/"
 			progress "$MYSQL_STATUS"
 		else
-			show "MySQL cluster %s" "$mysqldir"
+			show "percona-server cluster %s" "$mysqldir"
 			progress "$MYSQL_STATUS" "$CFAIL"
 		fi
 		echo
@@ -671,18 +671,18 @@ status() {
 	done
 
 	if [ $# = 1 -a "$running" ]; then
-		nls "Warning: MySQL Daemon processes not under clusters.conf control:"
+		nls "Warning: percona-server Daemon processes not under clusters.conf control:"
 		# see if we can display their status
 		for pid in $running; do
 			datadir=$(cat /proc/$pid/cmdline | tr '\0' '\n' | fgrep -- --datadir=)
 			datadir=${datadir#--datadir=} # strip --datadir
-			mysqldir=${datadir%/mysqldb/db} # strip /mysqldb/db
+			mysqldir=${datadir%/percona-serverdb/db} # strip /percona-serverdb/db
 			mysqlstatus "$mysqldir"
 			if [ "$MYSQL_STATUS" = "running" ]; then
 				addr=${MYSQL_BIND_ADDRESS:-0.0.0.0}
 				port=${MYSQL_PORT:-3306}
-				socket=${MYSQL_SOCKET:-/var/lib/mysql/mysql.sock}
-				nls "MySQL cluster %s, pid %s\n" "$mysqldir" "$pid"
+				socket=${MYSQL_SOCKET:-/var/lib/percona-server/percona-server.sock}
+				nls "percona-server cluster %s, pid %s\n" "$mysqldir" "$pid"
 				[ -z "$MYSQL_SKIP_NETWORKING" ] && nls "\ttcp:%s:%s\n" "$addr" "$port"
 				nls "\tunix: %s\n" "$socket"
 
@@ -690,7 +690,7 @@ status() {
 
 				progress "$MYSQL_STATUS"
 			else
-				show "MySQL cluster %s" "$mysqldir"
+				show "percona-server cluster %s" "$mysqldir"
 				progress "$MYSQL_STATUS" "$CFAIL"
 			fi
 			echo
diff --git a/mysql.logrotate b/percona-server.logrotate
similarity index 100%
rename from mysql.logrotate
rename to percona-server.logrotate
diff --git a/mysql.sysconfig b/percona-server.sysconfig
similarity index 100%
rename from mysql.sysconfig
rename to percona-server.sysconfig
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/26c94b7a598465780be9aecd54e9b602fd72d5ee



More information about the pld-cvs-commit mailing list