msvensson@neptunus.(none)
076ddbf840
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-29 15:06:37 +02:00
msvensson@neptunus.(none)
3e2c08cc99
Update after merge to 5.0
2006-05-29 15:05:31 +02:00
msvensson@neptunus.(none)
3fe937b1f4
Merge 192.168.0.20:mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 15:02:57 +02:00
msvensson@shellback.(none)
4ba0e7e3e9
Add new file md4.cpp to VC++ project file
2006-05-29 15:01:04 +02:00
msvensson@shellback.(none)
8f27d3dc4a
Import from yaSSL
2006-05-29 14:49:51 +02:00
andrey@lmy004.
2a6ffba67d
add missing events_grant test
2006-05-29 13:16:29 +02:00
msvensson@neptunus.(none)
20e0714176
Merge neptunus.(none):/home/msvensson/mysql/bug16297/my50-bug16297
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-29 13:16:17 +02:00
andrey@lmy004.
c9309583ee
local variable interval to interval_tmp because it hides
...
Event_timed::interval
2006-05-29 13:12:34 +02:00
msvensson@neptunus.(none)
18bda1aff2
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-29 13:11:21 +02:00
kroki@mysql.com
e87bc6e48c
Avoid race between master and slave.
2006-05-29 14:45:20 +04:00
msvensson@devsrv-b.mysql.com
126bce1d16
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/mysql-5.0
...
into devsrv-b.mysql.com:/users/msvensson/mysql-5.0
2006-05-29 10:47:08 +02:00
msvensson@neptunus.(none)
31765bfbf9
Merge 192.168.0.20:mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 10:45:29 +02:00
msvensson@neptunus.(none)
f90fe21064
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 10:43:15 +02:00
andrey@lmy004.
b4752351f2
Fix for bug #17394 - Events namespace is wrong
2006-05-29 10:39:45 +02:00
msvensson@shellback.(none)
c2e8f34eb4
Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 10:05:52 +02:00
msvensson@devsrv-b.mysql.com
1e89dff375
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into devsrv-b.mysql.com:/users/msvensson/mysql-5.0
2006-05-29 09:35:18 +02:00
ramil@mysql.com
8436973fda
after merge fix.
2006-05-29 12:32:08 +05:00
msvensson@neptunus.(none)
c58f79cb3e
Update result file after merge
2006-05-29 09:26:31 +02:00
msvensson@neptunus.(none)
91e4fd9ac9
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 09:06:06 +02:00
ramil@mysql.com
6b2ab800c9
manual merge
2006-05-29 11:17:38 +05:00
ramil@mysql.com
120c72b047
Merge mysql.com:/usr/home/ram/work/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-05-29 08:55:48 +05:00
igor@rurik.mysql.com
cb4c6a0ded
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-05-28 14:23:28 -07:00
aelkin@mysql.com
6119b7136e
BUG#14157: utf8 encoding in binlog without set character_set_client
...
refining the test case to exclude problems with koi8r on some platforms.
2006-05-28 19:47:01 +03:00
serg@serg.mylan
60e3b61786
Incompatible ftparser plugin API change.
...
mysql_parse() and mysql_add_word() now take a MYSQL_FTPARSER_PARAM*,
not a mysql_ftparam.
2006-05-28 17:02:50 +02:00
serg@sergbook.mysql.com
71657322fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
2006-05-28 14:54:28 +02:00
serg@sergbook.mysql.com
fe97dbb587
handlerton cleanup:
...
duplicate fields removed, st_mysql_storage_engine added to support
run-time handlerton initialization (no compiler warnings), handler API
is now tied to MySQL version, handlerton->plugin mapping added
(slot-based), dummy default_hton removed, plugin-type-specific
initialization generalized, built-in plugins are now initialized too,
--default-storage-engine no longer needs a list of storage engines
in handle_options().
mysql-test-run.pl bugfixes
2006-05-28 14:51:01 +02:00
igor@rurik.mysql.com
377b3e0306
Fixed bug #17873 : confusing error message when IGNORE/USE/FORCE INDEX
...
refers to a column name.
Added a new error message ER_INDEX_DOES_NOT_EXIST.
2006-05-27 23:57:33 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
1068ab153c
BUG#19310: Add partition using InnoDB crashes MySQL Server
...
Added new test case
2006-05-27 20:30:53 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ee11e39fa1
BUG#19903: Add partition crashes
...
Added new test cases
2006-05-27 20:23:22 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
f8bbea4b27
BUG#19830: ALTER TABLE REORGANIZE partition crashes
...
New test cases added
2006-05-27 20:16:17 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
cdc9025e0e
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
2006-05-27 17:38:04 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
bd349cff14
BUG#19695: Showed partition options when table options were not shown
2006-05-27 17:36:45 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
10a7660f94
BUG#19305: COALESCE partition left partition files undropped
2006-05-27 16:34:13 -04:00
kent@mysql.com
d0ed239bba
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-05-27 18:09:50 +02:00
vtkachenko@vadima.volia.com
2e6b51579b
Merge vtkachenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into vadima.volia.com:/root/mysql-5.1-new1
2006-05-27 08:08:03 +03:00
vtkachenko@vadima.volia.com
ddc463494b
sql_class.cc, mysql_priv.h:
...
Added accessor to handler data.
2006-05-27 08:05:39 +03:00
pekka@mysql.com
f9d9cc1575
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2006-05-27 05:03:47 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
90c415ffcd
BUG#19122: MySQL Server crashes when ALTER TABLE t1 REBUILD PARTITION on InnoDB table
2006-05-26 18:44:52 -04:00
elliot@mysql.com
6f686a9ba0
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-release
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
2006-05-26 17:18:20 -04:00
elliot@mysql.com
9ab5929eba
BUG#15868 InnoDB thread thrashing
...
Restoring default innodb_thread_concurrency to 8
This default now matches 5.0
2006-05-26 17:11:21 -04:00
elliot@mysql.com
8be9f0c1e7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
2006-05-26 16:12:05 -04:00
elliot@mysql.com
708f63d624
Set the Windows README file to EOLN_NATIVE so that it doesn't look
...
horrible when checked out on Windows.
2006-05-26 16:09:39 -04:00
elliot@mysql.com
47f7438333
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/emurphy/iggy/mysql-5.0
2006-05-26 15:00:09 -04:00
cmiller@zippy.(none)
e51b1223ec
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-05-26 12:10:35 -04:00
rburnett@bk-internal.mysql.com
f4aa434fbe
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-26 15:08:24 +02:00
kent@mysql.com
7175805cd4
Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release
...
into mysql.com:/data0/mysqldev/my/mysql-5.1-new
2006-05-26 13:17:09 +02:00
gkodinov@mysql.com
393d1b69e0
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kgeorge/mysql/5.0/clean
2006-05-26 12:13:48 +03:00
gkodinov@mysql.com
b6acee915a
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B18681
2006-05-26 11:57:56 +03:00
gkodinov@mysql.com
7552d8d9ba
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B18681
2006-05-26 11:51:30 +03:00
gkodinov@mysql.com
f0f9c740ed
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B14875
2006-05-26 11:51:11 +03:00