Commit graph

30997 commits

Author SHA1 Message Date
evgen@moonbone.local
611f25f932 Merge 2006-02-16 21:11:38 +03:00
paul@snake-hub.snake.net
0ffd92b9c9 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-16 10:27:48 -06:00
pekka@mysql.com
9d2fffb8a5 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-16 17:27:47 +01:00
tomas@poseidon.ndb.mysql.com
b52df67364 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-16 17:27:46 +01:00
tomas@poseidon.ndb.mysql.com
c810fd083a Bug #17459 Cluster row based replication not setup if backup is ongoing
- also accept setting up binlog for tables in stateBackup
2006-02-16 17:25:28 +01:00
jimw@mysql.com
d30dbf6efa Bug #17169: Partitions: out of memory if add partition and unique.
When creating a new partition, a bogus memory allocation problem was
reported.
2006-02-16 08:15:36 -08:00
paul@snake-hub.snake.net
21b0b86275 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-16 10:01:16 -06:00
paul@snake-hub.snake.net
a9cda1edd3 mysqlcheck.c:
Fix out of order options.
2006-02-16 10:00:14 -06:00
jmiller@mysql.com
b1a06e28a8 Test updates 2006-02-16 16:33:46 +01:00
andrey@lmy004.
4e4520b723 fix for bug#17543 Creating Event crash the server
this problem affects only debug builds
2006-02-16 16:11:02 +01:00
pekka@mysql.com
ad86b3e43a ndb - wl#3023 : pass tables per GCI to injector at epoch start 2006-02-16 14:54:30 +01:00
andrey@lmy004.
d8957fbfac Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 14:53:38 +01:00
serg@serg.mylan
1dc2ddc8e6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-16 14:53:37 +01:00
andrey@lmy004.
b73459c102 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 14:53:37 +01:00
jonas@perch.ndb.mysql.com
5a1957ef19 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 14:53:36 +01:00
serg@serg.mylan
6c7dd562fd Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-16 14:53:36 +01:00
andrey@lmy004.
d89fc62e78 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 14:53:36 +01:00
joerg@mysql.com
65dbd03b8a Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/ndb_msg-5.1 2006-02-16 14:53:35 +01:00
aivanov@mysql.com
09847849b9 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148
2006-02-16 16:53:34 +03:00
aivanov@mysql.com
14633e0532 The patch adds PROCESSLIST information schema 2006-02-16 16:45:05 +03:00
jmiller@mysql.com
3cfcecbc4f Updates from review 2006-02-16 14:24:47 +01:00
jonas@perch.ndb.mysql.com
a1ea437e7c Fix for solaris compiler 2006-02-16 13:12:25 +01:00
andrey@lmy004.
3c82af94e7 fix bug in show events which shows
| INTERVAL_VALUE | INTERVAL_FIELD |
| 20             | 20 MINUTE      |
the second one should be without the value
2006-02-16 13:11:16 +01:00
serg@serg.mylan
661371538b missing DBUG_RETURN 2006-02-16 12:31:33 +01:00
joerg@mysql.com
e127d48aa3 Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/ndb_msg-5.1 2006-02-16 12:14:03 +01:00
jonas@perch.ndb.mysql.com
940846ab2b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-clean
2006-02-16 10:41:07 +01:00
ingo@mysql.com
bd37ef8ad5 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 10:31:32 +01:00
msvensson@neptunus.(none)
23c694a596 Merge msvensson@devsrv-b:/space/magnus/my51-bug17386
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:24:50 +01:00
msvensson@neptunus.(none)
5e18443df3 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:23:33 +01:00
msvensson@neptunus.(none)
ee51f00821 Merge neptunus.(none):/home/msvensson/mysql/bug16333/my51-bug16333
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:22:04 +01:00
msvensson@neptunus.(none)
6282d5aa4f Merge neptunus.(none):/home/msvensson/mysql/bug16333/my50-bug16333
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-16 10:20:42 +01:00
msvensson@neptunus.(none)
6a2c609fa4 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:18:12 +01:00
ingo@mysql.com
cc538673ce Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 10:17:30 +01:00
msvensson@neptunus.(none)
c00adf2028 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:09:53 +01:00
msvensson@neptunus.(none)
2c2d404fd7 Merge neptunus.(none):/home/msvensson/mysql/bug16333/my50-bug16333
into  neptunus.(none):/home/msvensson/mysql/bug16333/my51-bug16333
2006-02-16 10:08:02 +01:00
msvensson@neptunus.(none)
7d9eba0441 ndb_load disabled 2006-02-16 10:03:13 +01:00
jonas@perch.ndb.mysql.com
5283af4efe Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 09:12:45 +01:00
jonas@perch.ndb.mysql.com
6c809561fe Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 09:07:17 +01:00
jonas@perch.ndb.mysql.com
0e605ba313 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 09:05:58 +01:00
ingo@mysql.com
65a4e27633 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 08:59:55 +01:00
ingo@mysql.com
233155e64e Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-16 07:01:15 +01:00
stewart@mysql.com
05696de46f Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
2006-02-16 15:51:37 +11:00
stewart@mysql.com
86332f4369 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
2006-02-16 15:47:48 +11:00
andrey@lmy004.
6354f2454d Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 05:23:04 +01:00
andrey@lmy004.
7b2650a256 small post-merge fixes for bug#16406
(pre-push)
2006-02-16 05:21:02 +01:00
jmiller@mysql.com
b84ee0dec8 Test case updates and new test cases added to CRBR 2006-02-16 04:42:16 +01:00
tomas@poseidon.ndb.mysql.com
704562f696 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-16 03:24:55 +01:00
tomas@poseidon.ndb.mysql.com
212d8c05e6 Bug #17415 special character tables are not handled correctly in ndb binlog/schema dist 2006-02-16 03:23:43 +01:00
andrey@lmy004.
95e87f0811 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 02:13:37 +01:00
jimw@mysql.com
6892c2a52a Small post-merge fix to partition test 2006-02-15 17:01:31 -08:00