mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46153 commits 2794 branches 343 tags 1.5 GiB
Commit graph

13897 commits

Author SHA1 Message Date
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
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
msvensson@pilot.blaudden
bc5462fb44 Add extra INSERT to make usre sync_slave_with_master has job to do 2007-04-05 09:10:22 +02:00
mskold/marty@mysql.com/linux.site
3e8cf5958b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-04-05 08:39:12 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
10dffc5a19 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
 2007-04-05 12:26:01 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
fdf57c7ac2 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
 2007-04-05 10:47:40 +08:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
849e637127 fix test for bug#25721 
did not run properly on a fast Windows machine
 2007-04-04 21:35:58 +00:00
tomas@whalegate.ndb.mysql.com
343bfb779d 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-04 23:03:27 +02:00
kostja@vajra.(none)
fe6835c2b9 Fix a failure of this test case on HP-UX. 2007-04-05 00:04:44 +04:00
tsmith@quadxeon.mysql.com
cedde5758d Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
 2007-04-04 21:56:10 +02:00
tsmith@quadxeon.mysql.com
e9fd9a18e0 Bug #27638: slow logging to CSV table inserts bad query_time and lock_time values 
When MySQL logged slow query information to a CSV table, it stored the
query_time and lock_time values with an incorrect formula.

If the time was over 59 seconds, this caused incorrect statistics (either the
slow query was not logged, or the time was far from correct).  This change
fixes the method used to store those TIME values in the slow_log table.
 2007-04-04 21:40:47 +02:00
jani@ua141d10.elisa.omakaista.fi
e40d3631a3 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-04 21:25:39 +03:00
mskold/marty@linux.site
552d1086ec Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-04-04 17:03:31 +02:00
msvensson@pilot.blaudden
ff0ee38bd7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-04 15:43:03 +02:00
msvensson@pilot.blaudden
678a358746 Skip test cases if the script or binary they need can't be found 2007-04-04 15:40:40 +02:00
msvensson@pilot.blaudden
3b1fc84a5e Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-04 15:17:00 +02:00
msvensson@pilot.blaudden
19801cbfdc Add expansion of $variables in "let from query", 
"if with query" and "while with query"
 2007-04-04 15:09:12 +02:00
gluh@eagle.(none)
18a259076d Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-04-04 17:37:36 +05:00
gluh@mysql.com/eagle.(none)
f8fb7a404b Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte 
additional fix(to satisfy Win where CreateFile func does not support the path longer than 260)
 2007-04-04 17:36:58 +05:00
mskold/marty@linux.site
7e33b92279 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-04-04 13:21:49 +02:00
mskold/marty@mysql.com/linux.site
625a2629f0 Bug #26242 UPDATE with subquery and triggers failing with cluster tables 
In certain cases AFTER UPDATE/DELETE triggers on NDB tables that referenced
subject table didn't see the results of operation which caused invocation
of those triggers. In other words AFTER trigger invoked as result of update
(or deletion) of particular row saw version of this row before update (or
deletion).

The problem occured because NDB handler in those cases postponed actual
update/delete operations to be able to perform them later as one batch.

This fix solves the problem by disabling this optimization for particular
operation if subject table has AFTER trigger for this operation defined.
To achieve this we introduce two new flags for handler::extra() method:
HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH.
These are called if there exists AFTER DELETE/UPDATE triggers during a
statement that potentially can generate calls to delete_row()/update_row().
This includes multi_delete/multi_update statements as well as insert statements
that do delete/update as part of an ON DUPLICATE statement.
 2007-04-04 12:50:39 +02:00
gkodinov/kgeorge@magare.gmz
204559cd2c Merge magare.gmz:/home/kgeorge/mysql/work/B27513-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27513-5.0-opt
 2007-04-04 13:38:57 +03:00