bell@sanja.is.com.ua
0747324ede
merge
2003-10-31 22:14:49 +02:00
igor@rurik.mysql.com
f29ed57531
Merge
2003-10-30 10:45:28 -08:00
bell@sanja.is.com.ua
934fa2a104
Merge
2003-10-22 20:52:47 +03:00
pem@mysql.com
337238b78a
Merging 4.1->5.0
2003-10-22 16:10:22 +02:00
bell@sanja.is.com.ua
2586a56be5
fixed deleting derived table tree after using (BUG#1536)
2003-10-17 15:18:57 +03:00
bell@sanja.is.com.ua
a7bdd19707
subqueries made printable
...
new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274)
2003-10-16 15:54:47 +03:00
heikki@hundin.mysql.fi
5ec87f2449
Many files:
...
ALTER TABLE ... DISCARD/IMPORT TABLESPACE
Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
2003-10-13 11:20:19 +03:00
pem@mysql.telia.com
689bb84f72
WL#962: Added simple, read-only, non-scrolling, asensitive cursors in SPs, using the
...
(updated) Protocol_cursor class.
Also did some bug fixes.
2003-10-10 16:57:21 +02:00
igor@rurik.mysql.com
17aecac32c
Manual merge after improving concurrency for key cache reassignment
2003-10-01 20:16:36 -07:00
pem@mysql.com
8d884c02bb
Merging 4.1 -> 5.0
2003-09-24 11:29:38 +02:00
bar@bar.mysql.r18.ru
4cb99ed5bb
Bug fix:
...
http://bugs.mysql.com/bug.php?id=1129
From: Georg Richter
Description: there is a problem with special chars like umlauts in comments
2003-09-16 12:14:40 +05:00
bell@sanja.is.com.ua
a0bf98b7a4
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-optimized_prepared-4.1
2003-09-09 17:38:21 +03:00
serg@serg.mylan
755455e15c
merged
2003-09-03 12:07:18 +02:00
bell@sanja.is.com.ua
51374e569d
fixed BUG#1180 (changing WHERE clause of prepared statements by optimisation)
2003-09-02 19:56:55 +03:00
dlenev@mysql.com
73ab4be246
Manual merge fixes
2003-09-01 16:14:54 +04:00
dlenev@dlenev.mshome
2486222cd2
Implemented replication over SSL
...
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
Honoring this parameters during connection to master.
Introduced new format of master.info file
2003-09-01 15:16:20 +04:00
Sinisa@sinisa.nasamreza.org
566ebb63ce
merge fixes
2003-08-27 14:36:38 +03:00
igor@rurik.mysql.com
2090d57929
key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc:
...
After merge fix
2003-08-26 15:14:13 -07:00
pem@mysql.com
7f158dd12a
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
igor@rurik.mysql.com
40193a7fa5
Manual merge
2003-08-26 00:13:22 -07: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
serg@serg.mylan
08d7f298ee
fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
...
moved them all from different places to item_strfunc.{h,cc}
checksum table command
Com_xxx status variables updated
2003-08-21 16:15:06 +02:00
bell@laptop.sanja.is.com.ua
dd9cbce47b
merge
2003-08-19 20:14:35 +03:00
monty@mashka.mysql.fi
4f7512160b
After merge fixes
...
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
bell@laptop.sanja.is.com.ua
85f397781b
Code cleanup
2003-08-16 13:26:48 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
serg@serg.mylan
835e00661d
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-08-09 23:48:57 +02:00
serg@serg.mylan
79922d946a
table checksum background:
...
my_checksum() mysys function
NISAM checksum code moved from mysys to isam/ - it's obsolete
MyISAM checksum code moved to mysys
table's checksum accessible from sql layer
SHOW TABLE STATUS shows checksum (WL#646)
code cleanup
2003-08-05 21:14:15 +02:00
bell@sanja.is.com.ua
1119ec0e6f
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-08-05 09:58:00 +03:00
bell@sanja.is.com.ua
659650b4ea
merge
2003-08-05 09:56:21 +03:00
igor@rurik.mysql.com
f7adcbff7b
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-02 03:27:13 -07:00
bell@sanja.is.com.ua
8d0647c6ac
merge
2003-08-01 18:24:27 +03:00
bell@sanja.is.com.ua
6dea500fb2
prevented finding references in item_list for non-SELECT st_select_lex
...
(fixed BUG#943)
2003-07-29 16:59:46 +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
igor@rurik.mysql.com
26ecd86539
Conflict resolution
2003-07-16 13:35:34 -07:00
igor@rurik.mysql.com
42e1296e9d
mi_keycache.c:
...
new file
Many files:
Added CACHE INDEX command
2003-07-16 12:30:49 -07:00
pem@mysql.telia.com
9c3a7a6ba3
Merge 4.1 into 5.0 (first pass).
2003-07-08 17:50:23 +02:00
bell@sanja.is.com.ua
6348e63f62
Optimisation if simple IN subselect with primary index
...
(SCRUM) (part of WL#818)
2003-07-07 18:40:19 +03:00
pem@mysql.com
c908b555ff
Fixed the old kludge for pre-loading functions and made it more efficient
...
using a hash table instead (and made it work with lex pointers).
Some additional code cleanup too.
2003-07-07 14:55:10 +02:00
bell@sanja.is.com.ua
73fdf52fa2
merged
2003-07-03 11:59:57 +03:00
monty@narttu.mysql.fi
c21728f8c8
Cleaner implementation if INSERT ... SELECT with same tables
...
Tests cleanup (put drop database first in tests)
2003-07-03 11:55:36 +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
bell@sanja.is.com.ua
f1353c1dda
merged
2003-07-01 10:03:20 +03:00
bell@sanja.is.com.ua
100a101ab6
Merge
2003-06-30 13:14:18 +03:00
pem@mysql.com
9f14ae7516
sp_head now has its own mem_root (WL#961).
...
Also fixed some difficult memory leaks that became apparent
in this task.
2003-06-29 18:15:17 +02:00
bell@sanja.is.com.ua
7c799b17b6
merged
2003-06-29 15:35:48 +03:00
bell@sanja.is.com.ua
00f952849d
merging
2003-06-27 23:14:20 +03:00
bell@sanja.is.com.ua
e8b1e21615
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-cond_count-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-top2-4.1
2003-06-26 11:31:13 +03:00
bell@sanja.is.com.ua
2d120d32fa
cond_count moved to SELECT_LEX_NODE
...
fixed BUG #726
2003-06-26 11:09:11 +03:00