diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /mysql-test/main/comments.result | |
parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | mysql-test/main/comments.result | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/main/comments.result b/mysql-test/main/comments.result index c13eb510..506c31b0 100644 --- a/mysql-test/main/comments.result +++ b/mysql-test/main/comments.result @@ -64,7 +64,10 @@ SELECT 1 /*!99999 +1*/; SELECT 1 /*!100000 +1*/; 1 +1 2 -SELECT 1 /*!110000 +1*/; +SELECT 1 /*!210000 +1*/; +1 +1 +SELECT 1 /*!190000 +1*/; 1 1 # @@ -86,7 +89,10 @@ SELECT 1 /*M!99999 +1*/; SELECT 1 /*M!100000 +1*/; 1 +1 2 -SELECT 1 /*M!110000 +1*/; +SELECT 1 /*M!210000 +1*/; +1 +1 +SELECT 1 /*M!190000 +1*/; 1 1 select 1/*!2*/; |