msvensson@neptunus.(none)
d7faf15ce5
Bug#19190 syntax error in mysql-test/mysql-test-run.sh script
2006-04-19 16:23:35 +02:00
stewart@mysql.com
1626a76fdc
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug15530
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/merge
2006-04-19 17:14:35 +10:00
igor@rurik.mysql.com
950214abfc
Fixed bug #19079 .
...
The bug caused a reported index corruption in the cases when
key_cache_block_size was not a multiple of myisam_block_size,
e.g. when key_cache_block_size=1536 while myisam_block_size=1024.
2006-04-18 20:57:31 -07:00
pem@mysql.com
9eb230f9bd
Fixed BUG#18344: DROP DATABASE does not drop associated routines
...
We must use the db key length in sp_drop_db_routines (and not the
number of characters), or long db names will be truncated in the key.
2006-04-18 16:01:01 +02:00
jonas@perch.ndb.mysql.com
242f5f2100
ndb -
...
post merge
2006-04-18 14:36:29 +02:00
jonas@perch.ndb.mysql.com
2b9d78e639
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-04-18 14:34:40 +02:00
jonas@perch.ndb.mysql.com
58d214b941
ndb -
...
fix api_signal_log print of uncond signals
2006-04-18 14:34:11 +02:00
mleich@mysql.com
3a18f1e27c
Merge mysql.com:/home/matthias/Arbeit/mysql-4.1/src
...
into mysql.com:/home/matthias/Arbeit/mysql-4.1/src-1
2006-04-18 14:18:51 +02:00
mleich@mysql.com
d548dd4e37
Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src
...
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-18 13:43:52 +02:00
kent@mysql.com
8c420e29eb
configure.in:
...
Stepped up version to 5.0.20a
2006-04-18 13:26:41 +02:00
msvensson@neptunus.(none)
1ea71459df
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
2006-04-18 13:08:16 +02:00
msvensson@neptunus.(none)
c53f2320e4
Bug#18815 libmysql using yassl can't be linked with c program
...
- Apply patch to remove dependency on C++ libs when linking "libmysql" from c
2006-04-18 12:08:06 +02:00
pem@mysql.com
868ffcca86
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug18787/mysql-5.0-runtime
2006-04-18 11:20:18 +02:00
pem@mysql.com
504bbe4917
Post-review fix for BUG#18787. Renamed a local variable in
...
Item_func_sp::tmp_table_field() to something more descriptive.
2006-04-18 11:16:39 +02:00
pem@mysql.com
a6fbde9db7
Fixed BUG#18949: Test case sp-goto is disabled
...
Removed sp-goto.test, sp-goto.result and all (disabled) GOTO code.
Also removed some related code that's not needed any more (no possible
unresolved label references any more, so no need to check for them).
NB: Keeping the ER_SP_GOTO_IN_HNDLR in errmsg.txt; it might become useful
in the future, and removing it (and thus re-enumerating error codes)
might upset things. (Anything referring to explicit error codes.)
2006-04-18 11:07:34 +02:00
joerg@mysql.com
325287adc6
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2006-04-18 10:25:25 +02:00
serg@mysql.com
98ea03931e
mysql.cc:
...
revert bug#16855 "fix" per Monty's request
2006-04-18 10:16:06 +02:00
stewart@mysql.com
ea349616b1
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18881
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/merge
2006-04-18 17:39:05 +10:00
stewart@mysql.com
40ec77d05e
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18843
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/merge
2006-04-18 17:22:25 +10:00
stewart@mysql.com
4e092ed74f
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18833
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/merge
2006-04-18 17:21:54 +10:00
cmiller@zippy.(none)
592dc88be7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-17 16:00:49 -04:00
cmiller@zippy.(none)
809cb7521c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-17 10:14:38 -04:00
gkodinov@mysql.com
94e556137d
BUG#17152: Wrong result with BINARY comparison on aliased column
...
Testsuite added
2006-04-17 16:46:56 +03:00
bar@mysql.com
a9e3092102
item_timefunc.cc:
...
5.0 additional fix for b#18691
Handle DECIMAL the same with INT and REAL.
2006-04-17 15:36:25 +05:00
bar@mysql.com
3fef2ba6aa
Merge mysql.com:/usr/home/bar/mysql-4.1.b18691
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-04-17 15:01:55 +05:00
cmiller@zippy.(none)
7d282984f3
Only expand the empty string to the letters "NULL" if the column
...
does not have "NOT NULL" attribute set. Also, calculate the padding
characters more safely, so that a negative number doesn't cause it to
print MAXINT-n spaces.
2006-04-16 17:17:36 -04:00
svoj@april.(none)
8a7adb196d
Merge april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/BUG17917/mysql-5.0
2006-04-15 16:08:03 +05:00
evgen@moonbone.local
bc1f457194
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14169-bug-4.1-mysql
2006-04-14 17:25:58 +04:00
aelkin@mysql.com
b033da87fa
Bug#19097: rpl_view failed on some platforms
...
removing comments from the opt file.
2006-04-14 12:13:26 +03:00
bar@mysql.com
941e529c59
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b18691
2006-04-14 13:30:47 +05:00
bell@sanja.is.com.ua
5c7955bd54
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-14 02:02:28 +03:00
konstantin@mysql.com
b5863b3987
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-04-14 02:38:41 +04:00
bell@sanja.is.com.ua
8136b25811
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-14 00:17:50 +03:00
bell@sanja.is.com.ua
efb8b990e4
The check for recursive view definitions added. (BUG#14308)
2006-04-13 23:12:26 +03:00
konstantin@mysql.com
6f51b4199f
Merge mysql.com:/opt/local/work/mysql-5.0-root
...
into mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-04-14 00:07:04 +04:00
mleich@mysql.com
9ee2a76be3
Merge three.local.lan:/home/matthias/Arbeit/mysql-4.1/src-1
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-13 21:09:26 +02:00
aelkin@dl145j.mysql.com
b6992dd4c5
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145j.mysql.com:/tmp/andrei/5.0-bug18715_drop_view_slave
2006-04-13 20:55:51 +02:00
mleich@mysql.com
3ca1ec8fdc
Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to
...
MySQL 4.1
and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
- backport of several fixes done in MySQL 5.0 to 4.1
- fix for new discovered instability (see comment on Bug#12429 + Bug#16920)
- reenabling of testcases
2006-04-13 20:42:48 +02:00
bell@sanja.is.com.ua
df69944e73
postmerge fix: added tinfo support.
2006-04-13 16:06:52 +03:00
bell@sanja.is.com.ua
014914cbcf
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-13 16:01:08 +03:00
bell@sanja.is.com.ua
cb81389aef
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-13 15:07:50 +03:00
grog@mysql.com
da6210ee61
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/MySQL/5.0-Bug-17248a
2006-04-13 21:37:49 +09:30
sergefp@mysql.com
34b2ed5f7f
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-csc9139
2006-04-13 16:07:48 +04:00
sergefp@mysql.com
1d3a0c0ec8
BUG#19021, Crash in ROR-index_merge optimizer:
...
get_best_covering_ror_intersect() was copying ror_scans starting from the
end of the array and not from its beginning.
2006-04-13 16:05:32 +04:00
ramil@mysql.com
2398882097
Fix for bug #18643 : crazy UNCOMPRESS().
2006-04-13 16:19:21 +05:00
svoj@april.(none)
d1969bcfe0
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
2006-04-13 15:40:12 +05:00
konstantin@mysql.com
b915f054cf
Fix a typo in the help message.
2006-04-13 14:06:46 +04:00
svoj@april.(none)
f78fdf6621
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
2006-04-13 14:38:36 +05:00
svoj@april.(none)
7412db5e56
BUG#17917 - SELECT from compressed MyISAM table crashes MySQL server
...
Retrieving data from compressed MyISAM table which is bigger than 4G on 32-bit box
with mmap() support results in server crash.
mmap() accepts length of bytes to be mapped in second param, which is 32-bit
size_t. But we pass data_file_length, which is 64-bit my_off_t. As a result only
first data_file_length % 4G were mapped.
This fix adds additional condition for mmap() usage, that is use mmap() for
compressed table which size is no more than 4G on 32-bit platform.
2006-04-13 14:37:03 +05:00
grog@mysql.com[grog]
3eb783813f
foo2
2006-04-13 17:22:56 +09:30