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
06c79b143b
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb/mysql-4.1-innodb
2006-04-26 12:39:47 +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
serg@sergbook.mysql.com
1409dc6f59
small optimization of the previous bugfix
...
(based on the fact that packet is ALWAYS \0 terminated, see my_net_read)
2006-04-25 16:41:12 -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
evgen@moonbone.local
69b90fb2a8
Merge epotemkin@lsmy3:/data/users/bk/mysql-5.0-opt-bugs
...
into moonbone.local:/work/18739-bug-5.0-mysql
2006-04-25 17:45:31 +04: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
msvensson@neptunus.(none)
95cac67921
Revert use of octal numbers for chmod
2006-04-24 21:42:44 +02:00
evgen@moonbone.local
3c06a20bfe
having.test:
...
After merge fix for bug#18739
2006-04-24 20:59:23 +04:00
evgen@moonbone.local
1a6dc770e3
Manually merged
2006-04-24 17:52:15 +04: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
msvensson@neptunus.(none)
92cd4762af
Update disabled message to include bug no.
2006-04-24 14:25:34 +02:00
msvensson@neptunus.(none)
c2efcc4adf
Test it it works better to set no read access for a file by using 000 instead of -r
...
Looks like the trigger.test works that way
2006-04-24 13:51:21 +02:00
msvensson@neptunus.(none)
fd52c34124
Update help message for start-and-exit
2006-04-24 13:33:33 +02:00
msvensson@neptunus.(none)
9e49e393a4
Ad file "have_ndb_status_ok.require"
2006-04-24 13:25:50 +02:00
msvensson@neptunus.(none)
b30df055af
Use "eval select" when evaluating the environment variable "$MYSQL_TEST_ROOT"
2006-04-24 12:01:16 +02:00
msvensson@neptunus.(none)
d1536ba0c9
Make have_ndb.in portable
2006-04-24 12:00:11 +02:00
msvensson@neptunus.(none)
7e3593def8
Bug#19084 ./mysql-test-run.pl do not print bootstrap run info
...
- Log boostratp/install to var/log/boostrap.log
- Log output from mysqladmin to var/log/mysqladmin.log
- Remove old manager references
2006-04-24 11:26:41 +02:00
msvensson@neptunus.(none)
7831bd0002
Cleanup formatting
2006-04-24 10:39:56 +02:00
msvensson@neptunus.(none)
7f1d1586be
Remove the old unused code for setting a PATH
2006-04-24 10:33:24 +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
msvensson@neptunus.(none)
cb69ff25da
Move copy_dir to mtr_misc and rename it to mtr_copy_dir
2006-04-24 10:27:13 +02:00
msvensson@neptunus.(none)
1f2ac2195a
Remove 5 second sleep for win32
2006-04-24 10:22:26 +02:00
msvensson@neptunus.(none)
d59a0f4840
Bug#17002 mysql-test-run as root user
...
- Add test to see if tests are running with root permissions
- Disables tests that uses chmod if that is the case
2006-04-24 10:21:09 +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