mskold/marty@linux.site
8945183fc3
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-06-14 16:21:52 +02:00
mskold/marty@mysql.com/linux.site
c41a4472c7
Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb, post review fix
2007-06-14 16:01:51 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ad88a849c8
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb
2007-06-14 20:45:12 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
51fe11b494
Bug#27640, backup id not displayed in the output of "ndb_mgm start backup wait completed"
2007-06-14 19:40:44 +08:00
tomas@whalegate.ndb.mysql.com
52269dc2dc
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-30 17:27:29 +02:00
tomas@whalegate.ndb.mysql.com
0d4bf93e24
Bug #28443
...
- correction of merge error
2007-05-30 17:25:22 +02:00
tomas@whalegate.ndb.mysql.com
a325e1db0a
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-30 12:32:36 +02:00
tomas@whalegate.ndb.mysql.com
720f56fb0b
Bug #28770 file already opened error when corrupt schema file
...
- make sure we close the first file, before opening the next
2007-05-30 12:29:19 +02:00
tomas@whalegate.ndb.mysql.com
5783f5ab92
Bug #28749 MaxNoOfOpenFiles offset by 1
2007-05-30 09:00:50 +02:00
tomas@whalegate.ndb.mysql.com
05985b8956
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-28 16:31:58 +02:00
tomas@whalegate.ndb.mysql.com
643cc087b1
print user and system time at watchdog check
2007-05-28 16:31:31 +02:00
tomas@whalegate.ndb.mysql.com
f90a773cca
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-28 16:18:38 +02:00
tomas@whalegate.ndb.mysql.com
bc73912997
make memeber public
2007-05-28 16:18:04 +02:00
tomas@whalegate.ndb.mysql.com
4d47916144
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-28 16:03:07 +02:00
tomas@whalegate.ndb.mysql.com
32c1b70e2b
bug#28717, make sure only master updates activeStatus
...
so that othernodes dont get confused after having recevied status from master
and then tries to update it self
2007-05-28 15:59:02 +02:00
tomas@whalegate.ndb.mysql.com
222940c848
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-28 15:56:10 +02:00
mskold/marty@mysql.com/linux.site
43f80e9875
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-05-28 15:23:28 +02:00
tomas@whalegate.ndb.mysql.com
186d1534b8
Bug #28719 : multi pk update ignore corrupts data
...
- check multi update as well as update
- this bug is not present in 5.0, but execution patch is wrong, so there are probably other bugs
2007-05-28 13:23:11 +02:00
tomas@whalegate.ndb.mysql.com
b46465f3e7
Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire
...
- correction, backport to 5.0
2007-05-28 12:56:48 +02:00
tomas@whalegate.ndb.mysql.com
259d7deb66
Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire
...
- correction, use recomputed _actual_ redobuffer
2007-05-24 21:02:01 +02:00
tomas@whalegate.ndb.mysql.com
95ae6e684e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-24 20:59:46 +02:00
svoj@june.mysql.com
43b2dc188f
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-05-23 12:40:12 +05:00
svoj@mysql.com/june.mysql.com
122167bb4b
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-05-23 12:39:33 +05:00
svoj@mysql.com/june.mysql.com
a4ddc22621
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2007-05-23 12:38:34 +05:00
tomas@whalegate.ndb.mysql.com
599d07713c
remove some not used code
2007-05-23 07:53:16 +02:00
tomas@whalegate.ndb.mysql.com
b789452743
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-22 23:21:55 +02:00
tomas@whalegate.ndb.mysql.com
481b314e9a
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-22 23:20:40 +02:00
tomas@whalegate.ndb.mysql.com
7b2c430f58
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2007-05-22 23:19:45 +02:00
tsmith@quadxeon.mysql.com
b3a84ddd89
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-05-21 20:55:10 +02:00
tsmith@quadxeon.mysql.com
99488b31b9
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-05-21 20:50:08 +02:00
tsmith@quadxeon.mysql.com
2c3bebc570
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
2007-05-21 20:49:24 +02:00
tomas@whalegate.ndb.mysql.com
709cfbc1f8
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-21 08:50:21 +02:00
tomas@whalegate.ndb.mysql.com
11feedf073
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-21 08:49:49 +02:00
tomas@whalegate.ndb.mysql.com
9f1cba8ec0
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2007-05-21 08:49:15 +02:00
msvensson@pilot.blaudden
a3bd588435
Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-19 18:22:08 +02:00
msvensson@pilot.blaudden
bc69d072f3
Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE
...
- The SQL commands used by mysql_upgrade are written to be run
with sql_mode set to '' - thus the scripts should change sql_mode
for the session to make sure the SQL is legal.
2007-05-19 18:15:08 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
d5685d4cc4
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-05-18 22:09:15 +05:00
serg@sergbook.mysql.com
c7a4547361
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2007-05-18 18:22:38 +02:00
serg@sergbook.mysql.com
11e5fa8f71
added cleanup to some tests
2007-05-18 17:48:44 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
093b0deb06
Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-05-18 20:02:55 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
8b21517de4
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-05-18 20:02:27 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
38c8951d11
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-05-18 20:01:49 +05:00
msvensson@pilot.blaudden
01ae08078e
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-18 12:58:28 +02:00
msvensson@pilot.blaudden
7bc79da2c8
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-05-18 12:58:11 +02:00
msvensson@pilot.blaudden
c3f407a07a
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-18 12:56:52 +02:00
msvensson@pilot.blaudden
e05aa94353
WL#2247 mysqltest: add option for sorting results
...
- Final touchups
2007-05-18 12:50:23 +02:00
jonas@perch.ndb.mysql.com
990c584e71
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2007-05-18 11:43:43 +02:00
jonas@perch.ndb.mysql.com
c50adc2639
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-05-18 11:40:07 +02:00
evgen@moonbone.local
835189cb85
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/28261-bug-5.0-opt-mysql
2007-05-18 13:39:34 +04:00
jonas@perch.ndb.mysql.com
aa2d7a3f3b
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2007-05-18 11:35:24 +02:00