diff options
| author |   Tom William Payne <twp@gentoo.org> | 2004-06-27 11:37:11 +0000 |
|---|---|---|
| committer | Tom William Payne <twp@gentoo.org> | 2004-06-27 11:37:11 +0000 |
| commit | 80f7cb80eb212add5c1b7f5adfc4b3529bc73be3 (patch) | |
| tree | 9c53410de9a6365de9914a91b6d0feb34fc051d3 /dev-db | |
| parent | Added to ~ppc (Manifest recommit) (diff) | |
| download | gentoo-2-80f7cb80eb212add5c1b7f5adfc4b3529bc73be3.tar.gz gentoo-2-80f7cb80eb212add5c1b7f5adfc4b3529bc73be3.tar.bz2 gentoo-2-80f7cb80eb212add5c1b7f5adfc4b3529bc73be3.zip | |
Bug # 53220.
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/phpmyadmin/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6 | 2 | ||||
| -rw-r--r-- | dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog index fa11df1f6bcf..5e3b688934d1 100644 --- a/dev-db/phpmyadmin/ChangeLog +++ b/dev-db/phpmyadmin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/phpmyadmin # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.49 2004/06/27 11:31:40 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.50 2004/06/27 11:37:11 twp Exp $ + + 27 Jun 2004; <twp@gentoo.org> files/mysql-setup.sql.in-2.5.6, + phpmyadmin-2.5.7.ebuild: + Bug # 53220. *phpmyadmin-2.5.7 (27 Jun 2004) diff --git a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6 b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6 index 147c07f721b8..d5853baf01b4 100644 --- a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6 +++ b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6 @@ -16,7 +16,7 @@ CREATE DATABASE IF NOT EXISTS pmadb; USE pmadb; CREATE TABLE IF NOT EXISTS `PMA_bookmark` ( - `id` int(11) DEFAULT '0' NOT NULL auto_increment, + `id` int(11) DEFAULT NULL NOT NULL auto_increment, `dbase` varchar(255) NOT NULL, `user` varchar(255) NOT NULL, `label` varchar(255) NOT NULL, diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild index dfb08871e529..ef9d75145c63 100644 --- a/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild,v 1.1 2004/06/27 11:31:40 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild,v 1.2 2004/06/27 11:37:11 twp Exp $ inherit eutils webapp @@ -35,7 +35,7 @@ src_compile() { sed -e "s/@pmapass@/${pmapass}/g" \ ${T}/config.inc.php > config.inc.php sed -e "s/@pmapass@/${pmapass}/g" \ - ${FILESDIR}/mysql-setup.sql.in-${PV} > ${T}/mysql-setup.sql + ${FILESDIR}/mysql-setup.sql.in-2.5.6 > ${T}/mysql-setup.sql } src_install() { |