Viewing all changes in revision 4505.
- Committer: Sergei Golubchik
- Date: 2014-11-21 07:50:44 UTC
- mfrom: (4500.1.30 10.0)
- Revision ID: sergii@pisem.net-20141121075044-pw1ee211wp9snyia
Merge
- files added:
- mysql-test/r/ext_key_noPK_6794.result
- files removed:
- storage/mroonga/packages
- storage/mroonga/packages/apt
- storage/mroonga/packages/debian
- storage/mroonga/packages/debian/apparmor
- storage/mroonga/packages/rpm
- storage/mroonga/packages/rpm/centos
- storage/mroonga/packages/rpm/fedora
- storage/mroonga/packages/source
- storage/mroonga/packages/source/patches
- storage/mroonga/packages/ubuntu
- storage/mroonga/packages/windows
- storage/mroonga/packages/yum
- storage/mroonga/vendor/groonga/data
- storage/mroonga/vendor/groonga/data/account
- storage/mroonga/vendor/groonga/data/html
- storage/mroonga/vendor/groonga/data/html/admin
- storage/mroonga/vendor/groonga/data/html/admin/css
- storage/mroonga/vendor/groonga/data/html/admin/css/redmond
- storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images
- storage/mroonga/vendor/groonga/data/html/admin/images
- storage/mroonga/vendor/groonga/data/html/admin/js
- storage/mroonga/vendor/groonga/data/images
- storage/mroonga/vendor/groonga/data/images/logo
- storage/mroonga/vendor/groonga/data/munin
- storage/mroonga/vendor/groonga/data/scripts
- storage/mroonga/vendor/groonga/data/systemd
- storage/mroonga/vendor/groonga/data/systemd/fedora
- storage/mroonga/vendor/groonga/data/systemd/fedora/sysconfig
- storage/mroonga/vendor/groonga/data/travis
- storage/mroonga/vendor/groonga/examples
- storage/mroonga/vendor/groonga/examples/dictionary
- storage/mroonga/vendor/groonga/examples/dictionary/edict
- storage/mroonga/vendor/groonga/examples/dictionary/eijiro
- storage/mroonga/vendor/groonga/examples/dictionary/gene95
- storage/mroonga/vendor/groonga/examples/dictionary/html
- storage/mroonga/vendor/groonga/examples/dictionary/html/css
- storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness
- storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images
- storage/mroonga/vendor/groonga/examples/dictionary/html/js
- storage/mroonga/vendor/groonga/examples/dictionary/jmdict
- storage/mroonga/vendor/groonga/packages
- storage/mroonga/vendor/groonga/packages/apt
- storage/mroonga/vendor/groonga/packages/apt/debian
- storage/mroonga/vendor/groonga/packages/apt/debian/source
- storage/mroonga/vendor/groonga/packages/debian
- storage/mroonga/vendor/groonga/packages/debian/missing-sources
- storage/mroonga/vendor/groonga/packages/debian/patches
- storage/mroonga/vendor/groonga/packages/debian/source
- storage/mroonga/vendor/groonga/packages/rpm
- storage/mroonga/vendor/groonga/packages/rpm/centos
- storage/mroonga/vendor/groonga/packages/rpm/fedora
- storage/mroonga/vendor/groonga/packages/source
- storage/mroonga/vendor/groonga/packages/ubuntu
- storage/mroonga/vendor/groonga/packages/windows
- storage/mroonga/vendor/groonga/packages/windows/language-files
- storage/mroonga/vendor/groonga/packages/windows/patches
- storage/mroonga/vendor/groonga/packages/yum
- storage/mroonga/vendor/groonga/packages/yum/patches
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/cc
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/lib
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/lib/geoip
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/lib/google-perftools
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/lib/libatomic
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/lib/libgd
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/lib/libxslt
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/lib/md5
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/lib/openssl
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/lib/pcre
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/lib/perl
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/lib/sha1
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/lib/zlib
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/os
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/auto/types
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/conf
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/contrib
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/contrib/unicode2nginx
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/contrib/vim
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/contrib/vim/ftdetect
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/contrib/vim/indent
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/contrib/vim/syntax
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/html
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/man
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/src
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/src/event
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/src/event/modules
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/src/http
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/src/http/modules
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/src/http/modules/ngx_http_addition_filter_module.c
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/src/http/modules/perl
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/src/mail
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/src/misc
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/src/os
- storage/mroonga/vendor/groonga/vendor/nginx-1.7.6/src/os/unix
- files modified:
- client/mysql_upgrade.c
expand all
collapse all
added
removed
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-icons_217bc0_256x240.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-icons_2e83ff_256x240.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-icons_469bdd_256x240.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-icons_6da8d5_256x240.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-icons_cd0a0a_256x240.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-icons_d8e7f3_256x240.png
storage/mroonga/vendor/groonga/data/html/admin/css/redmond/images/ui-icons_f9bd01_256x240.png
storage/mroonga/vendor/groonga/data/html/admin/favicon.png
storage/mroonga/vendor/groonga/data/html/admin/favicon.svg
storage/mroonga/vendor/groonga/data/html/admin/images/groonga.png
storage/mroonga/vendor/groonga/data/html/admin/images/groonga.svg
storage/mroonga/vendor/groonga/data/html/admin/images/loading.gif
storage/mroonga/vendor/groonga/data/images/logo/groonga-icon-foreground-white.png
storage/mroonga/vendor/groonga/data/images/logo/groonga-icon-foreground-white.svg
storage/mroonga/vendor/groonga/data/images/logo/groonga-icon-full-size.png
storage/mroonga/vendor/groonga/data/images/logo/groonga-icon-full-size.svg
storage/mroonga/vendor/groonga/data/images/logo/groonga-icon.png
storage/mroonga/vendor/groonga/data/images/logo/groonga-icon.svg
storage/mroonga/vendor/groonga/data/images/logo/groonga-logo-foreground-white.png
storage/mroonga/vendor/groonga/data/images/logo/groonga-logo-foreground-white.svg
storage/mroonga/vendor/groonga/data/images/logo/groonga-logo.png
storage/mroonga/vendor/groonga/data/images/logo/groonga-logo.svg
storage/mroonga/vendor/groonga/data/images/logo/groonga-powered-by-banner-bar-foreground-white.png
storage/mroonga/vendor/groonga/data/images/logo/groonga-powered-by-banner-bar-foreground-white.svg
storage/mroonga/vendor/groonga/data/images/logo/groonga-powered-by-banner-bar.png
storage/mroonga/vendor/groonga/data/images/logo/groonga-powered-by-banner-bar.svg
storage/mroonga/vendor/groonga/data/images/logo/groonga-powered-by-banner-foreground-white.png
storage/mroonga/vendor/groonga/data/images/logo/groonga-powered-by-banner-foreground-white.svg
storage/mroonga/vendor/groonga/data/images/logo/groonga-powered-by-banner-large.png
storage/mroonga/vendor/groonga/data/images/logo/groonga-powered-by-banner-large.svg
storage/mroonga/vendor/groonga/data/images/logo/groonga-powered-by-banner.png
storage/mroonga/vendor/groonga/data/images/logo/groonga-powered-by-banner.svg
storage/mroonga/vendor/groonga/data/images/logo/mroonga-icon-foreground-white.png
storage/mroonga/vendor/groonga/data/images/logo/mroonga-icon-foreground-white.svg
storage/mroonga/vendor/groonga/data/images/logo/mroonga-icon-full-size.png
storage/mroonga/vendor/groonga/data/images/logo/mroonga-icon-full-size.svg
storage/mroonga/vendor/groonga/data/images/logo/mroonga-icon.png
storage/mroonga/vendor/groonga/data/images/logo/mroonga-icon.svg
storage/mroonga/vendor/groonga/data/images/logo/mroonga-logo-foreground-white.png
storage/mroonga/vendor/groonga/data/images/logo/mroonga-logo-foreground-white.svg
storage/mroonga/vendor/groonga/data/images/logo/mroonga-logo.png
storage/mroonga/vendor/groonga/data/images/logo/mroonga-logo.svg
storage/mroonga/vendor/groonga/data/images/logo/nroonga-icon-foreground-white.png
storage/mroonga/vendor/groonga/data/images/logo/nroonga-icon-foreground-white.svg
storage/mroonga/vendor/groonga/data/images/logo/nroonga-icon-full-size.png
storage/mroonga/vendor/groonga/data/images/logo/nroonga-icon-full-size.svg
storage/mroonga/vendor/groonga/data/images/logo/nroonga-icon.png
storage/mroonga/vendor/groonga/data/images/logo/nroonga-icon.svg
storage/mroonga/vendor/groonga/data/images/logo/nroonga-logo-foreground-white.png
storage/mroonga/vendor/groonga/data/images/logo/nroonga-logo-foreground-white.svg
storage/mroonga/vendor/groonga/data/images/logo/nroonga-logo.png
storage/mroonga/vendor/groonga/data/images/logo/nroonga-logo.svg
storage/mroonga/vendor/groonga/data/images/logo/rroonga-icon-foreground-white.png
storage/mroonga/vendor/groonga/data/images/logo/rroonga-icon-foreground-white.svg
storage/mroonga/vendor/groonga/data/images/logo/rroonga-icon-full-size.png
storage/mroonga/vendor/groonga/data/images/logo/rroonga-icon-full-size.svg
storage/mroonga/vendor/groonga/data/images/logo/rroonga-icon.png
storage/mroonga/vendor/groonga/data/images/logo/rroonga-icon.svg
storage/mroonga/vendor/groonga/data/images/logo/rroonga-logo-foreground-white.png
storage/mroonga/vendor/groonga/data/images/logo/rroonga-logo-foreground-white.svg
storage/mroonga/vendor/groonga/data/images/logo/rroonga-logo.png
storage/mroonga/vendor/groonga/data/images/logo/rroonga-logo.svg
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-icons_222222_256x240.png
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-icons_2e83ff_256x240.png
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-icons_454545_256x240.png
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-icons_888888_256x240.png
storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/images/ui-icons_cd0a0a_256x240.png
