Commit graph

126 commits

Author SHA1 Message Date
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
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
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
bell@laptop.sanja.is.com.ua
30913419ec after merge changing
uninitialized value fixed
2003-08-20 17:35:12 +03:00
Sinisa@sinisa.nasamreza.org
7635c537be fixing limit and SQL_CALC_FOUND_ROWS issues 2003-08-20 13:56:32 +03:00
bell@laptop.sanja.is.com.ua
dd9cbce47b merge 2003-08-19 20:14:35 +03:00
monty@mashka.mysql.fi
10c4acfb4f merge 2003-08-19 00:10:21 +03:00
bell@laptop.sanja.is.com.ua
85f397781b Code cleanup 2003-08-16 13:26:48 +03:00
bell@sanja.is.com.ua
758129279f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-08-13 10:12:41 +03:00
bell@sanja.is.com.ua
011d905391 merge 2003-08-12 17:48:58 +03:00
bell@sanja.is.com.ua
b6a8d68ae4 fixed problem with reference on derived table fields (BUG#1031) 2003-08-12 15:04:49 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
bell@sanja.is.com.ua
a0fda66f00 merge 2003-08-11 11:51:33 +03:00
bell@sanja.is.com.ua
c66cc864e8 merge 2003-08-09 16:53:23 +03:00
bell@sanja.is.com.ua
87c60ca3d6 fixed union unlocking problem (BUG#906) 2003-08-09 14:39:54 +03:00
Sinisa@sinisa.nasamreza.org
1d2a7cadae merge 2003-08-06 18:59:26 +03:00
Sinisa@sinisa.nasamreza.org
3c99eb433c sql_union.cc, sql_select.cc:
Code clean-up
sql_union.cc, union.test, union.result:
  A fix for a bug #978.
  This enables that NULL's can be entered into UNION's result set,
  although first SELECT columns are NOT NULL.
  This is also a start of fixing UNION's properly regarding type
  acceptance.
sql_select.cc:
  A commit for my second July SPRINT task
2003-08-06 18:48:34 +03:00
bell@sanja.is.com.ua
659650b4ea merge 2003-08-05 09:56:21 +03:00
bell@sanja.is.com.ua
bc1546ce31 count HAVING clause elements with select list elements, because agregate function can be present in it (BUG#922)
removerd unused loop_id
2003-07-29 13:00:32 +03:00
Sinisa@sinisa.nasamreza.org
1167e170d2 Merge 2003-07-19 18:49:04 +03:00
bell@sanja.is.com.ua
7b450a4fda avoiding of allocating JOIN structure on every UNION executing
(SCRUM)
2003-07-05 17:21:39 +03:00
bell@sanja.is.com.ua
28207ede02 (SCRUM)
It looks like samll revolution in SELECT_LEX tree, but it was only natural way to solve problem with name resolution of external fields inside subselect which belongs to global order of union
also it have following advantages:
 - removed mess with current_select type conversion
   - type checking/converting
   - a lot of virtual methods
 - fake select for union execution allocated only once (it was allocated for every subselect with union executing)

changes:
fixed bug with outer fields name resolution of subqueries which belong to global ORDER BY clause
remuved select_lex() function, now thd->lex.current_select always have type SELECT_LEX
new SELECT_LEX (fake_select_lex) will be allocated in case of UNION for using in UNION processing
fake_select_lex allocated for union hold global ORDER BY & LIMIT clauses and have linkage equal to GLOBAL_OPTIONS_TYPE 
new description of SELECT_LEX tree

(SCRUM)
2003-07-03 02:30:52 +03:00
bell@sanja.is.com.ua
5eaaf8e732 after review changes (SCRUM)
removed outer resolving flag (because of movingtransformation after fix_fields)
2003-07-02 01:45:22 +03:00
Sinisa@sinisa.nasamreza.org
c1660e1a23 Lot's of clean-ups and fixes for 4.0.14. 2003-07-02 00:10:47 +03:00
bell@sanja.is.com.ua
100a101ab6 Merge 2003-06-30 13:14:18 +03:00
bell@sanja.is.com.ua
ebc2976f94 fixed bug #745
(resolving fields of reduced subselect)
2003-06-28 17:04:26 +03:00
bell@sanja.is.com.ua
7b77c5a2d3 merged 2003-06-25 23:52:15 +03:00
Sinisa@sinisa.nasamreza.org
bb764d6b5e code cleanup 2003-06-25 18:34:46 +03:00
bell@sanja.is.com.ua
096ae170ae Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-item-4.1
2003-06-19 15:25:41 +03:00
Sinisa@sinisa.nasamreza.org
5a414bda8e Two Sprint tasks and two behaviour changes. 2003-06-17 16:20:07 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
2003-06-04 18:28:51 +03:00
bell@sanja.is.com.ua
01217497b5 merging 2003-05-26 15:52:19 +03:00
bell@sanja.is.com.ua
1a064a43a7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1
2003-05-26 09:28:56 +03:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
bell@sanja.is.com.ua
3a30eda921 fixed memory overrun (bug 380) 2003-05-17 10:05:07 +03:00
bell@sanja.is.com.ua
1915632163 subselect transformation moved in after-fix_field place
removed "of is null" if it is possible
  (this cset should be SCRUM related, but not approved as scrum task yet)
2003-05-14 21:51:33 +03:00
monty@narttu.mysql.fi
13530887cb Fix for UNION and LEFT JOIN (Bug #386)
Fixed wrong logging of Access denied error (Bug #398)
2003-05-13 18:58:26 +03:00
Sinisa@sinisa.nasamreza.org
3ca1a152eb Making a better fix for double released pointers and safe
TMP_TABLE_PARAM.
This involved moving things around in include files.
All tests, including the ones with Valgrind passed.
2003-04-26 15:12:14 +03:00
monty@narttu.mysql.fi
f6a43bd567 Fixes for valgrind
Added optimzation for clustered index
Fixed bug in UPDATE ... ORDER BY
Fixed handling of UPDATE ... LIMIT
2003-04-23 21:52:16 +03:00
Sinisa@sinisa.nasamreza.org
adb52cfc70 Fix for a bug record #307.
Very nasty bug.
It was caused by double free()-ing memory of join->select and 
join->quick. 

I was able to pinpoint it only after using Valgrind.

Plus better fix for bug with TMP_TABLE_PARAM.

Plus new constructor for SELECT_LEX.
2003-04-21 21:03:32 +03:00
Sinisa@sinisa.nasamreza.org
3cef0070f9 Post - post merge fix. 2003-04-09 19:17:12 +03:00
Sinisa@sinisa.nasamreza.org
5d971658db merge fix 2003-04-09 18:52:33 +03:00
monty@mashka.mysql.fi
06febc8df3 A better fix for UNION and slow query log. 2003-04-08 03:54:02 +03:00
Sinisa@sinisa.nasamreza.org
c027af6459 Fix for a crashing bug in union.
Parameters for temporary tables were created locally in the function
and it's address passed to a field in select_result, which produced
random errors when MyISAM table was created based on this bogus
address.
2003-03-29 16:41:01 +02:00
Sinisa@sinisa.nasamreza.org
85fb265c3c Fixing a bug #195
Fixing UNION's popping up in slow query log
2003-03-27 16:11:01 +02:00
monty@narttu.mysql.fi
a916a03916 Fixes to avoid errors from valgrind
Fixed problem with 'wrong packet number' in union
2003-03-18 11:17:48 +02:00
Sinisa@sinisa.nasamreza.org
ffa8a47b6d three bug fixes and major code cleanup 2003-03-06 17:02:10 +02:00