Commit cb1bdf4d authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/r/group_by.result:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge
sql/item_cmpfunc.cc:
  merge
support-files/mysql.server.sh:
  merge
parents 5b0c7525 8ef1afba

mysql-test/r/group_by.result

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ concat('val-', x3.a + 3*x4.a), -- 12 
concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120

concat('val-', @a + 120*D.a)

from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4;

delete from t2  where a = 2 and b = 'val-2' limit 30;

delete from t2  where a = 2 and b = 'val-2' order by a,b,c,d limit 30;

explain select c from t2 where a = 2 and b = 'val-2' group by c;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	PRIMARY,a	PRIMARY	402	const,const	6	Using where

mysql-test/t/group_by.test

+2 −1
Original line number Diff line number Diff line
@@ -508,7 +508,8 @@ insert into t2 select 
   concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120

   concat('val-', @a + 120*D.a)

from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4;

delete from t2  where a = 2 and b = 'val-2' limit 30;



delete from t2  where a = 2 and b = 'val-2' order by a,b,c,d limit 30;



explain select c from t2 where a = 2 and b = 'val-2' group by c;

select c from t2 where a = 2 and b = 'val-2' group by c;

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

+20 −0
Original line number Diff line number Diff line
@@ -2618,6 +2618,26 @@ void Dbacc::execACC_LOCKREQ(Signal* signal) 
    *sig = *req;

    return;

  }

  operationRecPtr.i = req->accOpPtr;

  ptrCheckGuard(operationRecPtr, coprecsize, operationrec);

  fragrecptr.i = operationRecPtr.p->fragptr;

  ptrCheckGuard(fragrecptr, cfragmentsize, fragmentrec);

  if (fragrecptr.p->keyLength == 0 &&

      // should test some state variable

      operationRecPtr.p->elementPage != RNIL) {

    jam();

    // re-compute long key vars

    Page8Ptr tPageptr;

    tPageptr.i = operationRecPtr.p->elementPage;

    ptrCheckGuard(tPageptr, cpagesize, page8);

    Uint32 tKeyptr =

      operationRecPtr.p->elementPointer +

      operationRecPtr.p->elementIsforward *

      (ZELEM_HEAD_SIZE + fragrecptr.p->localkeylen);

    tslcPageIndex = tPageptr.p->word32[tKeyptr] & 0x3ff;

    tslcPagedir = tPageptr.p->word32[tKeyptr] >> 10;

    searchLongKey(signal, false);

  }

  if (lockOp == AccLockReq::Unlock) {

    jam();

    // do unlock via ACC_COMMITREQ (immediate)

ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+3 −1
Original line number Diff line number Diff line
@@ -2470,7 +2470,9 @@ Dbdict::restartCreateTab_writeTableConf(Signal* signal, 
  callback.m_callbackFunction = 

    safe_cast(&Dbdict::restartCreateTab_dihComplete);

  

  SegmentedSectionPtr fragDataPtr; fragDataPtr.setNull();

  SegmentedSectionPtr fragDataPtr; 

  fragDataPtr.sz = 0;

  fragDataPtr.setNull();

  createTab_dih(signal, createTabPtr, fragDataPtr, &callback);

}

scripts/make_win_src_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ copy_dir_dirs() { 


for i in client dbug extra heap include \

         libmysql libmysqld myisam \

         myisammrg mysys regex sql strings sql-common \

         myisammrg mysys regex sql strings sql-common sql/examples \

         tools vio zlib

do

  copy_dir_files $i