mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Post-merge cleanup and fix minor BUILD/... "="-equality syntax
error. BUILD/SETUP.sh: Use POSIX "=" equality shell test. mysql-test/r/view.result: Revert year drift.
This commit is contained in:
@@ -183,7 +183,7 @@ fi
|
|||||||
# (http://samba.org/ccache) is installed, use it.
|
# (http://samba.org/ccache) is installed, use it.
|
||||||
# We use 'grep' and hope 'grep' will work as expected
|
# We use 'grep' and hope 'grep' will work as expected
|
||||||
# (returns 0 if finds lines)
|
# (returns 0 if finds lines)
|
||||||
if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" == "1"
|
if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" = "1"
|
||||||
then
|
then
|
||||||
echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC"
|
echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC"
|
||||||
echo "$CXX" | grep "ccache" > /dev/null || CXX="ccache $CXX"
|
echo "$CXX" | grep "ccache" > /dev/null || CXX="ccache $CXX"
|
||||||
|
@@ -2686,12 +2686,12 @@ View Create View
|
|||||||
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (year(now()) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75)
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (year(now()) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75)
|
||||||
SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75;
|
SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75;
|
||||||
Age
|
Age
|
||||||
43
|
42
|
||||||
39
|
38
|
||||||
SELECT * FROM v1;
|
SELECT * FROM v1;
|
||||||
Age
|
Age
|
||||||
43
|
42
|
||||||
39
|
38
|
||||||
DROP VIEW v1;
|
DROP VIEW v1;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a char(6) DEFAULT 'xxx');
|
CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a char(6) DEFAULT 'xxx');
|
||||||
|
Reference in New Issue
Block a user