Move the version view off to a file individually (to split it away fr…

…om set up that may include user changes), fix a warning along the way..

before_setup.sql

@@ -20,5 +20,3 @@ SET sql_log_bin = 0;
 CREATE DATABASE IF NOT EXISTS sys DEFAULT CHARACTER SET utf8;
 
 USE sys;
-
-CREATE OR REPLACE ALGORITHM = MERGE DEFINER = 'root'@'localhost' SQL SECURITY INVOKER VIEW version AS SELECT '1.5.0' AS sys_version, version() AS mysql_version;

sys_56.sql

@@ -15,6 +15,8 @@
 
 SOURCE ./before_setup.sql
 
+SOURCE ./views/version.sql
+
 SOURCE ./tables/sys_config.sql
 SOURCE ./tables/sys_config_data.sql
 

sys_57.sql

@@ -15,6 +15,8 @@
 
 SOURCE ./before_setup.sql
 
+SOURCE ./views/version.sql
+
 SOURCE ./tables/sys_config.sql
 SOURCE ./tables/sys_config_data_57.sql
 

views/version.sql

@@ -0,0 +1,37 @@
+-- Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: version
+--
+-- Shows the sys schema and mysql versions
+--
+-- mysql> select * from sys.version;
+-- +-------------+---------------+
+-- | sys_version | mysql_version |
+-- +-------------+---------------+
+-- | 1.5.0       | 5.7.8-rc      |
+-- +-------------+---------------+
+-- 
+
+CREATE OR REPLACE
+  DEFINER = 'root'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW version (
+  sys_version,
+  mysql_version
+) AS 
+SELECT '1.5.0' AS sys_version, 
+        version() AS mysql_version;