igor@rurik.mysql.com
639e875032
Post merge fixes
2006-04-21 08:19:38 -07:00
kroki@mysql.com
b0c1e49a11
Bug#15728: LAST_INSERT_ID function inside a stored function returns 0
...
Do not reset value of LAST_INSERT_ID() in sub-statement.
2006-04-21 18:55:04 +04:00
joerg@mysql.com
668d083653
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2006-04-21 15:20:10 +02:00
pem@mysql.com
8532fa29f4
Post-push fix for BUG#18344: DROP DATABASE does not drop associated routines
...
Fixed windows compile error in sql/sp.cc (missing cast to byte*)
2006-04-21 14:30:44 +02:00
tomas@poseidon.ndb.mysql.com
77e3fc3a09
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-04-21 14:02:21 +02:00
ramil@production.mysql.com
aed861fd86
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/rkalimullin/4.1.b18643
2006-04-21 13:56:40 +02:00
tomas@poseidon.ndb.mysql.com
f071779791
Bug #17230 Can't change character-sets-dir for ndbd
2006-04-21 13:53:48 +02:00
mskold@mysql.com
09d4105f7d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-04-21 12:16:17 +02:00
pem@mysql.com
8c5ae25ff5
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug18344/mysql-5.0-runtime
2006-04-21 10:22:06 +02:00
mskold@mysql.com
472aeeb9df
Fix for bug#19088: NDBAPI: Segfault in NdbIndexScanOperation::setBound(...)
2006-04-21 10:17:55 +02:00
msvensson@neptunus.(none)
e984716c01
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/my50-bug19190
2006-04-21 10:17:16 +02:00
igor@rurik.mysql.com
37ac782206
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-21 00:36:20 -07:00
ramil@mysql.com
b9fc8e1f69
Bug #17896 : MIN of CASE WHEN returns non-minimum value!
...
- after review fixes
2006-04-21 11:48:00 +05:00
igor@rurik.mysql.com
fd3e924164
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-04-20 22:34:37 -07:00
igor@rurik.mysql.com
fc7514151f
Fixed bug #18767 .
...
The bug caused wrong result sets for union constructs of the form
(SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2.
For such queries order lists were concatenated and limit clause was
completely neglected.
2006-04-20 22:15:38 -07:00
aivanov@mysql.com
364621abc0
Restoring changes erroneously removed by applying
...
the innodb-5.0-ss476 snapshot.
2006-04-21 01:37:31 +04:00
aivanov@mysql.com
25d9a75d12
Applied innodb-5.0-ss476 snapshot.
...
Fix BUG#18934: "InnoDB crashes when table uses column like DB_ROW_ID".
Also, fix memory leaks in row_create_table_for_mysql() in rare
corner cases.
2006-04-21 01:07:37 +04:00
aivanov@mysql.com
721191c0f9
Merge mysql.com:/home/alexi/innodb/mysql-4.1-work
...
into mysql.com:/home/alexi/innodb/mysql-5.0-work
Null-merge.
2006-04-20 23:18:29 +04:00
aivanov@mysql.com
b758353735
Applied innodb-4.1-ss22 snapshot.
...
Fix BUG#16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section"
Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW INNODB STATUS
output.
Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID".
Refuse tables that use reserved column names.
2006-04-20 23:09:49 +04:00
mleich@mysql.com
4cbad914ca
Post merge correction for the Changesset
...
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)
2006-04-20 19:43:02 +02:00
pem@mysql.com
2dc3026c08
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug18949/mysql-5.0-runtime
2006-04-20 16:00:33 +02:00
mleich@mysql.com
26b9d40309
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-20 15:25:28 +02:00
mskold@mysql.com
fdd6d3ca8c
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-04-20 13:35:34 +02:00
mleich@mysql.com
e8178cabb1
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-20 12:35:10 +02:00
mskold@mysql.com
22d345bf5b
Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code
2006-04-20 12:06:22 +02:00
evgen@moonbone.local
e347ec5cbe
func_gconcat.result, func_gconcat.test:
...
Remove duplicate test case for bug#14169
2006-04-20 13:34:14 +04:00
mleich@production.mysql.com
5109b3ce02
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/mleich/src
2006-04-20 11:31:22 +02:00
evgen@moonbone.local
4b04ce8085
func_gconcat.test:
...
Clean up test case for bug#14169
2006-04-20 12:35:33 +04:00
joerg@mysql.com
0946a06d5b
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2006-04-20 10:13:04 +02:00
igor@rurik.mysql.com
692da27388
Post merge fix
2006-04-20 00:42:12 -07:00
igor@rurik.mysql.com
7b0373a557
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-19 18:27:18 -07:00
igor@rurik.mysql.com
27cc6f4bc3
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-19 18:08:15 -07:00
igor@rurik.mysql.com
67458961cf
Temporarily commented out a query from the test case for bug 14169 to make it pass with --ps-protocol.
2006-04-19 16:08:37 -07:00
igor@rurik.mysql.com
881b55d503
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-2
2006-04-19 14:42:51 -07:00
jimw@mysql.com
b57eb9e17c
Merge mysql.com:/home/jimw/my/mysql-5.0-17043
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-19 14:18:35 -07:00
evgen@moonbone.local
f89daa2f6d
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14169-bug-4.1-mysql
2006-04-20 00:28:17 +04:00
evgen@moonbone.local
8b4eae6e4f
func_gconcat.result:
...
Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.
2006-04-20 00:27:43 +04:00
svoj@april.(none)
806cd41529
Bug#18544 - LOCK TABLES timeout causes MyISAM table corruption
...
After a locking error the open table(s) were not fully
cleaned up for reuse. But they were put into the open table
cache even before the lock was tried. The next statement
reused the table(s) with a wrong lock type set up. This
tricked MyISAM into believing that it don't need to update
the table statistics. Hence CHECK TABLE reported a mismatch
of record count and table size.
Fortunately nothing worse has been detected yet. The effect
of the test case was that the insert worked on a read locked
table. (!)
I added a new function that clears the lock type from all
tables that were prepared for a lock. I call this function
when a lock failes.
No test case. One test would add 50 seconds to the
test suite. Another test requires file mode modifications.
I added a test script to the bug report. It contains three
cases for failing locks. All could reproduce a table
corruption. All are fixed by this patch.
This bug was not lock timeout specific.
2006-04-19 22:54:25 +05:00
dlenev@mysql.com
19e558a09d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/dlenev/mysql-5.0-bg16021
2006-04-19 19:35:32 +04:00
dlenev@mysql.com
b128fa1022
Added test case for bug #16021 "Wrong index given to function in trigger"
...
which was caused by the same bulk insert optimization as bug #17764 but
had slightly different symptoms.
2006-04-19 19:13:03 +04:00
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
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