brian@zim.(none)
333a5662fd
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-08-29 18:03:56 -07:00
pgalbraith@mysql.com
162353250e
ha_blackhole.cc:
...
Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!
2005-08-30 02:46:03 +02:00
brian@zim.(none)
ab126a8130
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-08-29 17:41:09 -07:00
sergefp@mysql.com
5d336fbbe1
Fix for BUG#12720: In QUICK_RANGE_SELECT::reset(), reset in_range so next get_next() call
...
doesn't continue reading the last range.
2005-08-30 03:14:39 +04:00
brian@zim.(none)
b4208c569a
Update for delete_all_rows() which will be used for TRUNCATE and DELETE support.
2005-08-29 15:26:05 -07:00
brian@zim.(none)
4e9931752e
Added support for delete_all_rows() for archive. This fixes bug #12836 .
2005-08-29 15:05:16 -07:00
jimw@mysql.com
4c5faed094
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-29 14:41:00 -07:00
reggie@linux.site
6bf4e15b08
updated some vcproj files and the .sln file
2005-08-29 15:35:27 -06:00
andrey@lmy004.
f479c3a48f
Merge lmy004.:/work/mysql-5.0-clean into lmy004.:/work/mysql-5.0-ready5
2005-08-29 22:28:01 +02:00
andrey@lmy004.
251271f11b
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-clean
2005-08-29 21:34:42 +02:00
konstantin@mysql.com
2c9db925fa
Remove a no longer used header.
2005-08-29 23:32:47 +04:00
konstantin@mysql.com
344144ad14
Cleanup the instance manager code.
2005-08-29 23:29:35 +04:00
pgalbraith@mysql.com
9f45c8f2fe
ha_blackhole.cc:
...
Added missing DBUG enter, compiled and tested on production with debug-max
build (my regular build missed the previous errors friday)
Changeset:
Added missing DBUG_ENTER, compiled and tested on production with debug-max
build!
2005-08-29 21:22:06 +02:00
jimw@mysql.com
f8b4fddcca
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-29 12:18:55 -07:00
ingo@mysql.com
4b0ac126cd
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-29 21:11:05 +02:00
ingo@mysql.com
ae7e8b1de6
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-08-29 21:10:25 +02:00
ingo@mysql.com
b2b93f0abc
After merge fix.
2005-08-29 21:06:45 +02:00
andrey@lmy004.
1668c45d30
fix for bug 12207 (alter table discard tablespace on MyISAM table
...
causes ERROR 2013).
(all-in-one approved patch)
2005-08-29 21:00:43 +02:00
jimw@mysql.com
ef79a04439
Merge mysql.com:/home/jimw/my/mysql-5.0-12705
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-29 11:54:23 -07:00
anozdrin@mysql.com
d30534c953
Implement WL#2789 "Instance Manager: test using mysql-test-run testing framework"
2005-08-29 22:28:42 +04:00
bar@mysql.com
2f8a3bf747
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-08-29 22:17:13 +05:00
jimw@mysql.com
25adba36b1
Merge mysql.com:/home/jimw/my/mysql-5.0-11523
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-29 10:02:23 -07:00
ingo@mysql.com
4368e9957d
After merge fix.
2005-08-29 18:41:39 +02:00
joerg@mysql.com
bd17f3e6f1
Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0
2005-08-29 18:32:42 +02:00
paul@frost.snake.net
6b265793c3
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
2005-08-29 11:25:12 -05:00
tomas@poseidon.ndb.mysql.com
dba2e0074b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-29 18:25:11 +02:00
tomas@poseidon.ndb.mysql.com
60df5fffb3
updated ndb redo file reader with schemaversion in commit rcord instead of prepare record
2005-08-29 18:23:53 +02:00
ingo@mysql.com
5d41d5e0f4
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-29 18:18:30 +02:00
ingo@mysql.com
5845a6e553
Bug#10056 - PACK_KEYS option take values greater than 1 while creating table
...
Added a switch to reject illegal values for PACK_KEYS.
2005-08-29 17:24:07 +02:00
ingo@mysql.com
330eb04536
Bug#12296 - CHECKSUM TABLE reports 0 for the table
...
Skipping deleted records instead of breaking the loop
during checksum calculation.
2005-08-29 17:08:41 +02:00
ingo@mysql.com
32e3238da7
Bug#11816 - Truncate table doesn't work with temporary innodb tables
...
Handle temporary tables like permanent tables: If the storage engine
cannot truncate, delete instead.
2005-08-29 17:01:46 +02:00
ingo@mysql.com
674f8dfa7c
Bug#11493 - Alter table rename to default database does not work without db name qualifying
...
Supplied the default database name for ALTER TABLE ... RENAME
for the new table instead of the old tables db like we do for
other ALTERs.
2005-08-29 16:54:33 +02:00
ingo@mysql.com
5c14b35a7f
Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
...
Changed end-space comparison so that the key is not used past
its end. This is due to the new end-space behaviour in 4.1.
See also bug 6151 and 9188.
2005-08-29 16:50:09 +02:00
timour@mysql.com
e62c877748
Fix for BUG#12672.
2005-08-29 17:13:42 +03:00
andrey@lmy004.
235cde55fb
fix for bug #12841
...
(Server crash on DO IFNULL(NULL,NULL)
(fixes also "SELECT CAST(IFNULL(NULL,NULL) as DECIMAL)" unreported
crash)
(new revampled fix with suggestions from Igor)
2005-08-29 15:45:03 +02:00
msvensson@neptunus.(none)
5de2259263
Bug #12527 yassl causes errors in "repair" and "optimize"
...
- Use constant directly to check that enough number of bytes have been written as header of the archive.
2005-08-29 14:04:15 +02:00
bar@mysql.com
96e0cb8cbf
ctype_utf8.result, ctype_utf8.test, item.cc:
...
Bug#12371 executing prepared statement fails (illegal mix of collations)
After review fixes.
2005-08-29 16:49:01 +05:00
bar@mysql.com
be470c38c6
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12371
2005-08-29 15:44:49 +05:00
andrey@lmy004.
d7d307fbdd
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-ready4
2005-08-29 12:20:36 +02:00
andrey@lmy004.
ed0bac2116
fix for bug #12490 (all-in-one patch)
...
(Packets out of order if calling HELP CONTENTS from Stored Procedure)
2005-08-29 12:19:08 +02:00
osku@127.(none)
caf74b7cdd
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-29 09:06:43 +03:00
kent@mysql.com
c019e40ff0
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-08-28 20:21:47 +02:00
kent@mysql.com
88af3ceb20
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-08-28 20:03:03 +02:00
kent@mysql.com
e2954b29a1
Makefile.am:
...
Make ports configurable from environment for test
2005-08-28 19:46:56 +02:00
sergefp@mysql.com
e4ce706cf9
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-aug28-vg
2005-08-28 20:26:42 +04:00
sergefp@mysql.com
e13f67cd05
Fix for valgrind warning: Check for thd->binlog_evt_union.unioned_events only if
...
we were doing binlog union (i.e. need_binlog_call==TRUE)
2005-08-28 20:25:53 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
d09e52c552
Applied a couple of Netware related patches.
2005-08-28 11:38:18 +03:00
paul@frost.snake.net
39e5dafb91
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
2005-08-27 21:52:26 -05:00
paul@frost.snake.net
c0080aeba6
set_var.cc:
...
Reorder out-of-order system variables.
2005-08-27 19:20:10 -05:00
paul@frost.snake.net
458bc88563
mysqld.cc:
...
Reorder out-of-order status variables.
2005-08-27 19:18:53 -05:00