Commit graph

45501 commits

Author SHA1 Message Date
holyfoot/hf@mysql.com/hfmain.(none)
65535824ba Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-09 11:06:28 +05:00
kent@kent-amd64.(none)
a16289d550 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines
2007-04-08 20:48:07 +02:00
kent@mysql.com/kent-amd64.(none)
c282dd3715 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines
2007-04-08 20:46:40 +02:00
evgen@moonbone.local
d8e6b38ec1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
2007-04-07 23:09:09 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
171f8badd7 merging fix 2007-04-08 00:05:34 +05:00
joerg@trift2.
da80df125a Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-04-07 20:58:01 +02:00
joerg@trift2.
22f066e354 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-04-07 20:46:43 +02:00
joerg@trift2.
d77ab7a009 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-04-07 20:30:26 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
7ceefd2b3f after-merging fix 2007-04-07 23:16:03 +05:00
holyfoot/hf@hfmain.(none)
6ffa4b9c84 Merge mysql.com:/home/hf/work/26074/my51-26074
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 16:36:50 +05:00
holyfoot/hf@hfmain.(none)
fa153792ab Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 15:01:24 +05:00
holyfoot/hf@hfmain.(none)
ce426dd622 Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 14:59:53 +05:00
tomas@whalegate.ndb.mysql.com
e782e5d52b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
2007-04-07 09:18:43 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
1bc1eecd42 Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-07 11:37:09 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
2a5bcc3f3e Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-07 11:36:02 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
df913ae06a Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-04-07 11:35:14 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
4a82c460a6 test temporarily disabled 2007-04-07 11:31:49 +05:00
kent/kboortz@production.mysql.com
9d380a2c29 Merge mysql.com:/tmp/mysql-5.0-build
into  mysql.com:/tmp/mysql-5.1-build
2007-04-07 04:22:19 +02:00
kent/kboortz@mysql.com/production.mysql.com
c5fb034464 mysql.spec.sh:
Removed man page for "mysql_create_system_tables"
2007-04-07 04:14:44 +02:00
tomas@whalegate.ndb.mysql.com
254ad34300 disabled test and feature 2007-04-07 00:28:09 +02:00
evgen@moonbone.local
c3d9eeb25c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
2007-04-07 00:56:35 +04:00
evgen@moonbone.local
93c29c10b1 Bug#27586: Wrong autoinc value assigned by LOAD DATA in the
NO_AUTO_VALUE_ON_ZERO mode.

The table->auto_increment_field_not_null variable wasn't reset after
reading a row which may lead to inserting a wrong value to the auto-increment
field to the following row.

The table->auto_increment_field_not_null variable is reset now right after a
row is being written in the read_fixed_length() and the read_sep_field()
functions.
Removed wrong setting of the table->auto_increment_field_not_null variable in
the read_sep_field() function.
2007-04-07 00:13:27 +04:00
acurtis/antony@ltamd64.xiphis.org
c190088d90 Merge xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
2007-04-06 19:15:08 +00:00
tomas@whalegate.ndb.mysql.com
d62346a45f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-06 20:47:40 +02:00
tomas@whalegate.ndb.mysql.com
35223ca35c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-06 20:47:28 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
d0e79056b1 Merge acurtis@bk-internal:/home/bk/mysql-5.0-engines
into  xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
2007-04-06 18:07:02 +00:00
acurtis/antony@ltamd64.xiphis.org
78734f145d Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
2007-04-06 17:18:26 +00:00
kostja@vajra.(none)
1de28a11ea Merge vajra.(none):/opt/local/work/mysql-5.0-runtime
into  vajra.(none):/opt/local/work/mysql-5.1-runtime
2007-04-06 21:18:25 +04:00
anozdrin/alik@ibm.
09cfc052f7 Polishing: note added. 2007-04-06 20:21:30 +04:00
kostja@vajra.(none)
e974ea5ec9 Remove a race between Event Scheduler shutdown and SHOW PROCESSLIST.
This will hopefully fix events.test failure on vmware-win32, 
where scheduling is very primitive.
2007-04-06 19:44:14 +04:00
anozdrin/alik@ibm.
08b8639361 Polishing: add comments. 2007-04-06 18:56:39 +04:00
tomas@whalegate.ndb.mysql.com
fa23f7e021 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-06 13:55:20 +02:00
tomas@whalegate.ndb.mysql.com
41907655a9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-runtime
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-06 13:53:05 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
acb0a7e08a merging fix 2007-04-06 16:06:10 +05:00
kostja@vajra.(none)
14de569dc3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  vajra.(none):/opt/local/work/mysql-5.1-runtime
2007-04-06 14:15:29 +04:00
holyfoot/hf@hfmain.(none)
d08216f1b7 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-06 12:45:07 +05:00
kostja@vajra.(none)
4ab558359a Fix events.test failure on manu pushbuild hosts (5.1-runtime). 2007-04-06 02:57:38 +04:00
kostja@vajra.(none)
b1b0d8d355 A fix for events_trans.test failure on many hosts (5.1-runtime) 2007-04-06 01:53:15 +04:00
kostja@vajra.(none)
3ef7bdd9b9 3d attempt to fix information_schema.test failure on HP-UX.
Apparently it's the only platform in pushbuild where we 
compile without openssl.
2007-04-06 00:38:57 +04:00
jani@ua141d10.elisa.omakaista.fi
fb4e9b006e Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-05 22:35:32 +03:00
jani@ua141d10.elisa.omakaista.fi
386ad0f1f7 Fixes for tests after merge from 5.0 2007-04-05 22:34:33 +03:00
kostja@vajra.(none)
07daf69954 Fix a compile failure on Windows. 2007-04-05 23:22:33 +04:00
kostja@vajra.(none)
9c6e4c8615 Fix a compile error with LINT enabled builds. 2007-04-05 21:46:25 +04:00
kostja@vajra.(none)
7d463c1e85 Remove a dead file. 2007-04-05 21:01:09 +04:00
kostja@vajra.(none)
cef9331d7d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  vajra.(none):/opt/local/work/mysql-5.1-c1
2007-04-05 20:50:28 +04:00
kostja@vajra.(none)
00b85c49da Post-merge and post-review fixes for the patch for
Bug#23631 "Events: SHOW VARIABLES doesn't work when mysql.event 
is damaged:
2007-04-05 20:47:22 +04:00
tsmith@siva.hindu.god
5c95c63193 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-04-05 10:17:32 -06:00
hhunger@hh-nb.hungers
e23d46e440 changed supported sql function to inpuzt files. 2007-04-05 17:54:37 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
aef5543019 bug #26074 Mysql crash creating partition
As we have unified paths inside partition engine, we should look for '/'
as a path separator
2007-04-05 20:26:18 +05:00
hhunger@hh-nb.hungers
df469af549 test of row locking. 2007-04-05 16:04:31 +02:00