Sat Oct 26 01:21:13 PDT 2013

author: root <root@rshg054.dnsready.net> 2013-10-26 01:22:45 -0700
committer: root <root@rshg054.dnsready.net> 2013-10-26 01:22:45 -0700
commit: 24152c3ea77087edccf017c13d44904a75799ff7 (patch)
tree: 65e25106816e5071dd5b2edc2270e0138c23dc7c /community
parent: 5a3821aec094b38a412cf5e6997c08b6428d6f77 (diff)
37 files changed, 562 insertions, 430 deletions
diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD
index 0e6ad935b..8bd2d48a8 100755
--- a/community/aegisub/PKGBUILD
+++ b/community/aegisub/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97224 2013-09-15 13:34:01Z alucryd $
+# $Id: PKGBUILD 99199 2013-10-25 12:58:18Z giovanni $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: kozec <kozec@kozec.com>
 # Contributor: Limao Luo <luolimao+AUR@gmail.com>
 
 pkgname=aegisub
 pkgver=3.0.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A general-purpose subtitle editor with ASS/SSA support"
 arch=('i686' 'x86_64')
 url="http://www.aegisub.org"
diff --git a/community/bamf/PKGBUILD b/community/bamf/PKGBUILD
new file mode 100644
index 000000000..0e9e817f2
--- /dev/null
+++ b/community/bamf/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 99159 2013-10-25 08:28:21Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=bamf
+pkgver=0.5.0
+pkgrel=2
+pkgdesc="Application matching framework"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/bamf"
+license=('GPL')
+depends=('libgtop' 'libwnck3')
+makedepends=('gobject-introspection' 'python2-lxml' 'vala')
+source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('93b1acced96d32b36270cf18feb2761014ce2226814303c632448f717a8f9113')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  export PYTHON='/usr/bin/python2'
+  ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgname}" --disable-{static,webapps}
+  make
+}
+
+package() {
+  cd ${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD
index 8f52b48c5..a5469b833 100644
--- a/community/bullet/PKGBUILD
+++ b/community/bullet/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 83395 2013-01-31 09:42:11Z svenstaro $
+# $Id: PKGBUILD 99165 2013-10-25 09:52:29Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgbase=bullet
 pkgname=('bullet' 'bullet-docs')
-_rev=2613
-pkgver=2.81
-pkgrel=2
+_rev=2704
+pkgver=2.82
+pkgrel=1
 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation"
 arch=('i686' 'x86_64')
 url="http://www.bulletphysics.com/Bullet/"
 license=('custom:zlib')
 depends=()
 makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa')
-source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev${_rev}.tgz
+source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-r${_rev}.tgz
         ${pkgbase}.pc)
-md5sums=('cec9c9a79c2804dbf6385dd7d061346c'
+md5sums=('70b3c8d202dee91a0854b4cbc88173e8'
          'd1da06deba3b08b884d2212f6838905c')
 
 build() {
-  cd ${pkgbase}-${pkgver}-rev${_rev}
+  cd ${pkgbase}-${pkgver}-r${_rev}
 
   # get a clean build dir
   [[ -d build ]] && rm -rf build
@@ -48,7 +48,7 @@ build() {
 package_bullet() {
   optdepends=('bullet-docs: documentation')
 
-  cd ${pkgbase}-${pkgver}-rev${_rev}/build
+  cd ${pkgbase}-${pkgver}-r${_rev}/build
 
   # install it
   make DESTDIR=${pkgdir} install
@@ -65,7 +65,7 @@ package_bullet-docs() {
   pkgdesc="Documentation for bullet"
   depends=()
 
-  cd ${pkgbase}-${pkgver}-rev${_rev}
+  cd ${pkgbase}-${pkgver}-r${_rev}
 
   # install docs
   install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf
diff --git a/community/flam3/PKGBUILD b/community/flam3/PKGBUILD
index 2dc0711ea..9a6d063a6 100644
--- a/community/flam3/PKGBUILD
+++ b/community/flam3/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 90023 2013-05-06 19:36:52Z foutrelis $
+# $Id: PKGBUILD 99213 2013-10-25 20:22:05Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=flam3
 pkgver=3.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Tools to create/display fractal flames: algorithmically generated images and animations"
 arch=('i686' 'x86_64')
 url="http://flam3.com/"
 license=('GPL3')
 depends=('libjpeg' 'libpng' 'libxml2')
-options=('!libtool')
 source=(http://flam3.googlecode.com/files/${pkgname}-${pkgver}.tar.gz flam3-3.0.1-libpng15.patch)
 sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9'
           '17ece6cc00899e5135dad2bc79f97dfbd73107a6')
 
 prepare() {
   cd ${pkgname}-${pkgver}/src
-  patch -p1 -i ../../flam3-3.0.1-libpng15.patch
+  patch -p1 -i "${srcdir}/flam3-3.0.1-libpng15.patch"
 }
 
 build() {
diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD
index 68d902e4f..ab5e6a1c4 100644
--- a/community/gitg/PKGBUILD
+++ b/community/gitg/PKGBUILD
@@ -1,17 +1,15 @@
-# $Id: PKGBUILD 88690 2013-04-21 22:17:07Z heftig $
+# $Id: PKGBUILD 99215 2013-10-25 20:50:04Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gitg
 pkgver=0.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc='A GIT repository viewer based on GTK+'
 arch=('i686' 'x86_64')
 url='https://git.gnome.org/browse/gitg/'
 license=('GPL')
-depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \
-         'hicolor-icon-theme')
+depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas')
 makedepends=('intltool')
-options=('!libtool')
 install=gitg.install
 source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
 sha1sums=('7b1428819666e4797d64dc94bb1624d5e7b75e6a')
@@ -19,7 +17,7 @@ sha1sums=('7b1428819666e4797d64dc94bb1624d5e7b75e6a')
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  make
+  make WARN_CFLAGS="-Wall"
 }
 
 package() {
diff --git a/community/gmtk/PKGBUILD b/community/gmtk/PKGBUILD
index 51869c8d1..687bcbe87 100644
--- a/community/gmtk/PKGBUILD
+++ b/community/gmtk/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 92205 2013-06-02 18:41:20Z bpiotrowski $
+# $Id: PKGBUILD 99144 2013-10-25 02:20:05Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=gmtk
 pkgver=1.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Common functions for gnome-mplayer and gecko-mediaplayer.'
 arch=('i686' 'x86_64')
 url='http://gmtk.googlecode.com/'
 license=('GPL')
 depends=('glib2' 'gtk3' 'dconf')
 makedepends=('intltool' 'pkg-config')
-options=(!libtool)
 source=("http://gmtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=('ee8ab99f3ac2e0071c99a35e4847bba5')
 
diff --git a/community/google-glog/PKGBUILD b/community/google-glog/PKGBUILD
index 7ca4be213..a96367afc 100644
--- a/community/google-glog/PKGBUILD
+++ b/community/google-glog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83436 2013-02-01 07:03:30Z fyan $
+# $Id: PKGBUILD 99149 2013-10-25 05:03:45Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Ian Yang <doit.ian@gmail.com>
 
 pkgname=google-glog
 pkgver=0.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Logging library for C++"
 arch=('i686' 'x86_64')
 license=('custom:BSD3')
diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD
index b3ac37c1a..c5815e61a 100644
--- a/community/gpac/PKGBUILD
+++ b/community/gpac/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94884 2013-08-01 06:54:59Z bpiotrowski $
+# $Id: PKGBUILD 99218 2013-10-25 20:55:07Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gpac
@@ -12,7 +12,7 @@ depends=('ffmpeg' 'libjpeg' 'libpng' 'glu' 'libxv')
 makedepends=('jack' 'a52dec' 'freetype2' 'faad2' 'libmad' 'mesa')
 optdepends=('jack: for jack support' 'a52dec: for A52 support'
             'faad2: for AAC support' 'libmad: for mp3 support')
-options=('!makeflags')
+options=('staticlibs' '!makeflags')
 source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} gpac-ffmpeg.patch)
 sha1sums=('6ba29de672b6e4260e510e0e16d5bc0ab09cabb6'
           'SKIP'
diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD
index ffea0e7d4..cab7251c1 100644
--- a/community/haskell-ghc-paths/PKGBUILD
+++ b/community/haskell-ghc-paths/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $
+# $Id: PKGBUILD 99206 2013-10-25 16:17:55Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-ghc-paths
 pkgver=0.1.0.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Knowledge of GHC's installation directories"
 url='http://hackage.haskell.org/package/ghc-paths'
 license=('custom:BSD3')
@@ -12,10 +12,11 @@ arch=('x86_64' 'i686')
 depends=('ghc=7.6.3-1')
 source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
 install="$pkgname.install"
+options=('staticlibs')
 sha256sums=('afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945')
 
 build() {
-  cd "$srcdir/ghc-paths-$pkgver"
+  cd "ghc-paths-$pkgver"
 
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
      --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
@@ -28,7 +29,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/ghc-paths-$pkgver"
+  cd "ghc-paths-$pkgver"
 
   install -Dm 744 register.sh \
     "$pkgdir/usr/share/haskell/$pkgname/register.sh"
diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD
index 09d1ccf4b..dfe3b31e2 100644
--- a/community/haveged/PKGBUILD
+++ b/community/haveged/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92888 2013-06-18 08:41:07Z bpiotrowski $
+# $Id: PKGBUILD 99131 2013-10-25 01:13:09Z bisson $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: kfgz <kfgz at interia dot pl>
 # Contributor: pootzko <pootzko at gmail dot com>
@@ -6,7 +6,7 @@
 pkgname=haveged
 pkgver=1.7.c
 _pkgver=${pkgver/.c/c}
-pkgrel=1
+pkgrel=2
 pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('i686' 'x86_64')
 url='http://www.issihosts.com/haveged'
diff --git a/community/jbig2dec/PKGBUILD b/community/jbig2dec/PKGBUILD
index 9ea0595f9..62656dbcd 100644
--- a/community/jbig2dec/PKGBUILD
+++ b/community/jbig2dec/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90049 2013-05-06 19:37:57Z foutrelis $
+# $Id: PKGBUILD 99133 2013-10-25 01:14:19Z bisson $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=jbig2dec
 pkgver=0.11
-pkgrel=6
+pkgrel=7
 pkgdesc="decoder implementation of the JBIG2 image compression format"
 arch=('x86_64' 'i686')
 url="http://jbig2dec.sourceforge.net/"
diff --git a/community/kyotocabinet/PKGBUILD b/community/kyotocabinet/PKGBUILD
index bb08be242..b7eb075d0 100644
--- a/community/kyotocabinet/PKGBUILD
+++ b/community/kyotocabinet/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 90164 2013-05-07 16:07:18Z fyan $
+# $Id: PKGBUILD 99150 2013-10-25 05:03:47Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Alexander Duscheleit <jinks@archlinux.us>
 # Contributor: Joaquim Pedro (osmano807) <osmano807@gmail.com>
 
 pkgname=kyotocabinet
 pkgver=1.2.76
-pkgrel=3
+pkgrel=4
 pkgdesc="a modern implementation of DBM in C++"
 arch=('i686' 'x86_64')
 url="http://fallabs.com/kyotocabinet"
 license=('LGPL3')
-makedepends=('gcc' 'make' 'pkgconfig' 'zlib')
 depends=('zlib' 'gcc-libs')
 source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz")
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --disable-opt
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   make install DESTDIR="$pkgdir/"
 }
diff --git a/community/libdbusmenu/PKGBUILD b/community/libdbusmenu/PKGBUILD
new file mode 100644
index 000000000..ca900239e
--- /dev/null
+++ b/community/libdbusmenu/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 99160 2013-10-25 08:29:02Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Branchini Massimo <max dot bra dot gtalk at gmail dot com
+
+pkgbase=libdbusmenu
+pkgname=('libdbusmenu-glib' 'libdbusmenu-gtk3')
+pkgver=12.10.2
+pkgrel=3
+pkgdesc="A library for passing menus over DBus"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/libdbusmenu"
+license=('GPL3')
+makedepends=('gnome-doc-utils' 'gobject-introspection' 'gtk3' 'intltool' 'vala')
+options=('!emptydirs')
+source=("http://launchpad.net/dbusmenu/${pkgver%.?}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.gz")
+sha256sums=('9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9')
+
+build() {
+  cd ${pkgbase}-${pkgver}
+
+  export HAVE_VALGRIND_TRUE='#'
+  export HAVE_VALGRIND_FALSE=''
+  ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --disable-{dumper,static,tests}
+  make
+}
+
+package_libdbusmenu-glib() {
+depends=('glib2')
+
+  cd ${pkgbase}-${pkgver}
+
+  make -C libdbusmenu-glib DESTDIR="${pkgdir}" install
+}
+
+package_libdbusmenu-gtk3() {
+depends=('gtk3' 'libdbusmenu-glib')
+
+  cd ${pkgbase}-${pkgver}
+
+  make -C libdbusmenu-glib DESTDIR="${pkgdir}" install
+  make -C libdbusmenu-gtk DESTDIR="${pkgdir}" install
+  make -C libdbusmenu-glib DESTDIR="${pkgdir}" uninstall
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/libsodium/PKGBUILD b/community/libsodium/PKGBUILD
index 3cef1c18a..193e5eb5b 100644
--- a/community/libsodium/PKGBUILD
+++ b/community/libsodium/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 96998 2013-09-10 02:39:45Z fyan $
+# $Id: PKGBUILD 99151 2013-10-25 05:03:48Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: namelessjon <jonathan.stott@gmail.com>
 # Contributor: Alessio Sergi <asergi at archlinux dot us>
 
 pkgname=libsodium
-pkgver=0.4.3
+pkgver=0.4.5
 pkgrel=1
 pkgdesc="P(ortable|ackageable) NaCl-based crypto library"
 arch=('i686' 'x86_64')
 url="https://github.com/jedisct1/libsodium"
 license=('custom:ISC')
 depends=('glibc')
-options=('!libtool')
 source=(http://download.dnscrypt.org/$pkgname/releases/$pkgname-${pkgver}.tar.gz)
 
 build() {
@@ -35,4 +34,4 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-sha512sums=('479016922fa522409eac80e65046129b4ea3a34642483e6f56331c430c9cb21cf69ec4650a6717560283096d1416bf15035dbf56eba3c35259ddfc8feccda331')
+sha512sums=('8c446b62c0400ed972f11c399a03f334cead80fc48513c4b5eba6f569725e28cf98d71cd6d46da5602fc553719a18e74598008c311fe02b2f05b61c7bc72525b')
diff --git a/community/liteide/PKGBUILD b/community/liteide/PKGBUILD
index 6d5a7c483..d94bb5526 100644
--- a/community/liteide/PKGBUILD
+++ b/community/liteide/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 96319 2013-08-25 13:45:50Z arodseth $
+# $Id: PKGBUILD 99195 2013-10-25 12:43:33Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: spambanane <happy.house@gmx.de>
 # Contributor: Matteo <matteo.dek@gmail.com>
 
 pkgname=liteide
 pkgver=19
-pkgrel=3
+pkgrel=4
 pkgdesc='IDE for editing and building projects written in the Go programming language ("golangide")'
 license=('LGPL')
 arch=('x86_64' 'i686')
 url='https://github.com/visualfc/liteide'
-depends=('go' 'libpng12' 'qt5-webkit')
+depends=('go' 'qt5-webkit')
 replaces=('golangide')
 conflicts=('golangide')
 makedepends=('gendesk')
@@ -23,15 +23,13 @@ sha256sums=('182694341940878cf5df4f083a750659bffc97eb4ae517410e157bebc14f97df'
             '5d6f05b072586c31e3a4a08ea2d7332dd0a78f5db6b2d088fb76e8cb032672f0')
 
 prepare() {
-  cd "$srcdir"
-
   gendesk -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc"
   cd "liteide-x$pkgver/build"
   chmod +x build_linux.sh
 }
 
 build() {
-  cd "$srcdir/liteide-x$pkgver/build"
+  cd "liteide-x$pkgver/build"
 
   QTDIR=/usr ./build_linux.sh
 
@@ -42,7 +40,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/liteide-x$pkgver/build/liteide"
+  cd "liteide-x$pkgver/build/liteide"
 
   msg2 'Creating directories...'
   mkdir -p \
diff --git a/community/ming/PKGBUILD b/community/ming/PKGBUILD
index 87f4707cf..f9ee37a12 100644
--- a/community/ming/PKGBUILD
+++ b/community/ming/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=ming
 pkgver=0.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="SWF output library"
 arch=('i686' 'x86_64')
 url="http://www.libming.net/"
 license=('GPL' 'LGPL')
 depends=('freetype2' 'libpng' 'flex')
 makedepends=('bison' 'pkg-config' 'python2')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('73bcbcb837f3872ef1a936c539a2513c')
 
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 3dc14a894..d8998635f 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96182 2013-08-21 06:12:24Z fyan $
+# $Id: PKGBUILD 99147 2013-10-25 05:02:21Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -6,13 +6,13 @@
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.4.6
+pkgver=2.4.7
 pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64')
 url='http://www.mongodb.org'
 license=('AGPL3')
-depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools') # 'v8')
+depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools')
 makedepends=('scons' 'boost' 'readline' 'ncurses' 'libpcap') # 'cyrus-sasl')
 checkdepends=('python2-pymongo')
 optdepends=('libpcap: needed for mongosniff')
@@ -37,8 +37,8 @@ build() {
     --use-system-tcmalloc \
     --ssl \
     --sharedclient
-    # --use-system-v8
     # --use-sasl-client
+    # --use-system-v8
 }
 
 <<COMMENT
@@ -68,15 +68,13 @@ package() {
     # --use-system-v8
     # --use-sasl-client
 
-  rm "$pkgdir/usr/lib/libmongoclient.a"
-
   install -Dm644 "$srcdir/mongodb.conf" "$pkgdir/etc/mongodb.conf"
   install -Dm644 "$srcdir/mongodb.service" "$pkgdir/usr/lib/systemd/system/mongodb.service"
   install -dm700 "$pkgdir/var/lib/mongodb"
   install -dm755 "$pkgdir/var/log/mongodb"
 }
 
-sha512sums=('73921d439f1bc2b6c1f358ab96f05f5f082db7b2c09f8964f2e3cc2d3cfd059e0c923d228a77fbfb8c8613eee1fbf16a35d5347b6316219aed3b0357dec97eae'
+sha512sums=('bd682944f5388cef9115ccdf0d8488d2a7a699974f395dd9eea62562528a7a6205fceb92c148187f003362f1ef983ead672cacacc678b2f2b77cdd827812b6c9'
             '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
             '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9'
             'e709f76fa71a10d6b72d2eeae65d715e0a0a7e6cb93704114f22db8662d7102de77bd1e6706049351beb159aaa04548cfe4b14fe6ee498a166c5ad54c8275f84')
diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD
index 2c866dea6..75e4bdfa8 100644
--- a/community/mpv/PKGBUILD
+++ b/community/mpv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99077 2013-10-24 08:16:35Z bpiotrowski $
+# $Id: PKGBUILD 99197 2013-10-25 12:45:06Z giovanni $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Eivind Uggedal <eivind@uggedal.com>
 
 pkgname=mpv
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Video player based on MPlayer/mplayer2'
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD
index a053fffa9..669c837ad 100644
--- a/community/mythtv/PKGBUILD
+++ b/community/mythtv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99069 2013-10-24 02:39:07Z jconder $
+# $Id: PKGBUILD 99201 2013-10-25 13:44:56Z giovanni $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=mythtv
 pkgver=0.27
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
@@ -27,10 +27,10 @@ conflicts=('myththemes' 'mythplugins-mythvideo')
 replaces=('myththemes' 'mythplugins-mythvideo')
 backup=()
 install='mythtv.install'
-source=("http://www.$pkgname.org/download/$pkgname/$pkgver"
+source=("$pkgname-$pkgver.tar.gz::http://www.$pkgname.org/download/$pkgname/$pkgver"
         'mythbackend.service'
         'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.2.patch')
-sha256sums=('670b378e379df05a4f2ac28cc3cb2578587b42cb03710e0b230b75d692f8e2b8'
+sha256sums=('49789de705be73275325b1a4984b727cf8284fdc4ae6b041ad152857c830dc46'
             'f628f44164ce773ae54d320fb2f65353cacf9deec16981e4e56316ac33000a2f'
             '8270407c2074b305e0c32151f89c84f6bf980a32665a2da8e4727405fa3911f3')
 
diff --git a/community/opencc/PKGBUILD b/community/opencc/PKGBUILD
index 01375c5e2..3a88ab6b4 100644
--- a/community/opencc/PKGBUILD
+++ b/community/opencc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95956 2013-08-19 06:36:39Z fyan $
+# $Id: PKGBUILD 99152 2013-10-25 05:05:17Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgbase=opencc
 pkgname=(opencc opencc-doc)
 pkgver=0.4.3
-pkgrel=1
+pkgrel=2
 url="http://code.google.com/p/opencc/"
 arch=('i686' 'x86_64')
 license=('Apache')
@@ -12,7 +12,7 @@ makedepends=('cmake' 'doxygen')
 source=("http://opencc.googlecode.com/files/${pkgbase}-${pkgver}.tar.gz")
 
 build() {
-  cd "$srcdir/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCUMENTATION:BOOL=ON
   make
 }
@@ -21,7 +21,7 @@ package_opencc() {
   pkgdesc="Library for Open Chinese Convert"
   depends=('glibc')
 
-  cd "$srcdir/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install
   
   # Remove docs - install in splitted package
@@ -31,7 +31,7 @@ package_opencc() {
 package_opencc-doc() {
   pkgdesc="Documentation for Library for Open Chinese Convert"
 
-  cd "$srcdir/${pkgbase}-${pkgver}/doc"
+  cd ${pkgbase}-${pkgver}/doc
   make DESTDIR="${pkgdir}" install
 
   # Remove manpages - already installed in main package
diff --git a/community/pdflib-lite/PKGBUILD b/community/pdflib-lite/PKGBUILD
index f99c4f350..73e4a997c 100644
--- a/community/pdflib-lite/PKGBUILD
+++ b/community/pdflib-lite/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pdflib-lite
 _pkgnamecaps=PDFlib-Lite
 pkgver=7.0.5p3
 _basepkgver=${pkgver/p*/}
-pkgrel=2
+pkgrel=3
 pkgdesc="PDF manipulation library."
 url="http://www.pdflib.com"
 arch=(i686 x86_64)
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index f201be457..1ad8e2d03 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 98649 2013-10-16 12:59:04Z mtorromeo $
+# $Id: PKGBUILD 99185 2013-10-25 10:38:59Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=percona-server
-pkgver=5.6.13_rel61.0
+pkgver=5.6.14_rel62.0
 pkgrel=1
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ url="http://www.percona.com/software/percona-server/"
 options=('!libtool' 'emptydirs')
 backup=('etc/mysql/my.cnf')
 install=percona.install
-source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_/-}/source/Percona-Server-${pkgver/_/-}.tar.gz"
+source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_/-}/release-${pkgver/_rel/-}/483/source/Percona-Server-${pkgver/_/-}.tar.gz"
         'mysqld-post.sh'
         'mysqld.service'
         'mysqld-tmpfile.conf'
@@ -102,9 +102,9 @@ package() {
 	rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
 }
 
-sha256sums=('6fa6c240f08c3aedacbefe31559128d239c7f18089c5bba64136698bd64910c8'
+sha256sums=('69edc04585e72ac94c32598221c0762704e75190c2abe4fa680ad42ce202e280'
             '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48'
             '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869'
             'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60'
             '1039e232a7778544b00eb215c93bb06c588c95c2fd49cfb162dc50eb4dfbf729'
-            '89aab4eafa97cd0e40b61871a472fd90b4372e69c7af0d86145e5a7de9c8d4ee')
+            'd36c807f085b6051cc8fddb2abc5a1939be809650f1cfefc8a87731978958929')
diff --git a/community/percona-server/mysql56-bison3.patch b/community/percona-server/mysql56-bison3.patch
index 79c6b5c28..b9767cf71 100644
--- a/community/percona-server/mysql56-bison3.patch
+++ b/community/percona-server/mysql56-bison3.patch
@@ -1,5 +1,5 @@
 diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
-index 1bb7747..009780f 100644
+index 75440c5..af50807 100644
 --- a/sql/sql_lex.cc
 +++ b/sql/sql_lex.cc
 @@ -34,7 +34,7 @@
@@ -11,7 +11,7 @@ index 1bb7747..009780f 100644
  
  /*
    We are using pointer to this variable for distinguishing between assignment
-@@ -905,9 +905,8 @@ bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted)
+@@ -906,9 +906,8 @@ bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted)
  				(which can't be followed by a signed number)
  */
  
@@ -22,7 +22,7 @@ index 1bb7747..009780f 100644
    Lex_input_stream *lip= & thd->m_parser_state->m_lip;
    YYSTYPE *yylval=(YYSTYPE*) arg;
    int token;
-@@ -926,7 +925,7 @@ int MYSQLlex(void *arg, void *yythd)
+@@ -927,7 +926,7 @@ int MYSQLlex(void *arg, void *yythd)
      return token;
    }
  
@@ -31,7 +31,7 @@ index 1bb7747..009780f 100644
  
    switch(token) {
    case WITH:
-@@ -937,7 +936,7 @@ int MYSQLlex(void *arg, void *yythd)
+@@ -938,7 +937,7 @@ int MYSQLlex(void *arg, void *yythd)
        to transform the grammar into a LALR(1) grammar,
        which sql_yacc.yy can process.
      */
@@ -40,7 +40,7 @@ index 1bb7747..009780f 100644
      switch(token) {
      case CUBE_SYM:
        lip->m_digest_psi= MYSQL_ADD_TOKEN(lip->m_digest_psi, WITH_CUBE_SYM,
-@@ -966,14 +965,13 @@ int MYSQLlex(void *arg, void *yythd)
+@@ -967,14 +966,13 @@ int MYSQLlex(void *arg, void *yythd)
    return token;
  }
  
@@ -57,10 +57,10 @@ index 1bb7747..009780f 100644
    LEX *lex= thd->lex;
    YYSTYPE *yylval=(YYSTYPE*) arg;
 diff --git a/sql/sql_lex.h b/sql/sql_lex.h
-index b7030e4..e2d3a60 100644
+index 42a5e77..602f52a 100644
 --- a/sql/sql_lex.h
 +++ b/sql/sql_lex.h
-@@ -2845,7 +2845,7 @@ extern void lex_init(void);
+@@ -2857,7 +2857,7 @@ extern void lex_init(void);
  extern void lex_free(void);
  extern void lex_start(THD *thd);
  extern void lex_end(LEX *lex);
@@ -70,10 +70,10 @@ index b7030e4..e2d3a60 100644
  extern void trim_whitespace(const CHARSET_INFO *cs, LEX_STRING *str);
  
 diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
-index bcf5be1..d58838b 100644
+index c88dd69..fc30370 100644
 --- a/sql/sql_parse.cc
 +++ b/sql/sql_parse.cc
-@@ -8497,7 +8497,7 @@ bool check_host_name(LEX_STRING *str)
+@@ -8575,7 +8575,7 @@ bool check_host_name(LEX_STRING *str)
  }
  
  
@@ -83,7 +83,7 @@ index bcf5be1..d58838b 100644
  
  /**
 diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
-index 0c9e81d..765e389 100644
+index e640073..f2c7bfb 100644
 --- a/sql/sql_yacc.yy
 +++ b/sql/sql_yacc.yy
 @@ -22,21 +22,14 @@
@@ -154,7 +154,7 @@ index 0c9e81d..765e389 100644
  /*
    Currently there are 161 shift/reduce conflicts.
    We should not introduce new conflicts any more.
-@@ -1971,7 +1965,6 @@ rule: <-- starts at col 1
+@@ -1972,7 +1966,6 @@ rule: <-- starts at col 1
  query:
            END_OF_INPUT
            {
@@ -162,7 +162,7 @@ index 0c9e81d..765e389 100644
              if (!thd->bootstrap &&
                (!(thd->lex->select_lex.options & OPTION_FOUND_COMMENT)))
              {
-@@ -1985,7 +1978,7 @@ query:
+@@ -1986,7 +1979,7 @@ query:
            {
              Lex_input_stream *lip = YYLIP;
  
@@ -171,7 +171,7 @@ index 0c9e81d..765e389 100644
                  lip->multi_statements &&
                  ! lip->eof())
              {
-@@ -2082,7 +2075,6 @@ statement:
+@@ -2083,7 +2076,6 @@ statement:
  deallocate:
            deallocate_or_drop PREPARE_SYM ident
            {
@@ -179,7 +179,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->sql_command= SQLCOM_DEALLOCATE_PREPARE;
              lex->prepared_stmt_name= $3;
-@@ -2097,7 +2089,6 @@ deallocate_or_drop:
+@@ -2098,7 +2090,6 @@ deallocate_or_drop:
  prepare:
            PREPARE_SYM ident FROM prepare_src
            {
@@ -187,7 +187,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->sql_command= SQLCOM_PREPARE;
              lex->prepared_stmt_name= $2;
-@@ -2107,14 +2098,12 @@ prepare:
+@@ -2118,14 +2109,12 @@ prepare:
  prepare_src:
            TEXT_STRING_sys
            {
@@ -202,7 +202,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->prepared_stmt_code= $2;
              lex->prepared_stmt_code_is_varref= TRUE;
-@@ -2124,7 +2113,6 @@ prepare_src:
+@@ -2135,7 +2124,6 @@ prepare_src:
  execute:
            EXECUTE_SYM ident
            {
@@ -210,7 +210,16 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->sql_command= SQLCOM_EXECUTE;
              lex->prepared_stmt_name= $2;
-@@ -2291,7 +2279,7 @@ master_def:
+@@ -2245,7 +2233,7 @@ master_def:
+             {
+               Lex_input_stream *lip= YYLIP;
+               const char *start= lip->get_tok_start();
+-              const char *msg= YYTHD->strmake(start, lip->get_ptr() - start);
++              const char *msg= thd->strmake(start, lip->get_ptr() - start);
+               my_error(ER_MASTER_DELAY_VALUE_OUT_OF_RANGE, MYF(0),
+                        msg, MASTER_DELAY_MAX);
+             }
+@@ -2305,7 +2293,7 @@ master_def:
              }
              if (Lex->mi.heartbeat_period > slave_net_timeout)
              {
@@ -219,7 +228,7 @@ index 0c9e81d..765e389 100644
                                    ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX,
                                    ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX));
              }
-@@ -2299,7 +2287,7 @@ master_def:
+@@ -2313,7 +2301,7 @@ master_def:
              {
                if (Lex->mi.heartbeat_period != 0.0)
                {
@@ -228,7 +237,7 @@ index 0c9e81d..765e389 100644
                                      ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN,
                                      ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN));
                  Lex->mi.heartbeat_period= 0.0;
-@@ -2382,7 +2370,6 @@ master_file_def:
+@@ -2396,7 +2384,6 @@ master_file_def:
  create:
            CREATE opt_table_options TABLE_SYM opt_if_not_exists table_ident
            {
@@ -236,7 +245,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->sql_command= SQLCOM_CREATE_TABLE;
              if (!lex->select_lex.add_table_to_list(thd, $5, NULL,
-@@ -2408,7 +2395,6 @@ create:
+@@ -2422,7 +2409,6 @@ create:
            }
            create2
            {
@@ -244,7 +253,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->current_select= &lex->select_lex; 
              if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) &&
-@@ -2417,7 +2403,7 @@ create:
+@@ -2431,7 +2417,7 @@ create:
                lex->create_info.db_type=
                  lex->create_info.options & HA_LEX_CREATE_TMP_TABLE ?
                  ha_default_temp_handlerton(thd) : ha_default_handlerton(thd);
@@ -253,7 +262,7 @@ index 0c9e81d..765e389 100644
                                    ER_WARN_USING_OTHER_HANDLER,
                                    ER(ER_WARN_USING_OTHER_HANDLER),
                                    ha_resolve_storage_engine_name(lex->create_info.db_type),
-@@ -2551,7 +2537,6 @@ server_option:
+@@ -2565,7 +2551,6 @@ server_option:
  event_tail:
            remember_name EVENT_SYM opt_if_not_exists sp_name
            {
@@ -261,7 +270,7 @@ index 0c9e81d..765e389 100644
              LEX *lex=Lex;
  
              lex->stmt_definition_begin= $1;
-@@ -2618,7 +2603,7 @@ opt_ev_status:
+@@ -2632,7 +2617,7 @@ opt_ev_status:
  ev_starts:
            /* empty */
            {
@@ -270,7 +279,7 @@ index 0c9e81d..765e389 100644
              if (item == NULL)
                MYSQL_YYABORT;
              Lex->event_parse_data->item_starts= item;
-@@ -2668,7 +2653,6 @@ opt_ev_comment:
+@@ -2682,7 +2667,6 @@ opt_ev_comment:
  
  ev_sql_stmt:
            {
@@ -278,7 +287,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              Lex_input_stream *lip= YYLIP;
  
-@@ -2711,7 +2695,6 @@ ev_sql_stmt:
+@@ -2725,7 +2709,6 @@ ev_sql_stmt:
            }
            ev_sql_stmt_inner
            {
@@ -286,7 +295,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
  
              sp_finish_parsing(thd);
-@@ -2765,11 +2748,10 @@ sp_name:
+@@ -2779,11 +2762,10 @@ sp_name:
              $$= new sp_name($1, $3, true);
              if ($$ == NULL)
                MYSQL_YYABORT;
@@ -299,7 +308,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              LEX_STRING db;
              if (sp_check_name(&$1))
-@@ -2839,7 +2821,7 @@ call:
+@@ -2853,7 +2835,7 @@ call:
              lex->sql_command= SQLCOM_CALL;
              lex->spname= $2;
              lex->value_list.empty();
@@ -308,7 +317,7 @@ index 0c9e81d..765e389 100644
            }
            opt_sp_cparam_list {}
          ;
-@@ -2900,7 +2882,6 @@ sp_init_param:
+@@ -2914,7 +2896,6 @@ sp_init_param:
  sp_fdparam:
            ident sp_init_param type_with_opt_collate
            {
@@ -316,7 +325,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -2941,7 +2922,6 @@ sp_pdparams:
+@@ -2955,7 +2936,6 @@ sp_pdparams:
  sp_pdparam:
            sp_opt_inout sp_init_param ident type_with_opt_collate
            {
@@ -324,7 +333,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -3017,7 +2997,6 @@ sp_decls:
+@@ -3031,7 +3011,6 @@ sp_decls:
  sp_decl:
            DECLARE_SYM sp_decl_idents
            {
@@ -332,7 +341,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -3028,7 +3007,6 @@ sp_decl:
+@@ -3042,7 +3021,6 @@ sp_decl:
            type_with_opt_collate
            sp_opt_default
            {
@@ -340,7 +349,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -3101,7 +3079,6 @@ sp_decl:
+@@ -3115,7 +3093,6 @@ sp_decl:
            }
          | DECLARE_SYM ident CONDITION_SYM FOR_SYM sp_cond
            {
@@ -348,7 +357,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
  
-@@ -3117,7 +3094,6 @@ sp_decl:
+@@ -3131,7 +3108,6 @@ sp_decl:
            }
          | DECLARE_SYM sp_handler_type HANDLER_SYM FOR_SYM
            {
@@ -356,7 +365,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -3157,7 +3133,6 @@ sp_decl:
+@@ -3171,7 +3147,6 @@ sp_decl:
            }
            sp_hcond_list sp_proc_stmt
            {
@@ -364,7 +373,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -3191,7 +3166,6 @@ sp_decl:
+@@ -3205,7 +3180,6 @@ sp_decl:
            }
          | DECLARE_SYM ident CURSOR_SYM FOR_SYM
            {
@@ -372,7 +381,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
  
-@@ -3200,7 +3174,6 @@ sp_decl:
+@@ -3214,7 +3188,6 @@ sp_decl:
            }
            select
            {
@@ -380,7 +389,7 @@ index 0c9e81d..765e389 100644
              LEX *cursor_lex= Lex;
              sp_head *sp= cursor_lex->sphead;
  
-@@ -3305,7 +3278,7 @@ sp_cond:
+@@ -3319,7 +3292,7 @@ sp_cond:
                my_error(ER_WRONG_VALUE, MYF(0), "CONDITION", "0");
                MYSQL_YYABORT;
              }
@@ -389,7 +398,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -3328,7 +3301,7 @@ sqlstate:
+@@ -3342,7 +3315,7 @@ sqlstate:
                my_error(ER_SP_BAD_SQLSTATE, MYF(0), $3.str);
                MYSQL_YYABORT;
              }
@@ -398,7 +407,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -3359,19 +3332,19 @@ sp_hcond:
+@@ -3373,19 +3346,19 @@ sp_hcond:
            }
          | SQLWARNING_SYM /* SQLSTATEs 01??? */
            {
@@ -421,7 +430,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -3380,7 +3353,6 @@ sp_hcond:
+@@ -3394,7 +3367,6 @@ sp_hcond:
  signal_stmt:
            SIGNAL_SYM signal_value opt_set_signal_information
            {
@@ -429,7 +438,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              Yacc_state *state= & thd->m_parser_state->m_yacc;
  
-@@ -3433,7 +3405,7 @@ opt_signal_value:
+@@ -3447,7 +3419,7 @@ opt_signal_value:
  opt_set_signal_information:
            /* empty */
            {
@@ -438,7 +447,7 @@ index 0c9e81d..765e389 100644
            }
          | SET signal_information_item_list
          ;
-@@ -3442,7 +3414,7 @@ signal_information_item_list:
+@@ -3456,7 +3428,7 @@ signal_information_item_list:
            signal_condition_information_item_name EQ signal_allowed_expr
            {
              Set_signal_information *info;
@@ -447,7 +456,7 @@ index 0c9e81d..765e389 100644
              int index= (int) $1;
              info->clear();
              info->m_item[index]= $3;
-@@ -3451,7 +3423,7 @@ signal_information_item_list:
+@@ -3465,7 +3437,7 @@ signal_information_item_list:
            signal_condition_information_item_name EQ signal_allowed_expr
            {
              Set_signal_information *info;
@@ -456,7 +465,7 @@ index 0c9e81d..765e389 100644
              int index= (int) $3;
              if (info->m_item[index] != NULL)
              {
-@@ -3522,7 +3494,6 @@ signal_condition_information_item_name:
+@@ -3536,7 +3508,6 @@ signal_condition_information_item_name:
  resignal_stmt:
            RESIGNAL_SYM opt_signal_value opt_set_signal_information
            {
@@ -464,7 +473,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              Yacc_state *state= & thd->m_parser_state->m_yacc;
  
-@@ -3543,7 +3514,7 @@ get_diagnostics:
+@@ -3557,7 +3528,7 @@ get_diagnostics:
              info->set_which_da($2);
  
              Lex->sql_command= SQLCOM_GET_DIAGNOSTICS;
@@ -473,7 +482,7 @@ index 0c9e81d..765e389 100644
  
              if (Lex->m_sql_cmd == NULL)
                MYSQL_YYABORT;
-@@ -3560,13 +3531,13 @@ which_area:
+@@ -3574,13 +3545,13 @@ which_area:
  diagnostics_information:
            statement_information
            {
@@ -489,7 +498,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -3575,7 +3546,7 @@ diagnostics_information:
+@@ -3589,7 +3560,7 @@ diagnostics_information:
  statement_information:
            statement_information_item
            {
@@ -498,7 +507,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL || $$->push_back($1))
                MYSQL_YYABORT;
            }
-@@ -3590,7 +3561,7 @@ statement_information:
+@@ -3604,7 +3575,7 @@ statement_information:
  statement_information_item:
            simple_target_specification EQ statement_information_item_name
            {
@@ -507,7 +516,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -3598,7 +3569,6 @@ statement_information_item:
+@@ -3612,7 +3583,6 @@ statement_information_item:
  simple_target_specification:
            ident
            {
@@ -515,7 +524,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              Lex_input_stream *lip= YYLIP;
              sp_head *sp= lex->sphead;
-@@ -3627,7 +3597,7 @@ simple_target_specification:
+@@ -3641,7 +3611,7 @@ simple_target_specification:
            }
          | '@' ident_or_text
            {
@@ -524,7 +533,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -3652,7 +3622,7 @@ condition_number:
+@@ -3666,7 +3636,7 @@ condition_number:
  condition_information:
            condition_information_item
            {
@@ -533,7 +542,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL || $$->push_back($1))
                MYSQL_YYABORT;
            }
-@@ -3667,7 +3637,7 @@ condition_information:
+@@ -3681,7 +3651,7 @@ condition_information:
  condition_information_item:
            simple_target_specification EQ condition_information_item_name
            {
@@ -542,7 +551,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -3706,7 +3676,6 @@ sp_decl_idents:
+@@ -3720,7 +3690,6 @@ sp_decl_idents:
            {
              /* NOTE: field definition is filled in sp_decl section. */
  
@@ -550,7 +559,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
  
-@@ -3726,7 +3695,6 @@ sp_decl_idents:
+@@ -3740,7 +3709,6 @@ sp_decl_idents:
            {
              /* NOTE: field definition is filled in sp_decl section. */
  
@@ -558,7 +567,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
  
-@@ -3782,7 +3750,6 @@ sp_proc_stmt_if:
+@@ -3796,7 +3764,6 @@ sp_proc_stmt_if:
          
  sp_proc_stmt_statement:
            {
@@ -566,7 +575,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              Lex_input_stream *lip= YYLIP;
              sp_head *sp= lex->sphead;
-@@ -3792,7 +3759,6 @@ sp_proc_stmt_statement:
+@@ -3806,7 +3773,6 @@ sp_proc_stmt_statement:
            }
            statement
            {
@@ -574,7 +583,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -3839,7 +3805,6 @@ sp_proc_stmt_statement:
+@@ -3853,7 +3819,6 @@ sp_proc_stmt_statement:
  sp_proc_stmt_return:
            RETURN_SYM 
            {
@@ -582,7 +591,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -3849,7 +3814,6 @@ sp_proc_stmt_return:
+@@ -3863,7 +3828,6 @@ sp_proc_stmt_return:
            }
            expr
            {
@@ -590,7 +599,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -3895,7 +3859,6 @@ sp_proc_stmt_return:
+@@ -3909,7 +3873,6 @@ sp_proc_stmt_return:
  
  sp_proc_stmt_unlabeled:
            { /* Unlabeled controls get a secret label. */
@@ -598,7 +607,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -3918,7 +3881,6 @@ sp_proc_stmt_unlabeled:
+@@ -3932,7 +3895,6 @@ sp_proc_stmt_unlabeled:
  sp_proc_stmt_leave:
            LEAVE_SYM label_ident
            {
@@ -606,7 +615,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp = lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -3977,7 +3939,6 @@ sp_proc_stmt_leave:
+@@ -3991,7 +3953,6 @@ sp_proc_stmt_leave:
  sp_proc_stmt_iterate:
            ITERATE_SYM label_ident
            {
@@ -614,7 +623,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4027,7 +3988,6 @@ sp_proc_stmt_iterate:
+@@ -4041,7 +4002,6 @@ sp_proc_stmt_iterate:
  sp_proc_stmt_open:
            OPEN_SYM ident
            {
@@ -622,7 +631,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4051,7 +4011,6 @@ sp_proc_stmt_open:
+@@ -4065,7 +4025,6 @@ sp_proc_stmt_open:
  sp_proc_stmt_fetch:
            FETCH_SYM sp_opt_fetch_noise ident INTO
            {
@@ -630,7 +639,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4077,7 +4036,6 @@ sp_proc_stmt_fetch:
+@@ -4091,7 +4050,6 @@ sp_proc_stmt_fetch:
  sp_proc_stmt_close:
            CLOSE_SYM ident
            {
@@ -638,7 +647,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4145,7 +4103,6 @@ sp_fetch_list:
+@@ -4159,7 +4117,6 @@ sp_fetch_list:
  
  sp_if:
            {
@@ -646,7 +655,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -4154,7 +4111,6 @@ sp_if:
+@@ -4168,7 +4125,6 @@ sp_if:
            }
            expr
            {
@@ -654,7 +663,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4190,7 +4146,6 @@ sp_if:
+@@ -4204,7 +4160,6 @@ sp_if:
            }
            THEN_SYM sp_proc_stmts1
            {
@@ -662,7 +671,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4232,7 +4187,6 @@ case_stmt_specification:
+@@ -4246,7 +4201,6 @@ case_stmt_specification:
  simple_case_stmt:
            CASE_SYM
            {
@@ -670,7 +679,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -4243,7 +4197,6 @@ simple_case_stmt:
+@@ -4257,7 +4211,6 @@ simple_case_stmt:
            }
            expr
            {
@@ -678,7 +687,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
  
-@@ -4294,7 +4247,7 @@ simple_case_stmt:
+@@ -4308,7 +4261,7 @@ simple_case_stmt:
  searched_case_stmt:
            CASE_SYM
            {
@@ -687,7 +696,7 @@ index 0c9e81d..765e389 100644
            }
            searched_when_clause_list
            else_clause_opt
-@@ -4318,7 +4271,6 @@ searched_when_clause_list:
+@@ -4332,7 +4285,6 @@ searched_when_clause_list:
  simple_when_clause:
            WHEN_SYM
            {
@@ -695,7 +704,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -4329,7 +4281,6 @@ simple_when_clause:
+@@ -4343,7 +4295,6 @@ simple_when_clause:
            {
              /* Simple case: <caseval> = <whenval> */
  
@@ -703,7 +712,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4368,7 +4319,7 @@ simple_when_clause:
+@@ -4382,7 +4333,7 @@ simple_when_clause:
            THEN_SYM
            sp_proc_stmts1
            {
@@ -712,7 +721,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
            }
          ;
-@@ -4376,7 +4327,6 @@ simple_when_clause:
+@@ -4390,7 +4341,6 @@ simple_when_clause:
  searched_when_clause:
            WHEN_SYM
            {
@@ -720,7 +729,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -4385,7 +4335,6 @@ searched_when_clause:
+@@ -4399,7 +4349,6 @@ searched_when_clause:
            }
            expr
            {
@@ -728,7 +737,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4421,7 +4370,7 @@ searched_when_clause:
+@@ -4435,7 +4384,7 @@ searched_when_clause:
            THEN_SYM
            sp_proc_stmts1
            {
@@ -737,7 +746,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
            }
          ;
-@@ -4429,7 +4378,6 @@ searched_when_clause:
+@@ -4443,7 +4392,6 @@ searched_when_clause:
  else_clause_opt:
            /* empty */
            {
@@ -745,7 +754,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4459,7 +4407,7 @@ sp_labeled_control:
+@@ -4473,7 +4421,7 @@ sp_labeled_control:
              }
              else
              {
@@ -754,7 +763,7 @@ index 0c9e81d..765e389 100644
                lab->type= sp_label::ITERATION;
              }
            }
-@@ -4501,7 +4449,7 @@ sp_labeled_block:
+@@ -4515,7 +4463,7 @@ sp_labeled_block:
                MYSQL_YYABORT;
              }
  
@@ -763,7 +772,7 @@ index 0c9e81d..765e389 100644
              lab->type= sp_label::BEGIN;
            }
            sp_block_content sp_opt_label
-@@ -4528,7 +4476,7 @@ sp_unlabeled_block:
+@@ -4542,7 +4490,7 @@ sp_unlabeled_block:
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
  
              sp_label *lab=
@@ -772,7 +781,7 @@ index 0c9e81d..765e389 100644
  
              lab->type= sp_label::BEGIN;
            }
-@@ -4544,7 +4492,6 @@ sp_block_content:
+@@ -4558,7 +4506,6 @@ sp_block_content:
            { /* QQ This is just a dummy for grouping declarations and statements
                together. No [[NOT] ATOMIC] yet, and we need to figure out how
                make it coexist with the existing BEGIN COMMIT/ROLLBACK. */
@@ -780,7 +789,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_pcontext *parent_pctx= lex->get_sp_current_parsing_ctx();
  
-@@ -4557,7 +4504,6 @@ sp_block_content:
+@@ -4571,7 +4518,6 @@ sp_block_content:
            sp_proc_stmts
            END
            {
@@ -788,7 +797,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4593,7 +4539,6 @@ sp_unlabeled_control:
+@@ -4607,7 +4553,6 @@ sp_unlabeled_control:
            LOOP_SYM
            sp_proc_stmts1 END LOOP_SYM
            {
@@ -796,7 +805,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4608,7 +4553,6 @@ sp_unlabeled_control:
+@@ -4622,7 +4567,6 @@ sp_unlabeled_control:
            }
          | WHILE_SYM 
            {
@@ -804,7 +813,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -4617,7 +4561,6 @@ sp_unlabeled_control:
+@@ -4631,7 +4575,6 @@ sp_unlabeled_control:
            }
            expr
            {
@@ -812,7 +821,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4655,7 +4598,6 @@ sp_unlabeled_control:
+@@ -4669,7 +4612,6 @@ sp_unlabeled_control:
            sp_proc_stmts1
            END WHILE_SYM
            {
@@ -820,7 +829,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -4671,7 +4613,6 @@ sp_unlabeled_control:
+@@ -4685,7 +4627,6 @@ sp_unlabeled_control:
            }
          | REPEAT_SYM sp_proc_stmts1 UNTIL_SYM 
            {
@@ -828,7 +837,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -4680,7 +4621,6 @@ sp_unlabeled_control:
+@@ -4694,7 +4635,6 @@ sp_unlabeled_control:
            }
            expr
            {
@@ -836,7 +845,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -5133,7 +5073,6 @@ create2:
+@@ -5147,7 +5087,6 @@ create2:
            create3 {}
          | LIKE table_ident
            {
@@ -844,7 +853,7 @@ index 0c9e81d..765e389 100644
              TABLE_LIST *src_table;
              LEX *lex= thd->lex;
  
-@@ -5148,7 +5087,6 @@ create2:
+@@ -5162,7 +5101,6 @@ create2:
            }
          | '(' LIKE table_ident ')'
            {
@@ -852,7 +861,7 @@ index 0c9e81d..765e389 100644
              TABLE_LIST *src_table;
              LEX *lex= thd->lex;
  
-@@ -5749,7 +5687,7 @@ part_value_expr_item:
+@@ -5763,7 +5701,7 @@ part_value_expr_item:
                my_parse_error(ER(ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR));
                MYSQL_YYABORT;
              }
@@ -861,7 +870,7 @@ index 0c9e81d..765e389 100644
              {
                MYSQL_YYABORT;
              }
-@@ -6207,7 +6145,6 @@ default_collation:
+@@ -6221,7 +6159,6 @@ default_collation:
  storage_engines:
            ident_or_text
            {
@@ -869,7 +878,7 @@ index 0c9e81d..765e389 100644
              plugin_ref plugin=
                ha_resolve_by_name(thd, &$1,
                  thd->lex->create_info.options & HA_LEX_CREATE_TMP_TABLE);
-@@ -6233,7 +6170,6 @@ storage_engines:
+@@ -6247,7 +6184,6 @@ storage_engines:
  known_storage_engines:
            ident_or_text
            {
@@ -877,7 +886,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              plugin_ref plugin=
                ha_resolve_by_name(thd, &$1,
-@@ -6469,7 +6405,7 @@ type:
+@@ -6483,7 +6419,7 @@ type:
                {
                  /* Reset unsupported positive column width to default value */
                  Lex->length= NULL;
@@ -886,7 +895,7 @@ index 0c9e81d..765e389 100644
                                      ER_INVALID_YEAR_COLUMN_LENGTH,
                                      ER(ER_INVALID_YEAR_COLUMN_LENGTH),
                                      length);
-@@ -6483,7 +6419,7 @@ type:
+@@ -6497,7 +6433,7 @@ type:
            { $$= MYSQL_TYPE_TIME2; }
          | TIMESTAMP type_datetime_precision
            {
@@ -895,7 +904,7 @@ index 0c9e81d..765e389 100644
                $$=MYSQL_TYPE_DATETIME2;
              else
              {
-@@ -6491,7 +6427,7 @@ type:
+@@ -6505,7 +6441,7 @@ type:
                  Unlike other types TIMESTAMP fields are NOT NULL by default.
                  This behavior is deprecated now.
                */
@@ -904,7 +913,7 @@ index 0c9e81d..765e389 100644
                  Lex->type|= NOT_NULL_FLAG;
  
                $$=MYSQL_TYPE_TIMESTAMP2;
-@@ -6618,7 +6554,7 @@ int_type:
+@@ -6632,7 +6568,7 @@ int_type:
  real_type:
            REAL
            {
@@ -913,7 +922,7 @@ index 0c9e81d..765e389 100644
                MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE;
            }
          | DOUBLE_SYM
-@@ -6807,7 +6743,7 @@ type_with_opt_collate:
+@@ -6821,7 +6757,7 @@ type_with_opt_collate:
  now:
            NOW_SYM func_datetime_precision
            {
@@ -922,7 +931,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            };
-@@ -7287,7 +7223,6 @@ string_list:
+@@ -7301,7 +7237,6 @@ string_list:
  alter:
            ALTER opt_ignore TABLE_SYM table_ident
            {
@@ -930,7 +939,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->name.str= 0;
              lex->name.length= 0;
-@@ -7313,7 +7248,6 @@ alter:
+@@ -7327,7 +7262,6 @@ alter:
            }
            alter_commands
            {
@@ -938,7 +947,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              if (!lex->m_sql_cmd)
              {
-@@ -7426,7 +7360,7 @@ alter:
+@@ -7440,7 +7374,7 @@ alter:
                Event_parse_data.
              */
  
@@ -947,7 +956,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
              Lex->event_parse_data->identifier= $4;
  
-@@ -7529,7 +7463,7 @@ alter_commands:
+@@ -7543,7 +7477,7 @@ alter_commands:
            /* empty */
          | DISCARD TABLESPACE
            {
@@ -956,7 +965,7 @@ index 0c9e81d..765e389 100644
                Sql_cmd_discard_import_tablespace(
                  Sql_cmd_discard_import_tablespace::DISCARD_TABLESPACE);
              if (Lex->m_sql_cmd == NULL)
-@@ -7537,7 +7471,7 @@ alter_commands:
+@@ -7551,7 +7485,7 @@ alter_commands:
            }
          | IMPORT TABLESPACE
            {
@@ -965,7 +974,7 @@ index 0c9e81d..765e389 100644
                Sql_cmd_discard_import_tablespace(
                  Sql_cmd_discard_import_tablespace::IMPORT_TABLESPACE);
              if (Lex->m_sql_cmd == NULL)
-@@ -7571,7 +7505,6 @@ alter_commands:
+@@ -7585,7 +7519,6 @@ alter_commands:
          | OPTIMIZE PARTITION_SYM opt_no_write_to_binlog
            all_or_alt_part_name_list
            {
@@ -973,7 +982,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->no_write_to_binlog= $3;
              lex->check_opt.init();
-@@ -7585,7 +7518,6 @@ alter_commands:
+@@ -7599,7 +7532,6 @@ alter_commands:
          | ANALYZE_SYM PARTITION_SYM opt_no_write_to_binlog
            all_or_alt_part_name_list
            {
@@ -981,7 +990,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->no_write_to_binlog= $3;
              lex->check_opt.init();
-@@ -7597,7 +7529,6 @@ alter_commands:
+@@ -7611,7 +7543,6 @@ alter_commands:
            }
          | CHECK_SYM PARTITION_SYM all_or_alt_part_name_list
            {
@@ -989,7 +998,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->check_opt.init();
              DBUG_ASSERT(!lex->m_sql_cmd);
-@@ -7610,7 +7541,6 @@ alter_commands:
+@@ -7624,7 +7555,6 @@ alter_commands:
          | REPAIR PARTITION_SYM opt_no_write_to_binlog
            all_or_alt_part_name_list
            {
@@ -997,7 +1006,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->no_write_to_binlog= $3;
              lex->check_opt.init();
-@@ -7630,7 +7560,6 @@ alter_commands:
+@@ -7644,7 +7574,6 @@ alter_commands:
            }
          | TRUNCATE_SYM PARTITION_SYM all_or_alt_part_name_list
            {
@@ -1005,7 +1014,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->check_opt.init();
              DBUG_ASSERT(!lex->m_sql_cmd);
-@@ -7643,7 +7572,6 @@ alter_commands:
+@@ -7657,7 +7586,6 @@ alter_commands:
          | EXCHANGE_SYM PARTITION_SYM alt_part_name_item
            WITH TABLE_SYM table_ident have_partitioning
            {
@@ -1013,7 +1022,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              size_t dummy;
              lex->select_lex.db=$6->db.str;
-@@ -7925,7 +7853,6 @@ alter_list_item:
+@@ -7939,7 +7867,6 @@ alter_list_item:
            {
              if (!$4)
              {
@@ -1021,7 +1030,7 @@ index 0c9e81d..765e389 100644
                $4= thd->variables.collation_database;
              }
              $5= $5 ? $5 : $4;
-@@ -8287,7 +8214,6 @@ repair:
+@@ -8301,7 +8228,6 @@ repair:
            }
            table_list opt_mi_repair_type
            {
@@ -1029,7 +1038,7 @@ index 0c9e81d..765e389 100644
              LEX* lex= thd->lex;
              DBUG_ASSERT(!lex->m_sql_cmd);
              lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_repair_table();
-@@ -8325,7 +8251,6 @@ analyze:
+@@ -8339,7 +8265,6 @@ analyze:
            }
            table_list
            {
@@ -1037,7 +1046,7 @@ index 0c9e81d..765e389 100644
              LEX* lex= thd->lex;
              DBUG_ASSERT(!lex->m_sql_cmd);
              lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_analyze_table();
-@@ -8360,7 +8285,6 @@ check:
+@@ -8374,7 +8299,6 @@ check:
            }
            table_list opt_mi_check_type
            {
@@ -1045,7 +1054,7 @@ index 0c9e81d..765e389 100644
              LEX* lex= thd->lex;
              DBUG_ASSERT(!lex->m_sql_cmd);
              lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_check_table();
-@@ -8401,7 +8325,6 @@ optimize:
+@@ -8415,7 +8339,6 @@ optimize:
            }
            table_list
            {
@@ -1053,7 +1062,7 @@ index 0c9e81d..765e389 100644
              LEX* lex= thd->lex;
              DBUG_ASSERT(!lex->m_sql_cmd);
              lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_optimize_table();
-@@ -8486,7 +8409,7 @@ keycache_list:
+@@ -8500,7 +8423,7 @@ keycache_list:
  assign_to_keycache:
            table_ident cache_keys_spec
            {
@@ -1062,7 +1071,7 @@ index 0c9e81d..765e389 100644
                                             MDL_SHARED_READ,
                                             Select->pop_index_hints()))
                MYSQL_YYABORT;
-@@ -8496,7 +8419,7 @@ assign_to_keycache:
+@@ -8510,7 +8433,7 @@ assign_to_keycache:
  assign_to_keycache_parts:
            table_ident adm_partition cache_keys_spec
            {
@@ -1071,7 +1080,7 @@ index 0c9e81d..765e389 100644
                                             MDL_SHARED_READ,
                                             Select->pop_index_hints()))
                MYSQL_YYABORT;
-@@ -8532,7 +8455,7 @@ preload_list:
+@@ -8546,7 +8469,7 @@ preload_list:
  preload_keys:
            table_ident cache_keys_spec opt_ignore_leaves
            {
@@ -1080,7 +1089,7 @@ index 0c9e81d..765e389 100644
                                             MDL_SHARED_READ,
                                             Select->pop_index_hints()))
                MYSQL_YYABORT;
-@@ -8542,7 +8465,7 @@ preload_keys:
+@@ -8556,7 +8479,7 @@ preload_keys:
  preload_keys_parts:
            table_ident adm_partition cache_keys_spec opt_ignore_leaves
            {
@@ -1089,7 +1098,7 @@ index 0c9e81d..765e389 100644
                                             MDL_SHARED_READ,
                                             Select->pop_index_hints()))
                MYSQL_YYABORT;
-@@ -8559,7 +8482,7 @@ adm_partition:
+@@ -8573,7 +8496,7 @@ adm_partition:
  
  cache_keys_spec:
            {
@@ -1098,7 +1107,7 @@ index 0c9e81d..765e389 100644
              Select->set_index_hint_type(INDEX_HINT_USE, 
                                          old_mode ? 
                                          INDEX_HINT_MASK_JOIN : 
-@@ -8774,7 +8697,6 @@ select_item_list:
+@@ -8788,7 +8711,6 @@ select_item_list:
          | select_item
          | '*'
            {
@@ -1106,7 +1115,7 @@ index 0c9e81d..765e389 100644
              Item *item= new (thd->mem_root)
                            Item_field(&thd->lex->current_select->context,
                                       NULL, NULL, "*");
-@@ -8789,14 +8711,11 @@ select_item_list:
+@@ -8803,14 +8725,11 @@ select_item_list:
  select_item:
            remember_name table_wild remember_end
            {
@@ -1121,7 +1130,7 @@ index 0c9e81d..765e389 100644
              DBUG_ASSERT($1 < $3);
  
              if (add_item_to_list(thd, $2))
-@@ -8891,7 +8810,7 @@ expr:
+@@ -8905,7 +8824,7 @@ expr:
              else
              {
                /* X OR Y */
@@ -1130,7 +1139,7 @@ index 0c9e81d..765e389 100644
                if ($$ == NULL)
                  MYSQL_YYABORT;
              }
-@@ -8899,7 +8818,7 @@ expr:
+@@ -8913,7 +8832,7 @@ expr:
          | expr XOR expr %prec XOR
            {
              /* XOR is a proprietary extension */
@@ -1139,7 +1148,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -8941,50 +8860,50 @@ expr:
+@@ -8955,50 +8874,50 @@ expr:
              else
              {
                /* X AND Y */
@@ -1198,7 +1207,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -8994,19 +8913,19 @@ expr:
+@@ -9008,19 +8927,19 @@ expr:
  bool_pri:
            bool_pri IS NULL_SYM %prec IS
            {
@@ -1221,7 +1230,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9028,13 +8947,12 @@ bool_pri:
+@@ -9042,13 +8961,12 @@ bool_pri:
  predicate:
            bit_expr IN_SYM '(' subselect ')'
            {
@@ -1236,7 +1245,7 @@ index 0c9e81d..765e389 100644
              Item *item= new (thd->mem_root) Item_in_subselect($1, $5);
              if (item == NULL)
                MYSQL_YYABORT;
-@@ -9044,7 +8962,7 @@ predicate:
+@@ -9058,7 +8976,7 @@ predicate:
            }
          | bit_expr IN_SYM '(' expr ')'
            {
@@ -1245,7 +1254,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9052,13 +8970,13 @@ predicate:
+@@ -9066,13 +8984,13 @@ predicate:
            { 
              $6->push_front($4);
              $6->push_front($1);
@@ -1261,7 +1270,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9066,7 +8984,7 @@ predicate:
+@@ -9080,7 +8998,7 @@ predicate:
            {
              $7->push_front($5);
              $7->push_front($1);
@@ -1270,7 +1279,7 @@ index 0c9e81d..765e389 100644
              if (item == NULL)
                MYSQL_YYABORT;
              item->negate();
-@@ -9074,14 +8992,14 @@ predicate:
+@@ -9088,14 +9006,14 @@ predicate:
            }
          | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate
            {
@@ -1287,7 +1296,7 @@ index 0c9e81d..765e389 100644
              if (item == NULL)
                MYSQL_YYABORT;
              item->negate();
-@@ -9089,42 +9007,42 @@ predicate:
+@@ -9103,42 +9021,42 @@ predicate:
            }
          | bit_expr SOUNDS_SYM LIKE bit_expr
            {
@@ -1339,7 +1348,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9134,85 +9052,85 @@ predicate:
+@@ -9148,85 +9066,85 @@ predicate:
  bit_expr:
            bit_expr '|' bit_expr %prec '|'
            {
@@ -1439,7 +1448,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9261,7 +9179,6 @@ simple_expr:
+@@ -9275,7 +9193,6 @@ simple_expr:
          | function_call_conflict
          | simple_expr COLLATE_SYM ident_or_text %prec NEG
            {
@@ -1447,7 +1456,7 @@ index 0c9e81d..765e389 100644
              Item *i1= new (thd->mem_root) Item_string($3.str,
                                                        $3.length,
                                                        thd->charset());
-@@ -9277,7 +9194,7 @@ simple_expr:
+@@ -9291,7 +9208,7 @@ simple_expr:
          | sum_expr
          | simple_expr OR_OR_SYM simple_expr
            {
@@ -1456,7 +1465,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9287,25 +9204,25 @@ simple_expr:
+@@ -9301,25 +9218,25 @@ simple_expr:
            }
          | '-' simple_expr %prec NEG
            {
@@ -1486,7 +1495,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9314,20 +9231,20 @@ simple_expr:
+@@ -9328,20 +9245,20 @@ simple_expr:
          | '(' expr ',' expr_list ')'
            {
              $4->push_front($2);
@@ -1510,7 +1519,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9364,7 +9281,7 @@ simple_expr:
+@@ -9378,7 +9295,7 @@ simple_expr:
                    type= MYSQL_TYPE_DATETIME;
                }
                if (type != MYSQL_TYPE_STRING)
@@ -1519,7 +1528,7 @@ index 0c9e81d..765e389 100644
                                              str.ptr(), str.length(),
                                              system_charset_info,
                                              type, false);
-@@ -9375,7 +9292,7 @@ simple_expr:
+@@ -9389,7 +9306,7 @@ simple_expr:
          | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')'
            {
              $2->push_front($5);
@@ -1528,7 +1537,7 @@ index 0c9e81d..765e389 100644
              if (i1 == NULL)
                MYSQL_YYABORT;
              Select->add_ftfunc_to_list(i1);
-@@ -9383,7 +9300,7 @@ simple_expr:
+@@ -9397,7 +9314,7 @@ simple_expr:
            }
          | BINARY simple_expr %prec NEG
            {
@@ -1537,7 +1546,7 @@ index 0c9e81d..765e389 100644
                                   &my_charset_bin);
              if ($$ == NULL)
                MYSQL_YYABORT;
-@@ -9391,27 +9308,27 @@ simple_expr:
+@@ -9405,27 +9322,27 @@ simple_expr:
          | CAST_SYM '(' expr AS cast_type ')'
            {
              LEX *lex= Lex;
@@ -1569,7 +1578,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9424,14 +9341,14 @@ simple_expr:
+@@ -9438,14 +9355,14 @@ simple_expr:
                my_error(ER_WRONG_COLUMN_NAME, MYF(0), il->m_name.ptr());
                MYSQL_YYABORT;
              }
@@ -1586,7 +1595,7 @@ index 0c9e81d..765e389 100644
                                                          $3);
              if ($$ == NULL)
                MYSQL_YYABORT;
-@@ -9439,7 +9356,7 @@ simple_expr:
+@@ -9453,7 +9370,7 @@ simple_expr:
          | INTERVAL_SYM expr interval '+' expr %prec INTERVAL_SYM
            /* we cannot put interval before - */
            {
@@ -1595,7 +1604,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9454,19 +9371,19 @@ simple_expr:
+@@ -9468,19 +9385,19 @@ simple_expr:
  function_call_keyword:
            CHAR_SYM '(' expr_list ')'
            {
@@ -1618,7 +1627,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
-@@ -9474,31 +9391,30 @@ function_call_keyword:
+@@ -9488,31 +9405,30 @@ function_call_keyword:
            }
          | DATE_SYM '(' expr ')'
            {
@@ -1654,7 +1663,7 @@ index 0c9e81d..765e389 100644
              List<Item> *list= new (thd->mem_root) List<Item>;
              if (list == NULL)
                MYSQL_YYABORT;
-@@ -9513,7 +9429,6 @@ function_call_keyword:
+@@ -9527,7 +9443,6 @@ function_call_keyword:
            }
          | INTERVAL_SYM '(' expr ',' expr ',' expr_list ')' %prec INTERVAL_SYM
            {
@@ -1662,7 +1671,7 @@ index 0c9e81d..765e389 100644
              $7->push_front($5);
              $7->push_front($3);
              Item_row *item= new (thd->mem_root) Item_row(*$7);
-@@ -9525,103 +9440,103 @@ function_call_keyword:
+@@ -9539,103 +9454,103 @@ function_call_keyword:
            }
          | LEFT '(' expr ',' expr ')'
            {
@@ -1783,7 +1792,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
-@@ -9629,7 +9544,7 @@ function_call_keyword:
+@@ -9643,7 +9558,7 @@ function_call_keyword:
            }
          | YEAR_SYM '(' expr ')'
            {
@@ -1792,7 +1801,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9650,27 +9565,27 @@ function_call_keyword:
+@@ -9664,27 +9579,27 @@ function_call_keyword:
  function_call_nonkeyword:
            ADDDATE_SYM '(' expr ',' expr ')'
            {
@@ -1824,7 +1833,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              Lex->safe_to_cache_query=0;
-@@ -9678,26 +9593,26 @@ function_call_nonkeyword:
+@@ -9692,26 +9607,26 @@ function_call_nonkeyword:
          | DATE_ADD_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')'
            %prec INTERVAL_SYM
            {
@@ -1855,7 +1864,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9708,44 +9623,44 @@ function_call_nonkeyword:
+@@ -9722,44 +9637,44 @@ function_call_nonkeyword:
            }
          | POSITION_SYM '(' bit_expr IN_SYM expr ')'
            {
@@ -1907,7 +1916,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9760,42 +9675,42 @@ function_call_nonkeyword:
+@@ -9774,42 +9689,42 @@ function_call_nonkeyword:
              */
              Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
              if (global_system_variables.sysdate_is_now == 0)
@@ -1957,7 +1966,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              Lex->safe_to_cache_query=0;
-@@ -9810,75 +9725,74 @@ function_call_nonkeyword:
+@@ -9824,75 +9739,74 @@ function_call_nonkeyword:
  function_call_conflict:
            ASCII_SYM '(' expr ')'
            {
@@ -2044,7 +2053,7 @@ index 0c9e81d..765e389 100644
              Item* i1;
              Lex->contains_plaintext_password= true;
              if (thd->variables.old_passwords == 1)
-@@ -9891,31 +9805,31 @@ function_call_conflict:
+@@ -9905,31 +9819,31 @@ function_call_conflict:
            }
          | QUARTER_SYM '(' expr ')'
            {
@@ -2081,7 +2090,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
-@@ -9923,13 +9837,12 @@ function_call_conflict:
+@@ -9937,13 +9851,12 @@ function_call_conflict:
            }
          | TRUNCATE_SYM '(' expr ',' expr ')'
            {
@@ -2096,7 +2105,7 @@ index 0c9e81d..765e389 100644
              Item *i1= new (thd->mem_root) Item_int(NAME_STRING("0"),
                                             thd->variables.default_week_format,
                                                     1);
-@@ -9941,19 +9854,19 @@ function_call_conflict:
+@@ -9955,19 +9868,19 @@ function_call_conflict:
            }
          | WEEK_SYM '(' expr ',' expr ')'
            {
@@ -2119,7 +2128,7 @@ index 0c9e81d..765e389 100644
                  Item_func_weight_string($3, 0, $6,
                                          $7 | MY_STRXFRM_PAD_WITH_SPACE);
              if ($$ == NULL)
-@@ -9961,17 +9874,17 @@ function_call_conflict:
+@@ -9975,17 +9888,17 @@ function_call_conflict:
            }
          | WEIGHT_STRING_SYM '(' expr AS BINARY ws_nweights ')'
            {
@@ -2140,7 +2149,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9993,52 +9906,52 @@ function_call_conflict:
+@@ -10007,52 +9920,52 @@ function_call_conflict:
  geometry_function:
            CONTAINS_SYM '(' expr ',' expr ')'
            {
@@ -2201,7 +2210,7 @@ index 0c9e81d..765e389 100644
                           Item_func_spatial_collection(* $3,
                             Geometry::wkb_polygon,
                             Geometry::wkb_linestring));
-@@ -10076,7 +9989,6 @@ function_call_generic:
+@@ -10090,7 +10003,6 @@ function_call_generic:
            }
            opt_udf_expr_list ')'
            {
@@ -2209,7 +2218,7 @@ index 0c9e81d..765e389 100644
              Create_func *builder;
              Item *item= NULL;
  
-@@ -10130,7 +10042,6 @@ function_call_generic:
+@@ -10144,7 +10056,6 @@ function_call_generic:
            }
          | ident '.' ident '(' opt_expr_list ')'
            {
@@ -2217,7 +2226,7 @@ index 0c9e81d..765e389 100644
              Create_qfunc *builder;
              Item *item= NULL;
  
-@@ -10192,7 +10103,7 @@ opt_udf_expr_list:
+@@ -10206,7 +10117,7 @@ opt_udf_expr_list:
  udf_expr_list:
            udf_expr
            {
@@ -2226,7 +2235,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              $$->push_back($1);
-@@ -10225,7 +10136,7 @@ udf_expr:
+@@ -10239,7 +10150,7 @@ udf_expr:
              */
              else if ($2->type() != Item::FIELD_ITEM &&
                       $2->type() != Item::REF_ITEM /* For HAVING */ )
@@ -2235,7 +2244,7 @@ index 0c9e81d..765e389 100644
              $$= $2;
            }
          ;
-@@ -10233,46 +10144,46 @@ udf_expr:
+@@ -10247,46 +10158,46 @@ udf_expr:
  sum_expr:
            AVG_SYM '(' in_sum_expr ')'
            {
@@ -2290,7 +2299,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -10282,13 +10193,13 @@ sum_expr:
+@@ -10296,13 +10207,13 @@ sum_expr:
            { Select->in_sum_expr--; }
            ')'
            {
@@ -2306,7 +2315,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -10299,55 +10210,55 @@ sum_expr:
+@@ -10313,55 +10224,55 @@ sum_expr:
          */
          | MIN_SYM '(' DISTINCT in_sum_expr ')'
            {
@@ -2371,7 +2380,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -10359,7 +10270,7 @@ sum_expr:
+@@ -10373,7 +10284,7 @@ sum_expr:
            {
              SELECT_LEX *sel= Select;
              sel->in_sum_expr--;
@@ -2380,7 +2389,7 @@ index 0c9e81d..765e389 100644
                    Item_func_group_concat(Lex->current_context(), $3, $5,
                                           sel->gorder_list, $7);
              if ($$ == NULL)
-@@ -10389,7 +10300,7 @@ variable_aux:
+@@ -10403,7 +10314,7 @@ variable_aux:
            {
              Item_func_set_user_var *item;
              $$= item=
@@ -2389,7 +2398,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              LEX *lex= Lex;
-@@ -10398,7 +10309,7 @@ variable_aux:
+@@ -10412,7 +10323,7 @@ variable_aux:
            }
          | ident_or_text
            {
@@ -2398,7 +2407,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              LEX *lex= Lex;
-@@ -10412,7 +10323,7 @@ variable_aux:
+@@ -10426,7 +10337,7 @@ variable_aux:
                my_parse_error(ER(ER_SYNTAX_ERROR));
                MYSQL_YYABORT;
              }
@@ -2407,7 +2416,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
              if (!((Item_func_get_system_var*) $$)->is_written_to_binlog())
                Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_VARIABLE);
-@@ -10427,7 +10338,7 @@ opt_distinct:
+@@ -10441,7 +10352,7 @@ opt_distinct:
  opt_gconcat_separator:
            /* empty */
            {
@@ -2416,7 +2425,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -10454,9 +10365,9 @@ opt_gorder_clause:
+@@ -10468,9 +10379,9 @@ opt_gorder_clause:
  
  gorder_list:
            gorder_list ',' order_ident order_dir
@@ -2428,7 +2437,7 @@ index 0c9e81d..765e389 100644
          ;
  
  in_sum_expr:
-@@ -10509,7 +10420,7 @@ opt_expr_list:
+@@ -10523,7 +10434,7 @@ opt_expr_list:
  expr_list:
            expr
            {
@@ -2437,7 +2446,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              $$->push_back($1);
-@@ -10529,7 +10440,7 @@ ident_list_arg:
+@@ -10543,7 +10454,7 @@ ident_list_arg:
  ident_list:
            simple_ident
            {
@@ -2446,7 +2455,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              $$->push_back($1);
-@@ -10629,7 +10540,7 @@ join_table:
+@@ -10643,7 +10554,7 @@ join_table:
            {
              MYSQL_YYABORT_UNLESS($1 && $3);
              /* Change the current name resolution context to a local context. */
@@ -2455,7 +2464,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
              Select->parsing_place= IN_ON;
            }
-@@ -10644,7 +10555,7 @@ join_table:
+@@ -10658,7 +10569,7 @@ join_table:
            {
              MYSQL_YYABORT_UNLESS($1 && $3);
              /* Change the current name resolution context to a local context. */
@@ -2464,7 +2473,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
              Select->parsing_place= IN_ON;
            }
-@@ -10674,7 +10585,7 @@ join_table:
+@@ -10688,7 +10599,7 @@ join_table:
            {
              MYSQL_YYABORT_UNLESS($1 && $5);
              /* Change the current name resolution context to a local context. */
@@ -2473,7 +2482,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
              Select->parsing_place= IN_ON;
            }
-@@ -10710,7 +10621,7 @@ join_table:
+@@ -10724,7 +10635,7 @@ join_table:
            {
              MYSQL_YYABORT_UNLESS($1 && $5);
              /* Change the current name resolution context to a local context. */
@@ -2482,7 +2491,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
              Select->parsing_place= IN_ON;
            }
-@@ -10781,7 +10692,7 @@ table_factor:
+@@ -10795,7 +10706,7 @@ table_factor:
            }
            table_ident opt_use_partition opt_table_alias opt_key_definition
            {
@@ -2491,7 +2500,7 @@ index 0c9e81d..765e389 100644
                                                  Select->get_table_join_options(),
                                                  YYPS->m_lock_type,
                                                  YYPS->m_mdl_type,
-@@ -11090,7 +11001,7 @@ index_hints_list:
+@@ -11104,7 +11015,7 @@ index_hints_list:
  
  opt_index_hints_list:
            /* empty */
@@ -2500,7 +2509,7 @@ index 0c9e81d..765e389 100644
          ;
  
  opt_key_definition:
-@@ -11099,15 +11010,15 @@ opt_key_definition:
+@@ -11113,15 +11024,15 @@ opt_key_definition:
          ;
  
  opt_key_usage_list:
@@ -2519,7 +2528,7 @@ index 0c9e81d..765e389 100644
          ;
  
  key_usage_list:
-@@ -11120,7 +11031,7 @@ using_list:
+@@ -11134,7 +11045,7 @@ using_list:
            {
              if (!($$= new List<String>))
                MYSQL_YYABORT;
@@ -2528,7 +2537,7 @@ index 0c9e81d..765e389 100644
                                                      $1.length,
                                                      system_charset_info);
              if (s == NULL)
-@@ -11129,7 +11040,7 @@ using_list:
+@@ -11143,7 +11054,7 @@ using_list:
            }
          | using_list ',' ident
            {
@@ -2537,7 +2546,7 @@ index 0c9e81d..765e389 100644
                                                      $3.length,
                                                      system_charset_info);
              if (s == NULL)
-@@ -11234,7 +11145,6 @@ opt_escape:
+@@ -11248,7 +11159,6 @@ opt_escape:
            }
          | /* empty */
            {
@@ -2545,7 +2554,7 @@ index 0c9e81d..765e389 100644
              Lex->escape_used= FALSE;
              $$= ((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ?
                   new (thd->mem_root) Item_string("", 0, &my_charset_latin1) :
-@@ -11255,9 +11165,9 @@ group_clause:
+@@ -11269,9 +11179,9 @@ group_clause:
  
  group_list:
            group_list ',' order_ident order_dir
@@ -2557,7 +2566,7 @@ index 0c9e81d..765e389 100644
          ;
  
  olap_opt:
-@@ -11324,7 +11234,6 @@ alter_order_list:
+@@ -11338,7 +11248,6 @@ alter_order_list:
  alter_order_item:
            simple_ident_nospvar order_dir
            {
@@ -2565,7 +2574,7 @@ index 0c9e81d..765e389 100644
              bool ascending= ($2 == 1) ? true : false;
              if (add_order_to_list(thd, $1, ascending))
                MYSQL_YYABORT;
-@@ -11377,9 +11286,9 @@ order_clause:
+@@ -11391,9 +11300,9 @@ order_clause:
  
  order_list:
            order_list ',' order_ident order_dir
@@ -2577,7 +2586,7 @@ index 0c9e81d..765e389 100644
          ;
  
  order_dir:
-@@ -11442,7 +11351,6 @@ limit_options:
+@@ -11456,7 +11365,6 @@ limit_options:
  limit_option:
          ident
          {
@@ -2585,7 +2594,7 @@ index 0c9e81d..765e389 100644
            LEX *lex= Lex;
            Lex_input_stream *lip= YYLIP;
            sp_head *sp= lex->sphead;
-@@ -11473,19 +11381,19 @@ limit_option:
+@@ -11487,19 +11395,19 @@ limit_option:
          }
          | ULONGLONG_NUM
            {
@@ -2608,7 +2617,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -11787,7 +11695,6 @@ drop:
+@@ -11801,7 +11709,6 @@ drop:
            }
          | DROP FUNCTION_SYM if_exists ident '.' ident
            {
@@ -2616,7 +2625,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_name *spname;
              if ($4.str &&
-@@ -11808,7 +11715,6 @@ drop:
+@@ -11822,7 +11729,6 @@ drop:
            }
          | DROP FUNCTION_SYM if_exists ident
            {
@@ -2624,7 +2633,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              LEX_STRING db= {0, 0};
              sp_name *spname;
-@@ -11893,7 +11799,7 @@ table_list:
+@@ -11907,7 +11813,7 @@ table_list:
  table_name:
            table_ident
            {
@@ -2633,7 +2642,7 @@ index 0c9e81d..765e389 100644
                                             TL_OPTION_UPDATING,
                                             YYPS->m_lock_type,
                                             YYPS->m_mdl_type))
-@@ -11904,7 +11810,7 @@ table_name:
+@@ -11918,7 +11824,7 @@ table_name:
  table_name_with_opt_use_partition:
            table_ident opt_use_partition
            {
@@ -2642,7 +2651,7 @@ index 0c9e81d..765e389 100644
                                             TL_OPTION_UPDATING,
                                             YYPS->m_lock_type,
                                             YYPS->m_mdl_type,
-@@ -11922,7 +11828,7 @@ table_alias_ref_list:
+@@ -11936,7 +11842,7 @@ table_alias_ref_list:
  table_alias_ref:
            table_ident_opt_wild
            {
@@ -2651,7 +2660,7 @@ index 0c9e81d..765e389 100644
                                             TL_OPTION_UPDATING | TL_OPTION_ALIAS,
                                             YYPS->m_lock_type,
                                             YYPS->m_mdl_type))
-@@ -12011,12 +11917,12 @@ insert_lock_option:
+@@ -12025,12 +11931,12 @@ insert_lock_option:
          | DELAYED_SYM
          {
            Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
@@ -2666,7 +2675,7 @@ index 0c9e81d..765e389 100644
                                ER_WARN_DEPRECATED_SYNTAX,
                                ER(ER_WARN_DEPRECATED_SYNTAX),
                                "INSERT DELAYED", "INSERT");
-@@ -12029,12 +11935,12 @@ replace_lock_option:
+@@ -12043,12 +11949,12 @@ replace_lock_option:
          | DELAYED_SYM
          {
            Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
@@ -2681,7 +2690,7 @@ index 0c9e81d..765e389 100644
                                ER_WARN_DEPRECATED_SYNTAX,
                                ER(ER_WARN_DEPRECATED_SYNTAX),
                                "REPLACE DELAYED", "REPLACE");
-@@ -12151,7 +12057,7 @@ expr_or_default:
+@@ -12165,7 +12071,7 @@ expr_or_default:
            expr { $$= $1;}
          | DEFAULT
            {
@@ -2690,7 +2699,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -12204,7 +12110,7 @@ update_list:
+@@ -12218,7 +12124,7 @@ update_list:
  update_elem:
            simple_ident_nospvar equal expr_or_default
            {
@@ -2699,7 +2708,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
            }
          ;
-@@ -12249,7 +12155,7 @@ delete:
+@@ -12263,7 +12169,7 @@ delete:
  single_multi:
            FROM table_ident opt_use_partition
            {
@@ -2708,7 +2717,7 @@ index 0c9e81d..765e389 100644
                                             YYPS->m_lock_type,
                                             YYPS->m_mdl_type,
                                             NULL,
-@@ -12295,7 +12201,7 @@ table_wild_one:
+@@ -12309,7 +12215,7 @@ table_wild_one:
              Table_ident *ti= new Table_ident($1);
              if (ti == NULL)
                MYSQL_YYABORT;
@@ -2717,7 +2726,7 @@ index 0c9e81d..765e389 100644
                                             ti,
                                             NULL,
                                             TL_OPTION_UPDATING | TL_OPTION_ALIAS,
-@@ -12305,10 +12211,10 @@ table_wild_one:
+@@ -12319,10 +12225,10 @@ table_wild_one:
            }
          | ident '.' ident opt_wild
            {
@@ -2730,7 +2739,7 @@ index 0c9e81d..765e389 100644
                                             ti,
                                             NULL,
                                             TL_OPTION_UPDATING | TL_OPTION_ALIAS,
-@@ -12348,7 +12254,6 @@ truncate:
+@@ -12362,7 +12268,6 @@ truncate:
            }
            table_name
            {
@@ -2738,7 +2747,7 @@ index 0c9e81d..765e389 100644
              LEX* lex= thd->lex;
              DBUG_ASSERT(!lex->m_sql_cmd);
              lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_truncate_table();
-@@ -12442,7 +12347,7 @@ show_param:
+@@ -12456,7 +12361,7 @@ show_param:
             {
               LEX *lex= Lex;
               lex->sql_command= SQLCOM_SHOW_DATABASES;
@@ -2747,7 +2756,7 @@ index 0c9e81d..765e389 100644
                 MYSQL_YYABORT;
             }
           | opt_full TABLES opt_db wild_and_where
-@@ -12450,7 +12355,7 @@ show_param:
+@@ -12464,7 +12369,7 @@ show_param:
               LEX *lex= Lex;
               lex->sql_command= SQLCOM_SHOW_TABLES;
               lex->select_lex.db= $3;
@@ -2756,7 +2765,7 @@ index 0c9e81d..765e389 100644
                 MYSQL_YYABORT;
             }
           | opt_full TRIGGERS_SYM opt_db wild_and_where
-@@ -12458,7 +12363,7 @@ show_param:
+@@ -12472,7 +12377,7 @@ show_param:
               LEX *lex= Lex;
               lex->sql_command= SQLCOM_SHOW_TRIGGERS;
               lex->select_lex.db= $3;
@@ -2765,7 +2774,7 @@ index 0c9e81d..765e389 100644
                 MYSQL_YYABORT;
             }
           | EVENTS_SYM opt_db wild_and_where
-@@ -12466,7 +12371,7 @@ show_param:
+@@ -12480,7 +12385,7 @@ show_param:
               LEX *lex= Lex;
               lex->sql_command= SQLCOM_SHOW_EVENTS;
               lex->select_lex.db= $2;
@@ -2774,7 +2783,7 @@ index 0c9e81d..765e389 100644
                 MYSQL_YYABORT;
             }
           | TABLE_SYM STATUS_SYM opt_db wild_and_where
-@@ -12474,7 +12379,7 @@ show_param:
+@@ -12488,7 +12393,7 @@ show_param:
               LEX *lex= Lex;
               lex->sql_command= SQLCOM_SHOW_TABLE_STATUS;
               lex->select_lex.db= $3;
@@ -2783,7 +2792,7 @@ index 0c9e81d..765e389 100644
                 MYSQL_YYABORT;
             }
          | OPEN_SYM TABLES opt_db wild_and_where
-@@ -12482,14 +12387,14 @@ show_param:
+@@ -12496,14 +12401,14 @@ show_param:
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_OPEN_TABLES;
              lex->select_lex.db= $3;
@@ -2800,7 +2809,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
            }
          | ENGINE_SYM known_storage_engines show_engine_param
-@@ -12502,7 +12407,7 @@ show_param:
+@@ -12516,7 +12421,7 @@ show_param:
              lex->sql_command= SQLCOM_SHOW_FIELDS;
              if ($5)
                $4->change_db($5);
@@ -2809,7 +2818,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
            }
          | master_or_binary LOGS_SYM
-@@ -12529,14 +12434,14 @@ show_param:
+@@ -12543,14 +12448,14 @@ show_param:
              lex->sql_command= SQLCOM_SHOW_KEYS;
              if ($4)
                $3->change_db($4);
@@ -2826,7 +2835,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
            }
          | PRIVILEGES
-@@ -12554,7 +12459,7 @@ show_param:
+@@ -12568,7 +12473,7 @@ show_param:
            { Lex->sql_command = SQLCOM_SHOW_ERRORS;}
          | PROFILES_SYM
            {
@@ -2835,7 +2844,7 @@ index 0c9e81d..765e389 100644
                                  ER_WARN_DEPRECATED_SYNTAX,
                                  ER(ER_WARN_DEPRECATED_SYNTAX),
                                  "SHOW PROFILES", "Performance Schema");
-@@ -12562,13 +12467,13 @@ show_param:
+@@ -12576,13 +12481,13 @@ show_param:
            }
          | PROFILE_SYM opt_profile_defs opt_profile_args opt_limit_clause_init
            {
@@ -2851,7 +2860,7 @@ index 0c9e81d..765e389 100644
                YYABORT;
            }
          | opt_var_type STATUS_SYM wild_and_where
-@@ -12576,7 +12481,7 @@ show_param:
+@@ -12590,7 +12495,7 @@ show_param:
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_STATUS;
              lex->option_type= $1;
@@ -2860,7 +2869,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
            }
          | opt_full PROCESSLIST_SYM
-@@ -12586,21 +12491,21 @@ show_param:
+@@ -12600,21 +12505,21 @@ show_param:
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_VARIABLES;
              lex->option_type= $1;
@@ -2885,7 +2894,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
            }
          | GRANTS
-@@ -12630,7 +12535,7 @@ show_param:
+@@ -12644,7 +12549,7 @@ show_param:
            {
              LEX *lex= Lex;
              lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -2894,7 +2903,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
              lex->only_view= 0;
              lex->create_info.storage_media= HA_SM_DEFAULT;
-@@ -12639,7 +12544,7 @@ show_param:
+@@ -12653,7 +12558,7 @@ show_param:
            {
              LEX *lex= Lex;
              lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -2903,7 +2912,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
              lex->only_view= 1;
            }
-@@ -12660,35 +12565,35 @@ show_param:
+@@ -12674,35 +12579,35 @@ show_param:
            {
             LEX *lex= Lex;
             Lex->sql_command= SQLCOM_SELECT;
@@ -2944,7 +2953,7 @@ index 0c9e81d..765e389 100644
               MYSQL_YYABORT;
            }
          | CREATE PROCEDURE_SYM sp_name
-@@ -12715,14 +12620,14 @@ show_param:
+@@ -12729,14 +12634,14 @@ show_param:
            {
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_STATUS_PROC;
@@ -2961,7 +2970,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
            }
          | PROCEDURE_SYM CODE_SYM sp_name
-@@ -12790,7 +12695,7 @@ wild_and_where:
+@@ -12804,7 +12709,7 @@ wild_and_where:
            /* empty */
          | LIKE TEXT_STRING_sys
            {
@@ -2970,7 +2979,7 @@ index 0c9e81d..765e389 100644
                                                      system_charset_info);
              if (Lex->wild == NULL)
                MYSQL_YYABORT;
-@@ -12813,7 +12718,7 @@ describe:
+@@ -12827,7 +12732,7 @@ describe:
              lex->sql_command= SQLCOM_SHOW_FIELDS;
              lex->select_lex.db= 0;
              lex->verbose= 0;
@@ -2979,7 +2988,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
            }
            opt_describe_column
-@@ -12883,7 +12788,7 @@ opt_describe_column:
+@@ -12897,7 +12802,7 @@ opt_describe_column:
          | text_string { Lex->wild= $1; }
          | ident
            {
@@ -2988,7 +2997,7 @@ index 0c9e81d..765e389 100644
                                                      $1.length,
                                                      system_charset_info);
              if (Lex->wild == NULL)
-@@ -13123,7 +13028,6 @@ use:
+@@ -13137,7 +13042,6 @@ use:
  load:
            LOAD data_or_xml
            {
@@ -2996,7 +3005,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
  
              if (lex->sphead)
-@@ -13146,7 +13050,7 @@ load:
+@@ -13160,7 +13064,7 @@ load:
            opt_duplicate INTO TABLE_SYM table_ident opt_use_partition
            {
              LEX *lex=Lex;
@@ -3005,7 +3014,7 @@ index 0c9e81d..765e389 100644
                                             $4, MDL_SHARED_WRITE, NULL, $13))
                MYSQL_YYABORT;
              lex->field_list.empty();
-@@ -13289,7 +13193,7 @@ field_or_var:
+@@ -13303,7 +13207,7 @@ field_or_var:
            simple_ident_nospvar {$$= $1;}
          | '@' ident_or_text
            {
@@ -3014,7 +3023,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -13310,16 +13214,16 @@ load_data_set_elem:
+@@ -13324,16 +13228,16 @@ load_data_set_elem:
            {
              LEX *lex= Lex;
              uint length= (uint) ($5 - $3);
@@ -3034,7 +3043,7 @@ index 0c9e81d..765e389 100644
            }
          ;
  
-@@ -13329,7 +13233,6 @@ text_literal:
+@@ -13343,7 +13247,6 @@ text_literal:
            TEXT_STRING
            {
              LEX_STRING tmp;
@@ -3042,7 +3051,7 @@ index 0c9e81d..765e389 100644
              const CHARSET_INFO *cs_con= thd->variables.collation_connection;
              const CHARSET_INFO *cs_cli= thd->variables.character_set_client;
              uint repertoire= thd->lex->text_string_is_7bit &&
-@@ -13355,7 +13258,7 @@ text_literal:
+@@ -13369,7 +13272,7 @@ text_literal:
              uint repertoire= Lex->text_string_is_7bit ?
                               MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30;
              DBUG_ASSERT(my_charset_is_ascii_based(national_charset_info));
@@ -3051,7 +3060,7 @@ index 0c9e81d..765e389 100644
                                                    national_charset_info,
                                                    DERIVATION_COERCIBLE,
                                                    repertoire);
-@@ -13364,7 +13267,7 @@ text_literal:
+@@ -13378,7 +13281,7 @@ text_literal:
            }
          | UNDERSCORE_CHARSET TEXT_STRING
            {
@@ -3060,7 +3069,7 @@ index 0c9e81d..765e389 100644
                                                                  $2.length, $1);
              if (str == NULL)
                MYSQL_YYABORT;
-@@ -13383,7 +13286,7 @@ text_literal:
+@@ -13397,7 +13300,7 @@ text_literal:
                   If the string has been pure ASCII so far,
                   check the new part.
                */
@@ -3069,7 +3078,7 @@ index 0c9e81d..765e389 100644
                item->collation.repertoire|= my_string_repertoire(cs,
                                                                  $2.str,
                                                                  $2.length);
-@@ -13394,15 +13297,15 @@ text_literal:
+@@ -13408,15 +13311,15 @@ text_literal:
  text_string:
            TEXT_STRING_literal
            {
@@ -3088,7 +3097,7 @@ index 0c9e81d..765e389 100644
              if (tmp == NULL)
                MYSQL_YYABORT;
              /*
-@@ -13414,7 +13317,7 @@ text_string:
+@@ -13428,7 +13331,7 @@ text_string:
            }
          | BIN_NUM
            {
@@ -3097,7 +3106,7 @@ index 0c9e81d..765e389 100644
              if (tmp == NULL)
                MYSQL_YYABORT;
              /*
-@@ -13429,7 +13332,6 @@ text_string:
+@@ -13443,7 +13346,6 @@ text_string:
  param_marker:
            PARAM_MARKER
            {
@@ -3105,7 +3114,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              Lex_input_stream *lip= YYLIP;
              Item_param *item;
-@@ -13464,38 +13366,38 @@ literal:
+@@ -13478,38 +13380,38 @@ literal:
          | temporal_literal { $$= $1; }
          | NULL_SYM
            {
@@ -3150,7 +3159,7 @@ index 0c9e81d..765e389 100644
              if (tmp == NULL)
                MYSQL_YYABORT;
              /*
-@@ -13506,7 +13408,7 @@ literal:
+@@ -13520,7 +13422,7 @@ literal:
              String *str= tmp->val_str((String*) 0);
  
              Item_string *item_str;
@@ -3159,7 +3168,7 @@ index 0c9e81d..765e389 100644
                          Item_string(null_name_string, /* name will be set in select_item */
                                      str ? str->ptr() : "",
                                      str ? str->length() : 0,
-@@ -13524,7 +13426,7 @@ literal:
+@@ -13538,7 +13440,7 @@ literal:
            }
          | UNDERSCORE_CHARSET BIN_NUM
            {
@@ -3168,7 +3177,7 @@ index 0c9e81d..765e389 100644
              if (tmp == NULL)
                MYSQL_YYABORT;
              /*
-@@ -13535,7 +13437,7 @@ literal:
+@@ -13549,7 +13451,7 @@ literal:
              String *str= tmp->val_str((String*) 0);
  
              Item_string *item_str;
@@ -3177,7 +3186,7 @@ index 0c9e81d..765e389 100644
                          Item_string(null_name_string, /* name will be set in select_item */
                                      str ? str->ptr() : "",
                                      str ? str->length() : 0,
-@@ -13556,7 +13458,7 @@ NUM_literal:
+@@ -13570,7 +13472,7 @@ NUM_literal:
            NUM
            {
              int error;
@@ -3186,7 +3195,7 @@ index 0c9e81d..765e389 100644
                    Item_int($1,
                             (longlong) my_strtoll10($1.str, NULL, &error),
                             $1.length);
-@@ -13566,7 +13468,7 @@ NUM_literal:
+@@ -13580,7 +13482,7 @@ NUM_literal:
          | LONG_NUM
            {
              int error;
@@ -3195,7 +3204,7 @@ index 0c9e81d..765e389 100644
                    Item_int($1,
                             (longlong) my_strtoll10($1.str, NULL, &error),
                             $1.length);
-@@ -13575,23 +13477,23 @@ NUM_literal:
+@@ -13589,23 +13491,23 @@ NUM_literal:
            }
          | ULONGLONG_NUM
            {
@@ -3225,7 +3234,7 @@ index 0c9e81d..765e389 100644
              {
                MYSQL_YYABORT;
              }
-@@ -13602,19 +13504,19 @@ NUM_literal:
+@@ -13616,19 +13518,19 @@ NUM_literal:
  temporal_literal:
          DATE_SYM TEXT_STRING
            {
@@ -3248,7 +3257,7 @@ index 0c9e81d..765e389 100644
                                                MYSQL_TYPE_DATETIME, true)))
                MYSQL_YYABORT;
            }
-@@ -13636,7 +13538,7 @@ table_wild:
+@@ -13650,7 +13552,7 @@ table_wild:
            ident '.' '*'
            {
              SELECT_LEX *sel= Select;
@@ -3257,7 +3266,7 @@ index 0c9e81d..765e389 100644
                                                   NullS, $1.str, "*");
              if ($$ == NULL)
                MYSQL_YYABORT;
-@@ -13644,7 +13546,6 @@ table_wild:
+@@ -13658,7 +13560,6 @@ table_wild:
            }
          | ident '.' ident '.' '*'
            {
@@ -3265,7 +3274,7 @@ index 0c9e81d..765e389 100644
              SELECT_LEX *sel= Select;
              const char* schema= thd->client_capabilities & CLIENT_NO_SCHEMA ?
                                    NullS : $1.str;
-@@ -13664,7 +13565,6 @@ order_ident:
+@@ -13678,7 +13579,6 @@ order_ident:
  simple_ident:
            ident
            {
@@ -3273,7 +3282,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_pcontext *pctx = lex->get_sp_current_parsing_ctx();
              sp_variable *spv;
-@@ -13719,7 +13619,6 @@ simple_ident:
+@@ -13733,7 +13633,6 @@ simple_ident:
  simple_ident_nospvar:
            ident
            {
@@ -3281,7 +3290,7 @@ index 0c9e81d..765e389 100644
              SELECT_LEX *sel=Select;
              if ((sel->parsing_place != IN_HAVING) ||
                  (sel->get_in_sum_expr() > 0))
-@@ -13741,7 +13640,6 @@ simple_ident_nospvar:
+@@ -13755,7 +13654,6 @@ simple_ident_nospvar:
  simple_ident_q:
            ident '.' ident
            {
@@ -3289,7 +3298,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -13821,7 +13719,6 @@ simple_ident_q:
+@@ -13835,7 +13733,6 @@ simple_ident_q:
            }
          | '.' ident '.' ident
            {
@@ -3297,7 +3306,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              SELECT_LEX *sel= lex->current_select;
              if (sel->no_table_names_allowed)
-@@ -13846,7 +13743,6 @@ simple_ident_q:
+@@ -13860,7 +13757,6 @@ simple_ident_q:
            }
          | ident '.' ident '.' ident
            {
@@ -3305,7 +3314,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              SELECT_LEX *sel= lex->current_select;
              const char* schema= (thd->client_capabilities & CLIENT_NO_SCHEMA ?
-@@ -13914,7 +13810,7 @@ table_ident:
+@@ -13928,7 +13824,7 @@ table_ident:
            }
          | ident '.' ident
            {
@@ -3314,7 +3323,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -13936,7 +13832,7 @@ table_ident_opt_wild:
+@@ -13950,7 +13846,7 @@ table_ident_opt_wild:
            }
          | ident '.' ident opt_wild
            {
@@ -3323,7 +3332,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -13946,7 +13842,7 @@ table_ident_nodb:
+@@ -13960,7 +13856,7 @@ table_ident_nodb:
            ident
            {
              LEX_STRING db={(char*) any_db,3};
@@ -3332,7 +3341,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -13956,8 +13852,6 @@ IDENT_sys:
+@@ -13970,8 +13866,6 @@ IDENT_sys:
            IDENT { $$= $1; }
          | IDENT_QUOTED
            {
@@ -3341,7 +3350,7 @@ index 0c9e81d..765e389 100644
              if (thd->charset_is_system_charset)
              {
                const CHARSET_INFO *cs= system_charset_info;
-@@ -13999,8 +13893,6 @@ TEXT_STRING_sys_nonewline:
+@@ -14013,8 +13907,6 @@ TEXT_STRING_sys_nonewline:
  TEXT_STRING_sys:
            TEXT_STRING
            {
@@ -3350,7 +3359,7 @@ index 0c9e81d..765e389 100644
              if (thd->charset_is_system_charset)
                $$= $1;
              else
-@@ -14015,8 +13907,6 @@ TEXT_STRING_sys:
+@@ -14029,8 +13921,6 @@ TEXT_STRING_sys:
  TEXT_STRING_literal:
            TEXT_STRING
            {
@@ -3359,7 +3368,7 @@ index 0c9e81d..765e389 100644
              if (thd->charset_is_collation_connection)
                $$= $1;
              else
-@@ -14031,8 +13921,6 @@ TEXT_STRING_literal:
+@@ -14045,8 +13935,6 @@ TEXT_STRING_literal:
  TEXT_STRING_filesystem:
            TEXT_STRING
            {
@@ -3368,7 +3377,7 @@ index 0c9e81d..765e389 100644
              if (thd->charset_is_character_set_filesystem)
                $$= $1;
              else
-@@ -14049,7 +13937,6 @@ ident:
+@@ -14063,7 +13951,6 @@ ident:
            IDENT_sys    { $$=$1; }
          | keyword
            {
@@ -3376,7 +3385,7 @@ index 0c9e81d..765e389 100644
              $$.str= thd->strmake($1.str, $1.length);
              if ($$.str == NULL)
                MYSQL_YYABORT;
-@@ -14061,7 +13948,6 @@ label_ident:
+@@ -14075,7 +13962,6 @@ label_ident:
            IDENT_sys    { $$=$1; }
          | keyword_sp
            {
@@ -3384,7 +3393,7 @@ index 0c9e81d..765e389 100644
              $$.str= thd->strmake($1.str, $1.length);
              if ($$.str == NULL)
                MYSQL_YYABORT;
-@@ -14078,7 +13964,6 @@ ident_or_text:
+@@ -14092,7 +13978,6 @@ ident_or_text:
  user:
            ident_or_text
            {
@@ -3392,7 +3401,7 @@ index 0c9e81d..765e389 100644
              if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
                MYSQL_YYABORT;
              $$->user= $1;
-@@ -14105,7 +13990,6 @@ user:
+@@ -14119,7 +14004,6 @@ user:
            }
          | ident_or_text '@' ident_or_text
            {
@@ -3400,7 +3409,7 @@ index 0c9e81d..765e389 100644
              if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
                MYSQL_YYABORT;
              $$->user= $1;
-@@ -14138,7 +14022,7 @@ user:
+@@ -14152,7 +14036,7 @@ user:
            }
          | CURRENT_USER optional_braces
            {
@@ -3409,7 +3418,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
              /* 
                empty LEX_USER means current_user and 
-@@ -14542,7 +14426,7 @@ set:
+@@ -14557,7 +14441,7 @@ set:
              lex->one_shot_set= 0;
              lex->autocommit= 0;
  
@@ -3418,7 +3427,7 @@ index 0c9e81d..765e389 100644
            }
            start_option_value_list
            {}
-@@ -14553,7 +14437,7 @@ set:
+@@ -14596,7 +14480,7 @@ set_stmt_option_value_following_option_type_list:
  start_option_value_list:
            option_value_no_option_type
            {
@@ -3427,7 +3436,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
            }
            option_value_list_continued
-@@ -14563,7 +14447,7 @@ start_option_value_list:
+@@ -14606,7 +14490,7 @@ start_option_value_list:
            }
            transaction_characteristics
            {
@@ -3436,7 +3445,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT;
            }
          | option_type
-@@ -14578,13 +14462,13 @@ start_option_value_list:
+@@ -14621,13 +14505,13 @@ start_option_value_list:
  start_option_value_list_following_option_type:
            option_value_following_option_type
            {
@@ -3452,7 +3461,7 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT; 
            }
          ;
-@@ -14598,20 +14482,20 @@ option_value_list_continued:
+@@ -14641,20 +14525,20 @@ option_value_list_continued:
  // Repeating list of option values after first option value.
  option_value_list:
            {
@@ -3477,15 +3486,15 @@ index 0c9e81d..765e389 100644
                MYSQL_YYABORT; 
            }
          ;
-@@ -14650,7 +14534,6 @@ opt_var_ident_type:
+@@ -14693,7 +14577,6 @@ opt_var_ident_type:
  option_value_following_option_type:
            internal_variable_name equal set_expr_or_default
            {
 -            THD *thd= YYTHD;
              LEX *lex= Lex;
- 
-             if ($1.var && $1.var != trg_new_row_fake_var)
-@@ -14682,7 +14565,6 @@ option_value_no_option_type:
+             /*
+               Ignore SET STATEMENT variables list on slaves because system
+@@ -14733,7 +14616,6 @@ option_value_no_option_type:
            }
            set_expr_or_default
            {
@@ -3493,7 +3502,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
              const char *expr_start_ptr= NULL;
-@@ -14776,7 +14658,7 @@ option_value_no_option_type:
+@@ -14827,7 +14709,7 @@ option_value_no_option_type:
          | '@' ident_or_text equal expr
            {
              Item_func_set_user_var *item;
@@ -3502,7 +3511,7 @@ index 0c9e81d..765e389 100644
              if (item == NULL)
                MYSQL_YYABORT;
              set_var_user *var= new set_var_user(item);
-@@ -14786,7 +14668,6 @@ option_value_no_option_type:
+@@ -14837,7 +14719,6 @@ option_value_no_option_type:
            }
          | '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default
            {
@@ -3510,7 +3519,7 @@ index 0c9e81d..765e389 100644
              struct sys_var_with_base tmp= $4;
              /* Lookup if necessary: must be a system variable. */
              if (tmp.var == NULL)
-@@ -14799,7 +14680,6 @@ option_value_no_option_type:
+@@ -14850,7 +14731,6 @@ option_value_no_option_type:
            }
          | charset old_or_new_charset_name_or_default
            {
@@ -3518,7 +3527,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              int flags= $2 ? 0 : set_var_collation_client::SET_CS_DEFAULT;
              const CHARSET_INFO *cs2;
-@@ -14850,7 +14730,6 @@ option_value_no_option_type:
+@@ -14901,7 +14781,6 @@ option_value_no_option_type:
            }
          | PASSWORD equal text_or_password
            {
@@ -3526,7 +3535,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
-@@ -14927,7 +14806,6 @@ option_value_no_option_type:
+@@ -14978,7 +14857,6 @@ option_value_no_option_type:
  internal_variable_name:
            ident
            {
@@ -3534,7 +3543,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
              sp_variable *spv;
-@@ -14990,7 +14868,7 @@ internal_variable_name:
+@@ -15041,7 +14919,7 @@ internal_variable_name:
              }
              else
              {
@@ -3543,7 +3552,7 @@ index 0c9e81d..765e389 100644
                if (!tmp)
                  MYSQL_YYABORT;
                if (!tmp->is_struct())
-@@ -15001,7 +14879,7 @@ internal_variable_name:
+@@ -15052,7 +14930,7 @@ internal_variable_name:
            }
          | DEFAULT '.' ident
            {
@@ -3552,7 +3561,7 @@ index 0c9e81d..765e389 100644
              if (!tmp)
                MYSQL_YYABORT;
              if (!tmp->is_struct())
-@@ -15022,7 +14900,6 @@ transaction_characteristics:
+@@ -15073,7 +14951,6 @@ transaction_characteristics:
  transaction_access_mode:
            transaction_access_mode_types
            {
@@ -3560,7 +3569,7 @@ index 0c9e81d..765e389 100644
              LEX *lex=Lex;
              Item *item= new (thd->mem_root) Item_int((int32) $1);
              if (item == NULL)
-@@ -15040,7 +14917,6 @@ transaction_access_mode:
+@@ -15091,7 +14968,6 @@ transaction_access_mode:
  isolation_level:
            ISOLATION LEVEL_SYM isolation_types
            {
@@ -3568,7 +3577,7 @@ index 0c9e81d..765e389 100644
              LEX *lex=Lex;
              Item *item= new (thd->mem_root) Item_int((int32) $3);
              if (item == NULL)
-@@ -15074,13 +14950,13 @@ text_or_password:
+@@ -15125,13 +15001,13 @@ text_or_password:
              if ($3.length == 0)
               $$= $3.str;
              else
@@ -3585,7 +3594,7 @@ index 0c9e81d..765e389 100644
                  break;
              }
              if ($$ == NULL)
-@@ -15090,7 +14966,7 @@ text_or_password:
+@@ -15141,7 +15017,7 @@ text_or_password:
          | OLD_PASSWORD '(' TEXT_STRING ')'
            {
              $$= $3.length ? Item_func_old_password::
@@ -3594,7 +3603,7 @@ index 0c9e81d..765e389 100644
                $3.str;
              if ($$ == NULL)
                MYSQL_YYABORT;
-@@ -15104,19 +14980,19 @@ set_expr_or_default:
+@@ -15155,19 +15031,19 @@ set_expr_or_default:
          | DEFAULT { $$=0; }
          | ON
            {
@@ -3617,7 +3626,7 @@ index 0c9e81d..765e389 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -15155,7 +15031,7 @@ table_lock:
+@@ -15206,7 +15082,7 @@ table_lock:
            {
              thr_lock_type lock_type= (thr_lock_type) $3;
              bool lock_for_write= (lock_type >= TL_WRITE_ALLOW_WRITE);
@@ -3626,7 +3635,7 @@ index 0c9e81d..765e389 100644
                                             (lock_for_write ?
                                              MDL_SHARED_NO_READ_WRITE :
                                              MDL_SHARED_READ)))
-@@ -15169,7 +15045,7 @@ lock_option:
+@@ -15220,7 +15096,7 @@ lock_option:
          | LOW_PRIORITY WRITE_SYM 
            { 
              $$= TL_WRITE_LOW_PRIORITY; 
@@ -3635,7 +3644,7 @@ index 0c9e81d..765e389 100644
            }
          | READ_SYM LOCAL_SYM     { $$= TL_READ; }
          ;
-@@ -15197,7 +15073,6 @@ unlock:
+@@ -15248,7 +15124,6 @@ unlock:
  handler:
            HANDLER_SYM table_ident OPEN_SYM opt_table_alias
            {
@@ -3643,7 +3652,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              if (lex->sphead)
              {
-@@ -15213,7 +15088,6 @@ handler:
+@@ -15264,7 +15139,6 @@ handler:
            }
          | HANDLER_SYM table_ident_nodb CLOSE_SYM
            {
@@ -3651,7 +3660,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              if (lex->sphead)
              {
-@@ -15237,7 +15111,7 @@ handler:
+@@ -15288,7 +15162,7 @@ handler:
              }
              lex->expr_allows_subselect= FALSE;
              lex->sql_command = SQLCOM_HA_READ;
@@ -3660,7 +3669,7 @@ index 0c9e81d..765e389 100644
              if (one == NULL)
                MYSQL_YYABORT;
              lex->current_select->select_limit= one;
-@@ -15247,7 +15121,6 @@ handler:
+@@ -15298,7 +15172,6 @@ handler:
            }
            handler_read_or_scan where_clause opt_limit_clause
            {
@@ -3668,7 +3677,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              Lex->expr_allows_subselect= TRUE;
              /* Stored functions are not supported for HANDLER READ. */
-@@ -15282,7 +15155,7 @@ handler_rkey_function:
+@@ -15333,7 +15206,7 @@ handler_rkey_function:
          | LAST_SYM  { $$= RLAST;  }
          | handler_rkey_mode
            {
@@ -3677,7 +3686,7 @@ index 0c9e81d..765e389 100644
              Lex->insert_list= new List_item;
              if (! Lex->insert_list)
                MYSQL_YYABORT;
-@@ -15590,8 +15463,8 @@ grant_user:
+@@ -15641,8 +15514,8 @@ grant_user:
                my_parse_error(ER(ER_SYNTAX_ERROR));
                MYSQL_YYABORT;
              }
@@ -3688,7 +3697,7 @@ index 0c9e81d..765e389 100644
              check_password_policy(password);
              /*
                1. Plugin must be resolved
-@@ -15611,8 +15484,8 @@ grant_user:
+@@ -15662,8 +15535,8 @@ grant_user:
              $1->password= $5; 
              if (!strcmp($5.str, ""))
              {
@@ -3699,7 +3708,7 @@ index 0c9e81d..765e389 100644
                check_password_policy(password);
              }
              /*
-@@ -15670,7 +15543,7 @@ column_list:
+@@ -15721,7 +15594,7 @@ column_list:
  column_list_id:
            ident
            {
@@ -3708,7 +3717,7 @@ index 0c9e81d..765e389 100644
              if (new_str == NULL)
                MYSQL_YYABORT;
              List_iterator <LEX_COLUMN> iter(Lex->columns);
-@@ -15880,7 +15753,6 @@ opt_union_order_or_limit:
+@@ -15931,7 +15804,6 @@ opt_union_order_or_limit:
  
  union_order_or_limit:
            {
@@ -3716,7 +3725,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE);
              SELECT_LEX *sel= lex->current_select;
-@@ -15896,7 +15768,6 @@ union_order_or_limit:
+@@ -15947,7 +15819,6 @@ union_order_or_limit:
            }
            order_or_limit
            {
@@ -3724,7 +3733,7 @@ index 0c9e81d..765e389 100644
              thd->lex->current_select->no_table_names_allowed= 0;
              thd->where= "";
            }
-@@ -16078,14 +15949,14 @@ no_definer:
+@@ -16129,14 +16000,14 @@ no_definer:
                from older master servers (i.e. to create non-suid trigger in this
                case).
              */
@@ -3741,7 +3750,7 @@ index 0c9e81d..765e389 100644
            }
          ;
  
-@@ -16130,7 +16001,6 @@ view_suid:
+@@ -16181,7 +16052,6 @@ view_suid:
  view_tail:
            view_suid VIEW_SYM table_ident
            {
@@ -3749,7 +3758,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              lex->sql_command= SQLCOM_CREATE_VIEW;
              /* first table in list is target VIEW name */
-@@ -16174,7 +16044,6 @@ view_select:
+@@ -16225,7 +16095,6 @@ view_select:
            }
            view_select_aux view_check_option
            {
@@ -3757,7 +3766,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              uint len= YYLIP->get_cpp_ptr() - lex->create_view_select.str;
              void *create_view_select= thd->memdup(lex->create_view_select.str, len);
-@@ -16266,7 +16135,6 @@ trigger_tail:
+@@ -16317,7 +16186,6 @@ trigger_tail:
            EACH_SYM          /* $13 */
            ROW_SYM           /* $14 */
            {                 /* $15 */
@@ -3765,7 +3774,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              Lex_input_stream *lip= YYLIP;
  
-@@ -16296,7 +16164,6 @@ trigger_tail:
+@@ -16347,7 +16215,6 @@ trigger_tail:
            }
            sp_proc_stmt /* $16 */
            { /* $17 */
@@ -3773,7 +3782,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
              sp_head *sp= lex->sphead;
  
-@@ -16331,7 +16198,6 @@ udf_tail:
+@@ -16382,7 +16249,6 @@ udf_tail:
            AGGREGATE_SYM remember_name FUNCTION_SYM ident
            RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys
            {
@@ -3781,7 +3790,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              if (is_native_function(thd, & $4))
              {
-@@ -16349,7 +16215,6 @@ udf_tail:
+@@ -16400,7 +16266,6 @@ udf_tail:
          | remember_name FUNCTION_SYM ident
            RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys
            {
@@ -3789,7 +3798,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              if (is_native_function(thd, & $3))
              {
-@@ -16372,7 +16237,6 @@ sf_tail:
+@@ -16423,7 +16288,6 @@ sf_tail:
            sp_name /* $3 */
            '(' /* $4 */
            { /* $5 */
@@ -3797,7 +3806,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
  
              lex->stmt_definition_begin= $1;
-@@ -16431,7 +16295,7 @@ sf_tail:
+@@ -16482,7 +16346,7 @@ sf_tail:
                MYSQL_YYABORT;
              }
  
@@ -3806,7 +3815,7 @@ index 0c9e81d..765e389 100644
                                        (enum enum_field_types) $11,
                                        &sp->m_return_field_def))
                MYSQL_YYABORT;
-@@ -16440,7 +16304,6 @@ sf_tail:
+@@ -16491,7 +16355,6 @@ sf_tail:
            }
            sp_c_chistics /* $13 */
            { /* $14 */
@@ -3814,7 +3823,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
  
              lex->sphead->m_chistics= &lex->sp_chistics;
-@@ -16448,7 +16311,6 @@ sf_tail:
+@@ -16499,7 +16362,6 @@ sf_tail:
            }
            sp_proc_stmt /* $15 */
            {
@@ -3822,7 +3831,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -16506,7 +16368,6 @@ sf_tail:
+@@ -16557,7 +16419,6 @@ sf_tail:
  sp_tail:
            PROCEDURE_SYM remember_name sp_name
            {
@@ -3830,7 +3839,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
  
              if (lex->sphead)
-@@ -16539,7 +16400,6 @@ sp_tail:
+@@ -16590,7 +16451,6 @@ sp_tail:
            sp_pdparam_list
            ')'
            {
@@ -3838,7 +3847,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
  
              Lex->sphead->m_parser_data.set_parameter_end_ptr(
-@@ -16549,7 +16409,6 @@ sp_tail:
+@@ -16600,7 +16460,6 @@ sp_tail:
            }
            sp_c_chistics
            {
@@ -3846,7 +3855,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= thd->lex;
  
              lex->sphead->m_chistics= &lex->sp_chistics;
-@@ -16557,7 +16416,6 @@ sp_tail:
+@@ -16608,7 +16467,6 @@ sp_tail:
            }
            sp_proc_stmt
            {
@@ -3854,7 +3863,7 @@ index 0c9e81d..765e389 100644
              LEX *lex= Lex;
  
              sp_finish_parsing(thd);
-@@ -16599,21 +16457,21 @@ xid:
+@@ -16650,21 +16508,21 @@ xid:
            text_string
            {
              MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE);
diff --git a/community/pidgin-hotkeys/PKGBUILD b/community/pidgin-hotkeys/PKGBUILD
index bd2130cab..98a10a1c5 100644
--- a/community/pidgin-hotkeys/PKGBUILD
+++ b/community/pidgin-hotkeys/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80723 2012-12-01 13:56:24Z fyan $
+# $Id: PKGBUILD 99153 2013-10-25 05:05:18Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: detto <detto-brumm@freenet.de>
 
 pkgname=pidgin-hotkeys
 pkgver=0.2.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A Pidgin plugin that allows you to define global hotkeys."
 arch=('i686' 'x86_64')
 url="http://pidgin-hotkeys.sourceforge.net"
diff --git a/community/plank/PKGBUILD b/community/plank/PKGBUILD
new file mode 100644
index 000000000..c36204e7b
--- /dev/null
+++ b/community/plank/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 99220 2013-10-25 21:06:18Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com> 
+# Contributor: Ner0 <darkelfdarkelf666 at yahoo dot co dot uk>
+# Contributor: dcelasun <dcelasun at gmaild dot com>
+
+pkgname=plank
+pkgver=0.4.0
+pkgrel=1
+pkgdesc="Elegant, simple, clean dock"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/plank"
+license=('GPL3')
+depends=('bamf' 'libdbusmenu-gtk3' 'libgee' 'python2')
+makedepends=('gnome-common' 'intltool' 'vala')
+install="${pkgname}.install"
+source=("https://launchpad.net/${pkgname}/1.0/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('b8417bce7d88ac1f339e948c964822049a9261f9d9dedc0d0e636c73442856fe')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  sed -i 's|^#!.*python$|#!/usr/bin/python2|' $(grep -rl '^#!.*python')
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var'
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/{etc,usr/share/apport}
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/plank/plank.install b/community/plank/plank.install
new file mode 100644
index 000000000..197190dd8
--- /dev/null
+++ b/community/plank/plank.install
@@ -0,0 +1,15 @@
+post_install() {
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_upgrade()
+{
+  post_install
+}
+
+post_remove()
+{
+  post_install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/portaudio/PKGBUILD b/community/portaudio/PKGBUILD
index 273b36d6d..e506b5ee2 100644
--- a/community/portaudio/PKGBUILD
+++ b/community/portaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96889 2013-09-07 11:45:00Z bgyorgy $
+# $Id: PKGBUILD 99139 2013-10-25 01:57:21Z bisson $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=portaudio
 pkgver=19_20111121
-pkgrel=2
+pkgrel=3
 pkgdesc='A free, cross-platform, open source, audio I/O library.'
 arch=('i686' 'x86_64')
 url='http://www.portaudio.com/'
diff --git a/community/proxychains/PKGBUILD b/community/proxychains/PKGBUILD
index 4237a830b..5b120adc2 100644
--- a/community/proxychains/PKGBUILD
+++ b/community/proxychains/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95519 2013-08-13 06:25:46Z fyan $
+# $Id: PKGBUILD 99154 2013-10-25 05:05:19Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Michael Düll <mail@akurei.me> PGP-Key: AAAEE882
 # Contributor: Dan Serban
@@ -6,20 +6,19 @@
 
 pkgname=proxychains
 pkgver=3.1
-pkgrel=6
+pkgrel=7
 pkgdesc='A program proxifier: Runs programs from behind a proxy server, similar to tsocks. TCP & DNS tunneling. HTTP, SOCKS4 & SOCKS5.'
 url='http://proxychains.sourceforge.net/'
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('dnsutils')
-options=('!libtool')
 backup=('etc/proxychains.conf')
 source=("http://downloads.sourceforge.net/sourceforge/proxychains/proxychains-${pkgver}.tar.gz")
 
 build() {
   cd proxychains-${pkgver}
   sed -i 's/servlen, unsigned int/servlen, int/' proxychains/libproxychains.c
-#  sed -i 's#export LD_PRELOAD=libproxychains.so#export LD_PRELOAD=/usr/lib/libproxychains.so#' proxychains/proxychains
+  #sed -i 's#export LD_PRELOAD=libproxychains.so#export LD_PRELOAD=/usr/lib/libproxychains.so#' proxychains/proxychains
   ./configure --prefix=/usr
   make
 }
diff --git a/community/python2-xapian/PKGBUILD b/community/python2-xapian/PKGBUILD
index 9e02f497c..d6c8a1882 100644
--- a/community/python2-xapian/PKGBUILD
+++ b/community/python2-xapian/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98807 2013-10-19 01:51:15Z fyan $
+# $Id: PKGBUILD 99157 2013-10-25 05:16:11Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: DonVla <donvla/users.sourceforge/net>
 # Contributor: Hervé Cauwelier <herve/oursours/net>
@@ -7,7 +7,7 @@ pkgname=python2-xapian
 _realname=xapian-bindings
 pkgver=1.2.15
 epoch=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for Xapian"
 arch=(i686 x86_64)
 url="http://xapian.org/docs/bindings/python/"
@@ -18,18 +18,18 @@ source=("http://oligarchy.co.uk/xapian/${pkgver}/${_realname}-$pkgver.tar.gz")
 build() {
   cd "$srcdir/${_realname}-$pkgver"
     
-  ./configure XAPIAN_CONFIG=/usr/bin/xapian-config \
+  LDFLAGS=-lpython2.7 ./configure XAPIAN_CONFIG=/usr/bin/xapian-config \
          --prefix=/usr --with-python \
          PYTHON=/usr/bin/python2
 
   make
 }
 
-
 package() {
   cd "$srcdir/${_realname}-$pkgver"
 
   make DESTDIR="$pkgdir" install
 }
+
 # vim:set ts=2 sw=2 et:
 sha512sums=('b3733308f0446fa041dcae677b3d3316bd8e775fcd1a1770ca2fab5b60e40463bbbce210cb1161161f6e9f1ff5e5473d38c2dab922b7f4f2705ac165d991c0ec')
diff --git a/community/rtl-sdr/PKGBUILD b/community/rtl-sdr/PKGBUILD
index 260b5c4fe..e19179288 100644
--- a/community/rtl-sdr/PKGBUILD
+++ b/community/rtl-sdr/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 99108 2013-10-24 13:05:39Z kkeen $
+# $Id: PKGBUILD 99146 2013-10-25 04:57:24Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Michael Düll <mail@akurei.me>
 
 pkgname=rtl-sdr
 # they are just starting to play with tags
 # consider using tags for the pkgver in the future
-pkgver=20130913
-_commit=4914b5d4314b752
-pkgrel=2
+pkgver=20131024
+_commit=dbede4e3c0a
+pkgrel=1
 pkgdesc="Driver for Realtek RTL2832U, allowing general purpose software defined radio (SDR)."
 arch=('i686' 'x86_64')
 url="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
@@ -28,8 +28,8 @@ build() {
   cd "$srcdir/$_gitname"
   mkdir build
   cd build
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -Wno-dev ../
-  #cmake ../ -DINSTALL_UDEV_RULES=ON
+  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+        -DINSTALL_UDEV_RULES=ON -Wno-dev ../
   make
 }
 
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 327c0f071..9a29bc5e1 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96605 2013-09-02 09:39:10Z arodseth $
+# $Id: PKGBUILD 99178 2013-10-25 10:00:48Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scite
-pkgver=3.3.5
+pkgver=3.3.6
 pkgrel=1
 pkgdesc='Editor with facilities for building and running programs'
 arch=('x86_64' 'i686')
@@ -17,7 +17,7 @@ makedepends=('setconf')
 backup=('usr/share/scite/SciTEGlobal.properties')
 install="$pkgname.install"
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz")
-sha256sums=('5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89')
+sha256sums=('9f3f9c9867e93af37af7a59e962aad76897c9e816c683c03e922baed6be506a5')
 
 prepare() {
   if [ $?CXXBASEFLAGS == 1 ]; then 
diff --git a/community/simavr/PKGBUILD b/community/simavr/PKGBUILD
index aa2e8370f..4f9a5a82a 100644
--- a/community/simavr/PKGBUILD
+++ b/community/simavr/PKGBUILD
@@ -1,31 +1,28 @@
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 pkgname=simavr
-pkgver=1.0
-pkgrel=2
+pkgver=1.1
+pkgrel=1
 pkgdesc='A lean, mean and hackable AVR simulator'
 arch=('i686' 'x86_64')
 url="https://github.com/buserror-uk/simavr"
 license=('GPL3')
 depends=('elfutils')
-makedepends=('avr-libc')
-source=("https://github.com/downloads/buserror-uk/simavr/$pkgname-$pkgver.tar.bz2")
+makedepends=('avr-libc' 'git')
+source=("${pkgname}::git+https://github.com/buserror-uk/simavr.git#tag=v${pkgver}")
 options=(!strip)
+md5sums=('SKIP')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
 
-  # The original Makefile depends on git, hardcode the version until it's fixed upstream.
-  sed -i "s/^\(SIMAVR_VERSION\).*/\1 = ${pkgver}/" simavr/Makefile
-
-  make AVR_ROOT=/usr/avr SIMAVR_VERSION=1.0 \
-      CFLAGS="-Wall -Wextra -fPIC -std=gnu99 -Wno-sign-compare -Wno-unused-parameter" \
+  make AVR_ROOT=/usr/avr RELEASE=1 \
+      CFLAGS="-Wall -Wextra -fPIC -O2 -std=gnu99 -Wno-sign-compare -Wno-unused-parameter" \
       build-simavr
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
   make PREFIX="/usr" DESTDIR="$pkgdir/usr" install
 }
 
-md5sums=('82c9704a4e8569548f01931e32ebfe0c')
diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index 2f14f1661..8066854cd 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Michael Düll <mail@akurei.me>
 
 pkgname=synergy
-pkgver=1.4.14
+pkgver=1.4.15
 pkgrel=1
 pkgdesc="Share a single mouse and keyboard between multiple computers"
 url="http://synergy-foss.org"
@@ -17,7 +17,7 @@ license=('GPL2')
 source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
         "synergys.socket"
         "synergys.service")
-sha512sums=('3e9ca96f36573e400c9694daba026322cbf36bbabdbf69687cbadb6010834d1afd81845533775564ba7aadbf3a8be8582d9e5b9d33abfa483a174b40e084add4'
+sha512sums=('857e8cbfb0b32c7dc325de5765f182f4e4fb198443b4a3e26d38c2d3dec3819e57057b91a202b53c86d4fad18154d1d58b401812dd8fabc384255e44d4b4b01a'
             'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad'
             'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f')
 
diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD
index 7083d92a4..91bc3ff40 100644
--- a/community/xmlrpc-c/PKGBUILD
+++ b/community/xmlrpc-c/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87246 2013-03-29 00:18:37Z arodseth $
+# $Id: PKGBUILD 99137 2013-10-25 01:54:42Z bisson $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Vitaliy Berdinskikh <skipper13@root.ua>
 
 pkgname=xmlrpc-c
-pkgver=1.33.03
+pkgver=1.36.00
 pkgrel=1
 epoch=1
 pkgdesc='XML-RPC for C and C++'
@@ -15,8 +15,8 @@ license=('custom')
 depends=('curl' 'libxml2')
 makedepends=('libtool' 'setconf')
 options=('!makeflags' '!libtool' '!emptydirs')
-source=("$pkgname-advanced-$pkgver.tar.gz::http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/?view=tar")
-sha256sums=('5e52978f4c96591c9732b4e7a336a4abb75550b1403ba0ed59fb3ddd49595309')
+source=('svn://svn.code.sf.net/p/xmlrpc-c/code/advanced#revision=2545')
+sha1sums=('SKIP')
 
 build() {
   cd "$srcdir/advanced"
diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD
index db543f2a9..a32bbf391 100644
--- a/community/zathura-pdf-mupdf/PKGBUILD
+++ b/community/zathura-pdf-mupdf/PKGBUILD
@@ -4,16 +4,22 @@
 # Contributor: Moritz Lipp <mlq@pwmt.org>
 
 pkgname=zathura-pdf-mupdf
-pkgver=0.2.4
+pkgver=0.2.5
 pkgrel=1
 pkgdesc="Adds pdf support to zathura by using the mupdf library"
 arch=('i686' 'x86_64')
 url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/"
 license=('custom')
-depends=('mupdf>=1.1' 'zathura')
+depends=('mupdf>=1.3' 'zathura'
+	 'jbig2dec' 'openjpeg')
 conflicts=('zathura-pdf-poppler')
 source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz")
-md5sums=('aa9667425dab93147dd8605eda020e59')
+md5sums=('42dcdf2511ffc8f87ca6baba6c566f91')
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  sed -i 's|openjp2|openjpeg|g' config.mk
+}
 
 build() {
   make -C "${srcdir}/$pkgname-$pkgver"
diff --git a/community/zh-autoconvert/PKGBUILD b/community/zh-autoconvert/PKGBUILD
index 24afc94ae..66c87cd94 100644
--- a/community/zh-autoconvert/PKGBUILD
+++ b/community/zh-autoconvert/PKGBUILD
@@ -4,13 +4,12 @@
 
 pkgname=zh-autoconvert
 pkgver=0.3.16
-pkgrel=2
+pkgrel=3
 pkgdesc="An intelligent Chinese Encoding converter"
 url="http://libhz.googlecode.com/"
 license=('LGPL')
 arch=('i686' 'x86_64')
 depends=('glibc')
-makedepends=('pkgconfig')
 source=(${url}/files/${pkgname}-${pkgver}.tar.gz
 	autoconvert.patch)
 md5sums=('1f4aa2332afc076910b5d510b8c81966'
diff --git a/community/zinnia/PKGBUILD b/community/zinnia/PKGBUILD
index 48784f97b..2551cbf5f 100644
--- a/community/zinnia/PKGBUILD
+++ b/community/zinnia/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81446 2012-12-21 04:42:33Z fyan $
+# $Id: PKGBUILD 99156 2013-10-25 05:05:21Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Humbert Julien <julroy67 [AT] gmail.com>
 
 pkgname=zinnia
 pkgver=0.06
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple, customizable and portable online hand recognition system based on Support Vector Machines"
 arch=('i686' 'x86_64')
 url="http://zinnia.sourceforge.net/"
author	root <root@rshg054.dnsready.net>	2013-10-26 01:22:45 -0700
committer	root <root@rshg054.dnsready.net>	2013-10-26 01:22:45 -0700
commit	24152c3ea77087edccf017c13d44904a75799ff7 (patch)
tree	65e25106816e5071dd5b2edc2270e0138c23dc7c /community
parent	5a3821aec094b38a412cf5e6997c08b6428d6f77 (diff)