From: Ole John Aske
Date: November 16 2010 1:30pm
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3371)
List-Archive: http://lists.mysql.com/commits/124037
Message-Id: <20101116133044.1EF16222@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4173503343269948002=="

--===============4173503343269948002==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:ole.john.aske@stripped

 3371 Ole John Aske	2010-11-16
      SPJ-scan-scan: Extended RQG grammar to also allow 'IS (not) NULL', general comparison predicates, IN predicates, 
      and AND/OR combinations in join conditions.

    modified:
      storage/ndb/test/rqg/spj_test.yy
=== modified file 'storage/ndb/test/rqg/spj_test.yy'
--- a/storage/ndb/test/rqg/spj_test.yy	2010-11-12 08:14:52 +0000
+++ b/storage/ndb/test/rqg/spj_test.yy	2010-11-16 13:30:39 +0000
@@ -282,6 +282,7 @@ join_condition:
  | int_condition
  | int_condition
  | char_condition
+ | other_condition
  ;
 
 int_condition: 
@@ -308,8 +309,8 @@ int_multi_conditions:
    existing_left_table.col_int = existing_right_table.col_int AND
    existing_left_table.col_int_key = existing_right_table.col_int_key AND
    existing_left_table.col_int_unique = existing_right_table.col_int_unique
- |
-   int_condition AND int_condition
+#|
+#  int_condition AND int_condition
  ;
 
 char_condition:
@@ -326,8 +327,18 @@ char_multi_conditions:
    # ix2(col_varchar_256,col_char_16_unique)
    existing_left_table.col_varchar_256 = existing_right_table.col_varchar_256 AND
    existing_left_table.col_varchar_10_unique = existing_right_table.col_varchar_10_unique
- |
-   char_condition AND char_condition
+#|
+#  char_condition AND char_condition
+ ;
+
+other_condition:
+   existing_left_table.col_int comparison_operator existing_right_table.col_int
+ | existing_left_table.col_int IS not NULL
+ | existing_right_table.col_int IS not NULL
+ | existing_left_table.col_int not IN (number_list)
+ | existing_right_table.col_int not IN (number_list)
+ | join_condition and_or join_condition
+ | not (join_condition) is_truth_value
  ;
 
 existing_left_table:


--===============4173503343269948002==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   8qjkgv2imgy5isef
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: 1418e6434f2236edce5274cac119e9900eb38755
# timestamp: 2010-11-16 14:30:44 +0100
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0-spj/
# base_revision_id: ole.john.aske@stripped\
#   8upi8v7yekd15k0j
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWecuvw8AAblfgAAQWOf//3a1
+gC////0UARNHd0Ha91bDnvZe8Mk0QjanqNDI9UzSbUmaTaT0wowGjT1JgSSTI0nppoJkmTJNqGg
ABoAAAkREKT8mhTNNqammh5QyDTQYjTEGgGU1Tyg2o0ADRoNA0AAA0AAklEeiaaaaZHpGp6T1PSN
AGgBoAAhHyG5nnj4CNObNc9+sYgsfsTBgrcuHCCM4rYhYwSRZkkfh4sej3Gzp9DbDx/ZW0unyvZQ
0vfZutHGnkvOt7MxqZVBlk0CXXl4eszq3JyQT8fqG+FsLuB7350gNAY1uiRgC0k1ZqIrq9doYgMo
GqgHAK0hjGuPG+OQIUV2ae0gXZ/dx8uThPVk/kVnkJHSQBiQkXjTY6d3M4nsTZDgrDhLUIKEhGEu
gryEMK5hnR1sqmUQitjYJBByvCHMsENCKn23vxI2fjs290jogguHxIfm+OyipKiChlyXi1xWFhpM
jCFsw4b7caRclkhRdlmttCpCeLCaa5P4KYe5hSsJ7oVql1dQoHDV+OZE1SlNZzkzb55MVm518eFH
rKhU49aeWG6bD7C96wX9w6QzdKvoGd1C5JynJ2s3aScgeoDh5K6tbUaZ8bslDB6uqttU6tnSqy+B
s6aFSepZ6RIXVzjMvH6leCDgqRFWmv5bd6qlS8xP9abOsysmbmhJ3Rc1dbi1kQqTWNAiFkWn5Rue
ls6QqWefY0kTAJcQoPbaVbah7kFqbj8m02lpva/D0+XSquK+Gt8LiCHGnaJh1qpXL50XVcB0qk87
Db77zb6bNn7eCwbqCRN1dVWBxGyI25GveWapFp66hgJ7iQocEkwbMhzsVPOYjIGxCyzigLz4uqEe
DyCfRL/UOeSwMkdeiAfgx/UDdSjiZYdq0w2lMrVFM6pOM8dtxvICHbc02ZJK7VTLNezl1eBIxzls
EsodpvWcE1xVbTQ1WkU07tWOGjT/TjPgm24HfTKzohoal/HFoEt7k2wOYlKwIzCwVJf1QpErx/7L
1CDRIU+2gwIdpuHKqg0A6Sl4QGGE1Ao1MiEmqVWYafbwprlG4cnqE1ipmZlnyhjcKUTj90UucBmG
YYdWK0MZvnmKgRXgvVBamW6LWkSrJGtMwmsWEFZuCeFKtxRBEE8AVibZvWCxJF9IhMKJNDcckDNd
EkUVpxDfskAcE0xUQVTCrNzgaoSkQQ5TNcSMHZQRDiUtvhYjisKisYwbUkLdq18Gjv4klItAfQ6B
SX1klpLigVICIYwceVLT8SEAdMCG4DSfpv2GlmLMqggcViHBXVc4kX2+MUbTkcQYZOSTdzrdEgje
0XldQVN5b83cy47bLGtUjnLPwBWRYyy+QfVmSLly5WF2bkfPhUYMWCMc+DIGNZyIhedUlew7DqTZ
isfRsokFqZcpkG40JCwQQbmranhgEouMtT6GiszS1gqbjjSBf9s6kDi+7EoJwd56O0xx4xP9D0v8
XckU4UJDnLr8PA==


--===============4173503343269948002==--