jimw@mysql.com
960c5621eb
Bug #17849 : sql_big_selects not shown in SHOW VARIABLES output
...
This patch simply adds sql_big_selects to the list of variables
output by SHOW VARIABLES.
2006-04-26 09:21:53 -07:00
elliot@mysql.com
d96fbd738d
The fix for bug#17248 accidentally removed the sync_binlog variable.
...
This patch restores sync_binlog.
2006-04-26 11:55:26 -04:00
jonas@perch.ndb.mysql.com
63a6989a0b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-26 16:57:42 +02:00
bell@sanja.is.com.ua
0e331dfb92
fixed error message text
2006-04-26 17:57:41 +03:00
jonas@perch.ndb.mysql.com
ca04daab27
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-26 16:57:41 +02:00
aivanov@mysql.com
4afe473ed5
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492
2006-04-26 18:57:40 +04:00
aivanov@mysql.com
419d4980e0
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492
2006-04-26 12:45:29 +04:00
aivanov@mysql.com
6f8c03ee69
Merge mysql.com:/home/alexi/mysql-5.0
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492
2006-04-26 12:43:38 +04:00
aivanov@mysql.com
b34ec32b5b
Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
2006-04-26 11:23:43 +04:00
aivanov@mysql.com
11687d2f84
Make innodb_mysql produce a non-empty output.
2006-04-26 11:15:09 +04:00
bpontz@mysql.com
92825f3ada
configure.in:
...
clone-off for 5.0.21
2006-04-26 08:26:33 +02:00
aivanov@mysql.com
b748835897
Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
2006-04-26 09:56:06 +04:00
aivanov@mysql.com
7b8c526078
Files innodb.[test|result] are to be used by Innobase only.
...
Use files innodb_mysql.[test|result] instead.
2006-04-26 09:51:57 +04:00
serg@sergbook.mysql.com
ed3f3fa0c7
after merge
2006-04-25 22:39:59 -07:00
serg@sergbook.mysql.com
ab2820e80f
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2006-04-25 21:32:30 -07:00
aivanov@mysql.com
422071a83e
Applied innodb-5.0-ss492 snapshot.
...
Fixed BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
2006-04-26 07:50:29 +04:00
serg@sergbook.mysql.com
54c97e6150
after merge fix
2006-04-25 17:12:06 -07:00
sergefp@mysql.com
078ec307ae
Fix compile failure on Win32
2006-04-26 01:21:33 +04:00
serg@sergbook.mysql.com
c97d923cfd
merged
2006-04-25 14:06:04 -07:00
serg@sergbook.mysql.com
3144d5eb48
buffer overflow and information exposure bugs fixed
...
(reported by Stefano Di Paola)
2006-04-25 13:37:33 -07:00
sergefp@mysql.com
867dffa8a4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug15827-r2
2006-04-26 00:30:54 +04:00
sergefp@mysql.com
1d4acfb668
BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that consumes
...
too much memory. Instead, either create the equvalent SEL_TREE manually, or create only two ranges that
strictly include the area to scan
(Note: just to re-iterate: increasing NOT_IN_IGNORE_THRESHOLD will make optimization run slower for big
IN-lists, but the server will not run out of memory. O(N^2) memory use has been eliminated)
2006-04-25 23:33:31 +04:00
stewart@mysql.com
ebbff7ee3f
BUG#19340 small leak in ndbd
...
small cleanup fixes in kernel/vm/Configuration
2006-04-25 10:04:46 -07:00
jonas@perch.ndb.mysql.com
ef29fc68b3
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-04-25 16:01:54 +02:00
jonas@perch.ndb.mysql.com
a23944b988
ndb - bug#18597
...
Handle early abort of scan, so that resources are correctly freed
2006-04-25 16:01:08 +02:00
mskold@mysql.com
051e6ac994
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-04-25 12:46:40 +02:00
mskold@mysql.com
435c1028fc
Fixed memleak detected by valgrind
2006-04-25 12:40:31 +02:00
knielsen@mysql.com
eb53a5b02c
Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0-mtr-fix
...
into mysql.com:/data0/knielsen/mysql-5.0-mtr-fix
2006-04-24 23:56:36 +02:00
knielsen@mysql.com
854cbe88b6
Merge mysql.com:/usr/local/mysql/mysql-4.1
...
into mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix
2006-04-24 23:51:47 +02:00
knielsen@mysql.com
17a80c9da4
Fix typo in mysql-test-run.pl (not caught by aotupush since it uses mysql-test-run.sh).
2006-04-24 15:34:01 +02:00
knielsen@mysql.com
afeb3c06f7
Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-4.1-mtr-fix
...
into mysql.com:/data0/knielsen/mysql-4.1-mtr-fix
2006-04-24 10:28:31 +02:00
joerg@mysql.com
5ec0af4acb
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2006-04-24 09:39:28 +02:00
ramil@production.mysql.com
f7394c26f5
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/rkalimullin/4.1.b17896
2006-04-24 08:01:10 +02:00
paul@polar.kitebird.com
497b91d60d
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2006-04-23 19:52:01 -05:00
paul@polar.kitebird.com
dfbdef876a
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2006-04-23 19:50:03 -05:00
paul@polar.kitebird.com
5907ce40e8
Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
...
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2006-04-23 19:49:05 -05:00
paul@polar.kitebird.com
3cd7e135d4
myisam_ftdump.c:
...
myisam_ftdump options: --help first, then rest in
lexical order.
2006-04-23 19:26:56 -05:00
aelkin@mysql.com
ac47502164
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-04-23 21:30:04 +03:00
aelkin@mysql.com
a8368fde52
Merge mysql.com:/net/nb/home/elkin/MySQL/FIXES/5.0-bug17263-temp_drop
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-04-23 20:06:30 +03:00
aelkin@mysql.com
b56d36dd30
Bug#17263 temporary tables and replication
...
The fix refines the algorithm of generating DROPs for binlog.
Temp tables with common pseudo_thread_id are clustered into one query.
Consequently one replication event per pseudo_thread_id is generated.
2006-04-23 19:59:43 +03:00
aelkin@mysql.com
19f134e40b
Bug#17263: incorrect DROP query in temporary tables replication
...
accounting non-ai32 in tmpkeyval. This changeset is supposed to be specifically for 4.1.
Another changeset is going to push into 5.
2006-04-23 19:42:26 +03:00
aelkin@mysql.com
28fe756a3d
manual merge use local
2006-04-23 12:32:41 +03:00
aelkin@mysql.com
b2b725dba0
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-04-23 12:32:40 +03:00
aelkin@mysql.com
c5219d0d67
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-04-23 12:32:39 +03:00
konstantin@mysql.com
8301e6f625
Merge mysql.com:/opt/local/work/mysql-5.0-root
...
into mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-04-23 13:32:38 +04:00
aivanov@mysql.com
4fba67933d
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb/mysql-5.0
2006-04-23 13:32:37 +04:00
aelkin@mysql.com
a4ff312037
Bug#17263 temporary tables and replication
...
Backporting a changeset made for 5.0. Comments from there:
The fix refines the algorithm of generating DROPs for binlog.
Temp tables with common pseudo_thread_id are clustered into one query.
Consequently one replication event per pseudo_thread_id is generated.
2006-04-23 12:18:57 +03:00
aivanov@mysql.com
50e8e58c8a
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb/mysql-4.1
2006-04-23 13:18:56 +04:00
dlenev@mysql.com
5e7076ce95
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/dlenev/mysql-5.0-bg15153-2
2006-04-22 11:56:15 +04:00
dlenev@mysql.com
c77d5a0ed1
Fix for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs".
...
Error was emitted when one tried to select information from view which used
merge algorithm and which also had CONVERT_TZ() function in its select list.
This bug was caused by wrong assumption that global table list for view
which is handled using merge algorithm begins from tables belonging to
the main select of this view. Nowadays the above assumption is not true only
when one uses convert_tz() function in view's select list, but in future
other cases may be added (for example we may support merging of views
with subqueries in select list one day). Relying on this false assumption
led to the usage of wrong table list for field lookups and therefor errors.
With this fix we explicitly use pointer to the beginning of main select's
table list.
2006-04-22 11:54:25 +04:00