mats@mysql.com
04fc2d9eb8
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b17400-mysql-5.1-new
2006-04-19 10:58:44 +02:00
monty@mysql.com
f636a4d43c
Only run test with row based logging
2006-04-19 11:20:11 +03:00
monty@mysql.com
feca86044f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/my/mysql-5.1
2006-04-19 10:41:33 +03:00
monty@mysql.com
9ad5c2de05
Fix compilation failure when compiling with BUILD/compile-pentium-debug-max
...
(Problem with embedded server and ndb)
Fix broken mysql-test-run.sh
Removed memory leak in ha_example.cc
2006-04-19 10:39:57 +03:00
bar@mysql.com
a26f115a13
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
2006-04-19 11:42:41 +05:00
bar@mysql.com
cedafc30e8
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
2006-04-19 09:50:17 +05:00
bar@mysql.com
004854fbdd
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b16319
2006-04-19 09:22:04 +05: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
msvensson@neptunus.(none)
3f683e2ba4
Cleanup test cases that leaves "stuff" behind
2006-04-18 18:10:47 +02:00
msvensson@neptunus.(none)
210af244b2
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564
2006-04-18 17:07:35 +02: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
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
mskold@mysql.com
1516bb1318
Updated result file
2006-04-18 12:16:27 +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
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
msvensson@neptunus.(none)
030de4f912
Merge 192.168.0.20:mysql/bug13310/my50-bug13310
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-18 10:55:57 +02:00
msvensson@shellback.(none)
13062cbad6
BUG#13310 incorrect user parsing by SP
...
- Strip surrounding ''s from username when a new user connects. There
is no user 'a@', it should be a@
2006-04-18 10:46:17 +02:00
mskold@mysql.com
a8d4eb8c34
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-18 09:00:02 +02:00
elliot@mysql.com
ac6450b858
BUG#19158 Fixing rpl_row_log_innodb test for pushbuild.
2006-04-18 00:30:55 -04:00
igor@rurik.mysql.com
e178ec2fc8
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-17 16:40:16 -07:00
cmiller@zippy.(none)
61552172df
Fixing a merge from a few days ago.
...
Without a flush this test is nondeterministic for "row" binlog-format.
2006-04-17 18:57:01 -04:00
pekka@mysql.com
9f355db66e
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-04-18 00:56:59 +02:00
mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se
9c6aef5b4e
BUG#18752
...
Fixed forgotten merge fix
2006-04-17 18:56:58 -04: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
pekka@mysql.com
4d1e38744d
ndb - bug#16796
2006-04-17 20:24:41 +02: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
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
brian@zim.(none)
98f2cd4468
Fixed a few pieces around support for data directory.
2006-04-16 21:55:02 -07: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
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
8ae26a2868
WL 2826: Error handling of ALTER TABLE for partitioning
...
After review changes
2006-04-15 21:49:13 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
5dc6310712
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-15 09:47:33 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
d73e985ac1
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-14 17:50:32 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
bd868aecbb
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-14 17:48:27 -04:00
cmiller@zippy.(none)
c7513d482f
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-04-14 13:33:02 -04:00
cmiller@zippy.(none)
1d1040e1ea
Hand-merged test.
2006-04-14 11:39:36 -04:00
cmiller@zippy.(none)
4671650387
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
(With hand-merged tests.)
2006-04-14 11:38:09 -04: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
e75d52711a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b16319
2006-04-14 13:57:46 +05:00
bar@mysql.com
ed6899c64f
Merge mysql.com:/usr/home/bar/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b16319
2006-04-14 13:34:18 +05:00
jimw@mysql.com
6f5999e9b5
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-13 18:59:13 -07: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
andrey@lmy004.
36b897f4c6
update
2006-04-13 23:26:02 +03:00
jimw@mysql.com
2396a360ca
Merge mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-13 13:22:44 -07: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