← Back to team overview

maria-developers team mailing list archive

bzr commit into file:///home/tsk/mprog/src/5.3-subqueries/ branch (timour:2790)

 

#At file:///home/tsk/mprog/src/5.3-subqueries/ based on revid:timour@xxxxxxxxxxxx-20100405211515-istsgehaz7zafg0l

 2790 timour@xxxxxxxxxxxx	2010-04-06
      Fixed an error in the creation of REF access method for materialized
      semi-join, where the the REF buffer format was mistaken to be in
      record format instead of key format. The error was that the null
      byte for all fields of the record was in the front of the buffer,
      and not before each field data.

    modified:
      sql/opt_subselect.cc
=== modified file 'sql/opt_subselect.cc'
--- a/sql/opt_subselect.cc	2010-03-15 19:52:58 +0000
+++ b/sql/opt_subselect.cc	2010-04-06 19:56:20 +0000
@@ -2296,7 +2296,7 @@ bool setup_sj_materialization(JOIN_TAB *
                                       use that information instead.
                                    */
                                    cur_ref_buff + null_count,
-                                   null_count ? tab_ref->key_buff : 0,
+                                   null_count ? cur_ref_buff : 0,
                                    cur_key_part->length, tab_ref->items[i]);
       cur_ref_buff+= cur_key_part->store_length;
     }

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: timour@xxxxxxxxxxxx-20100406195620-qlmptv64lzkhrms9
# target_branch: file:///home/tsk/mprog/src/5.3-subqueries/
# testament_sha1: 3de9463c76a3cb46f4b38130d4da67a134490021
# timestamp: 2010-04-06 22:56:24 +0300
# source_branch: file:///home/tsk/mprog/src/5.3-mwl68/
# base_revision_id: timour@xxxxxxxxxxxx-20100405211515-\
#   istsgehaz7zafg0l
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWREZT9YAAY7/gEAQAADQZ//3
0wAUAL////BQBAzbzQ67oZdx1yEkpk0IbQ0jTaqe0jU8ppo0emp6gGgSSaU21Gip+IIbVPT0SDRo
eo0AAaaEylHtSeoNBhlA9TQaBoyAMNDQAAAaAAAAAEkiaGhomEwknqek0eoep6j1A9R6g133Z627
X5G6h6YZamddW6vrACvfk7Y/tv88QhdtPPFmI0b3mm2k1Um9iuuh14avni0y8ZDjCsfXMv6abDa/
KKB33Vpc7iXibVsiYg2EB2aRCtQPNJv0V2XtzZ82D6XtTyFLTg6RrE8c7DPAxEZb8MVleu3AWfhe
5TzdcUiR6bmDF87ICZuYmi5mdyJoVAJx3GHMkazFMXnveKidwyeZdzVdbRNWq2QdvOWpoXJ0YGs+
OUTCNRgUpk8rgWBz5VFJS2YpnKoxnGkZ4Ui3IV1qrePuVkGVNmI6kHZD20Jza2/EoQNS5anevF1E
zWCGLk435mQxUMTn7oE2jt+pBfLo4XopKdjww4WTokacYjEBWis0WQsNDQiYpj+czaey/A69rLry
SyCX+UZ7qzHjbComuOUxNTQMbHUgVjgmKBt0HJVFi0fIluUk+ooCE68+xJhcWOR6dCgeMqYnwI6/
geNWlRDK2WxECipJO07gouhMNM8JqhBqq/pC1kdB4bzU5SrzY4GZEnVhILPmVXD3euGd/xuFzX6S
PYpYL2k5dNPT5UkSpsHF5b9LGX9eYI3qpb7Q9i38y6j2d3zeRXEwlJMx0+Oj2w7+PgbX6Ez3kKlX
FERaEeZbmX38VgzuVE2T3nA9xa6PPidjTNrah4SdbbgVFBUtX+3Xm2Hq2MVgSPIIQ7JkRM4yk1fL
aTDYoy3qprQLFc6MzNjSY7TqOHaFRAYleMQWEjv4UFmU3GxkvLpuSIrYLJVu8NDGagDTtTL2YJdH
V+QsU/ybcoa8xQvITnIzmB6FmHGwLH/3g9+VDJZgXluybxDmTajj3E/qrwFvDgYFaREj3eph9JmQ
GKFqJnKhiwVUfEXAV06zvO2lreTtulj5JCUQb+ArcEITVQWQVFSqJUPcQ4D9AVlGIjg7racLag7I
kkU/s1HPd7rqB/n7oQa2USGR10ars1QgfqkMLymtcrLkjoDZF+vJRsIDnXsnEDWJxU866Ct798cW
OTSDAFINjJ8/Hb6yBZznmyeEiChnC3cBd89KLw2IhFhlbk3RtBQKhmgYrDaEFIvOQDWpE05yONE7
boB1OE8bPRKTFG7Uw/UknXHB9EX5nRgNXPZkPJXMxwKE1j9YXCqoVCx64CpekNxgE/GagcL4Mkb+
mSUFl67wOOzEOxtpUmuBSZq5NwCqovTPAVu3/i7kinChICIyn6w=