Commit graph

14068 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
7cf3a2a6a5 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 12:13:47 +02:00
gluh@mysql.com/eagle.(none)
6b2cb10a04 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/gluh/MySQL/Bugs/5.0.27069
2007-04-10 15:02:04 +05:00
gluh@mysql.com/eagle.(none)
b80d373b6a Bug#27069 set with identical elements are created(additional fix)
issue an error in strict mode
if enum|set column has duplicates members in 'create table'
2007-04-10 15:01:04 +05:00
bar@mysql.com
220c453194 Merge mysql.com:/home/bar/mysql-5.0-rpl
into  mysql.com:/home/bar/mysql-5.1-new-rpl
2007-04-09 18:06:27 +05:00
bar@mysql.com
11ccfd80e6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mysql.com:/home/bar/mysql-5.0.b22648
2007-04-09 17:59:42 +05:00
bar@mysql.com
4341df8cf6 Bug#22648 LC_TIME_NAMES: Setting GLOBAL has no effect
Problem: setting/displaying @@LC_TIME_NAMES didn't distinguish between
GLOBAL and SESSION variable types - always SESSION variable
was set/shonw.
Fix: set either global or session value.
Also, "mysqld --lc-time-names" was added to set "global default" value.
2007-04-09 17:58:56 +05:00
bar@mysql.com
9faaec9e1b bug#27608 XML output is not well-formed
Problem: output was empty if the result is empty.
Fix: print XML header and footer, even if the result
is empty, to produce well-formed XML output.
2007-04-09 17:53:10 +05:00
holyfoot/hf@hfmain.(none)
26d2908c70 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-09 11:46:58 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
bd461b01f0 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-09 11:45:14 +05:00
holyfoot/hf@hfmain.(none)
33ed2ead2a Merge bk@192.168.21.1:mysql-5.1
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-09 11:07:20 +05:00
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
Kristofer.Pettersson@naruto.
7d3c4c29da Merge naruto.:C:/cpp/bug26121/my51-bug26121
into  naruto.:C:/cpp/mysql-5.1-runtime
2007-04-07 21:03:35 +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)
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
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
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
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
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)
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
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
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
Justin.He/justin.he@dev3-240.dev.cn.tlan
c943e251e9 BUG#19710 Cluster replication to partition table fails on DELETE FROM statement
update rpl_ndb_innodb2ndb and rpl_ndb_myisam2ndb testcase's option and result
2007-04-06 16:33:21 +08: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)
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
Kristofer.Pettersson@naruto.
1902786808 Bug#26121 mysqldump includes LOCK TABLES general_log WRITE
- Giving the directive '--all-databases' to mysqldump caused 
  an attempt to lock and dump log tables which don't support this
  operation.
- With this patch the log tables are excluded from the set of
  databases tables to dump.
2007-04-05 21:53:02 +02: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
msvensson@shellback.(none)
2df8524391 Add "query_sorted" command to mysqltest
Usage:
  query_sorted <query>;
2007-04-05 20:12:56 +02: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
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
kostja@vajra.(none)
701ed297d0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  vajra.(none):/opt/local/work/mysql-5.1-c1
2007-04-05 15:49:46 +04:00
kostja@vajra.(none)
98db230086 A set of changes aiming to make the Event Scheduler more user-friendly
when there are no up-to-date system tables to support it:
 - initialize the scheduler before reporting "Ready for connections".
   This ensures that warnings, if any, are printed before "Ready for
   connections", and this message is not mangled.
 - do not abort the scheduler if there are no system tables
 - check the tables once at start up, remember the status and disable
   the scheduler if the tables are not up to date.
   If one attempts to use the scheduler with bad tables,
   issue an error message.
 - clean up the behaviour of the module under LOCK TABLES and pre-locking
   mode
 - make sure implicit commit of Events DDL works as expected.
 - add more tests


Collateral clean ups in the events code.

This patch fixes Bug#23631 Events: SHOW VARIABLES doesn't work 
when mysql.event is damaged
2007-04-05 15:24:34 +04:00
tomas@whalegate.ndb.mysql.com
77a1d31fbc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 10:24:37 +02:00
tomas@whalegate.ndb.mysql.com
d04730c06d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-05 10:21:41 +02:00
tomas@whalegate.ndb.mysql.com
a858e44a9d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 10:20:56 +02:00
tomas@whalegate.ndb.mysql.com
b07ef92dda 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-05 09:18:52 +02:00
mskold/marty@mysql.com/linux.site
bcac914163 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 09:18:37 +02:00
tomas@whalegate.ndb.mysql.com
a36cb8c56a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-05 09:13:20 +02:00
tomas@whalegate.ndb.mysql.com
292929bc26 Bug#27644 ndb: connecting api node/mysqld may "steal" node_id from running mysqld
- test case workaround to avoid random failures
2007-04-05 09:12:30 +02:00