Commit graph

275 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
3bf55c9a3d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alias-4.1
2004-03-25 14:40:36 +02:00
serg@serg.mylan
99886df867 correct support for a mix of UNION/UNION ALL in the same query.
Bug#1428
2004-03-23 14:43:24 +01:00
bell@sanja.is.com.ua
ce7798c45e fixed union with prepared statement bug found by Konstantin 2004-03-23 14:26:54 +02:00
Sinisa@sinisa.nasamreza.org
2eaa07f199 union.result:
A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
union.test:
  A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
sql_union.cc:
  A fix for a bug that allowed table names to be used in ORDER BY columns (But #3064)
2004-03-22 16:35:15 +02:00
bell@sanja.is.com.ua
d095d4753e after review changes 2004-03-20 13:36:26 +02:00
bell@sanja.is.com.ua
2b45b53066 DBUG_ASSERT(fixed == 1); added to val*
small optimisation in signed_literal
2004-03-18 15:14:36 +02:00
bell@sanja.is.com.ua
8035ce40ec DBUG_ASSERT(fixed == 0) added to fix_fields() 2004-03-17 14:26:26 +02:00
bell@sanja.is.com.ua
a66b398eb8 merge 2004-02-17 11:12:55 +02:00
bell@sanja.is.com.ua
3f86f10a57 ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its own TABLE structure 2004-02-17 01:14:51 +02:00
Sinisa@sinisa.nasamreza.org
125fb04b87 merge fixes 2004-02-11 19:15:02 +02:00
Sinisa@sinisa.nasamreza.org
451e423be4 Fixes for bugs #2508 and #2552 2004-02-10 21:34:25 +02:00
bell@sanja.is.com.ua
2fa0c78ec4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-prepared-4.1
2004-02-10 02:41:21 +02:00
bell@sanja.is.com.ua
0aa7a4b4ea after merge & valgrind test fixes (BUG#2120) 2004-02-10 02:18:22 +02:00
bell@sanja.is.com.ua
69e2460bd4 fixed subquery with PS (BUG#2462)
fixed UNION preparation
2004-02-08 20:14:13 +02:00
serg@serg.mylan
4e4d618683 catch accesses to deleted objects
double delete bug fixed
2004-01-30 08:09:42 +01:00
Sinisa@sinisa.nasamreza.org
8959551451 merge fixes 2004-01-17 17:18:32 +02:00
bell@sanja.is.com.ua
bcbc9ff22f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-01-17 11:53:04 +02:00
Sinisa@sinisa.nasamreza.org
9c232685d6 Two bug fixes 2004-01-16 20:05:08 +02:00
konstantin@oak.local
d37da004f6 THD::lex now points to THD::main_lex like in 5.0
All tests pass (client_test included)
2003-12-19 20:52:13 +03:00
bell@sanja.is.com.ua
e756a511f8 fixed unlocking tables during subquery execution (BUG#2048) 2003-12-10 22:46:14 +02:00
monty@mysql.com
ede8169d24 Added missing SSL library (Should be in source distribution)
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02:00
igor@rurik.mysql.com
413f6b2f83 sql_union.cc:
Fixed a bug: missing semicolon.
2003-11-25 15:00:31 -08:00
bell@sanja.is.com.ua
5474ada47a added collation processing in UNION merging
temporary table BLOB now is longblob
2003-11-25 23:52:10 +02:00
bell@sanja.is.com.ua
7191ea0ae3 Fixed UNION fields type/length detecting 2003-11-23 02:01:15 +02:00
bell@sanja.is.com.ua
09cefdd542 limit initialization moved to method of SELECT_LEX_UNIT (WL#695)
(SCRUM)
counters was not moved to SELECT_LEX because it used in methods inherited from select_result which should be applied to whole union results
2003-11-21 21:19:56 +02:00
pem@mysql.comhem.se
5b355ea6f5 Post-merge fixes. 2003-11-19 16:59:35 +01:00
pem@mysql.com
28a2c6a96b Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
bell@sanja.is.com.ua
cb19ad9ac1 fixed using 'uncachable' tag and RAND_TABLE_BIT setting 2003-11-17 20:53:40 +02:00
bell@sanja.is.com.ua
7c49da1e4a fixed problem with UNION flags 2003-11-04 12:51:01 +02:00
bell@sanja.is.com.ua
2efab5b67d fixed ALL/ANY optimisation with union (BUG#1668)
code cleanup
2003-10-27 01:01:27 +02:00
pem@mysql.com
337238b78a Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
bell@laptop.sanja.is.com.ua
e1b53fdd42 Merge 2003-10-06 20:55:06 +03:00
pem@mysql.com
8d884c02bb Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
bell@sanja.is.com.ua
ea187cfd42 fixed proccesing global LIMIT in last SELECT of UNION 2003-09-14 22:12:55 +03:00
Sinisa@sinisa.nasamreza.org
a26847c275 Fixes for OPTION_FOUND_ROWS in UNION's 2003-09-13 19:56:58 +03:00
monty@mashka.mysql.fi
45aa92c574 After merge fixes.
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
2003-09-11 19:06:23 +03:00
monty@narttu.mysql.fi
4b3b4b9250 merge 2003-09-03 19:53:08 +03:00
Sinisa@sinisa.nasamreza.org
b0a8931986 Two small fixes 2003-08-30 18:21:24 +03:00
Sinisa@sinisa.nasamreza.org
5b38005ce1 Fix for a compilation problem with VC++ 2003-08-30 17:13:10 +03:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
Sinisa@sinisa.nasamreza.org
375b9aec15 Merge fixes 2003-08-27 15:32:52 +03:00
Sinisa@sinisa.nasamreza.org
deae76be75 sql_union.cc:
Post merge fixes
2003-08-27 15:24:52 +03:00
Sinisa@sinisa.nasamreza.org
566ebb63ce merge fixes 2003-08-27 14:36:38 +03:00
pem@mysql.telia.com
08e5a7e135 Post-merge fixes. 2003-08-26 17:41:40 +02:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
Sinisa@sinisa.nasamreza.org
4ba1506244 union.result:
same as above
sql_lex.h:
  same as above 
sql_union.cc:
  same as aobve
sql_select.cc:
  Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
  Plus updating some fields in THD in the proper places 
  plus fixing a wrong result
2003-08-23 21:21:02 +03:00
bell@laptop.sanja.is.com.ua
5553868638 fixed bug of lack of fix_fields call (after merge bugfix (SCRUM))
fixed bug in Item_sum
fixed bug in dependence remover
after merge fix
2003-08-23 13:29:38 +03:00
bell@laptop.sanja.is.com.ua
c514948a30 merge 2003-08-20 22:17:57 +03:00
bell@laptop.sanja.is.com.ua
811ed77e5f quick fix for found row counter
code cleunup
2003-08-20 21:57:37 +03:00
bell@laptop.sanja.is.com.ua
11af1f3c9c Merge 2003-08-20 17:45:04 +03:00