msvensson@pilot.blaudden
84d60374e5
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 16:49:10 +02:00
msvensson@pilot.blaudden
a247bd582e
Make it possible to define how many slaves to start by
...
writing --slave-num=n in <testname>-master.opt file
2007-04-18 13:50:54 +02:00
msvensson@pilot.blaudden
dd0d2146c3
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3
Bug#25452 mysql_upgrade access denied
...
- Improve mysql_upgrade and add comments describing it's logic
- Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
was started from
- Don't look for mysql_fix_privilege_tables.sql randomly, compile
in the mysql_fix_privilege_tables.sql file and use that to upgrade
the system tables of MySQL
- Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
- Fix bug#26639, bug#24248 and bug#25405
2007-04-18 13:21:39 +02:00
msvensson@pilot.blaudden
86a364319d
Add option manual-ddd
...
Change syntax for starting manual ddd or gdb to avoid having to
change working dir
2007-04-13 15:06:05 +02:00
msvensson@pilot.blaudden
7df5e05b4d
Add missing option --manual-ddd
...
Change syntax to start manual gdb/ddd to avoid having to
cd to the mysql-test directory before calling the command
2007-04-13 14:40:52 +02:00
msvensson@pilot.blaudden
cd2f78fdd8
Bug#27669 mysqldump: Got error: 2026: SSL connection error when trying to connect
...
- Add testcase for SSL connection from mysqldump to mysqld
2007-04-11 23:42:53 +02:00
msvensson@pilot.blaudden
900e0d685d
Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-11 21:03:29 +02:00
msvensson@pilot.blaudden
e81cb86952
Add test for connect using different ssl ciphers
2007-04-11 21:01:10 +02:00
msvensson@pilot.blaudden
4e17e06a5b
Add replace_result for things that are not tested
2007-04-11 09:06:27 +02:00
msvensson@pilot.blaudden
610ff38ed9
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 17:33:21 +02:00
msvensson@pilot.blaudden
8d0755ba47
Update result(which mysterioulsy got lost)
2007-04-10 17:33:04 +02:00
msvensson@pilot.blaudden
d549e4803a
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 14:59:16 +02:00
msvensson@pilot.blaudden
f194cbe62a
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-04-10 14:58:55 +02:00
msvensson@pilot.blaudden
34a784f3d0
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 14:29:22 +02:00
msvensson@pilot.blaudden
60eb839e77
Merge 192.168.0.4:mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-04-10 13:51:32 +02:00
msvensson@pilot.blaudden
9f11d74cb0
Give the "sync_slave_with_master" something to do
2007-04-10 12:19:00 +02:00
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
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@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@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)
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
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@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
msvensson@shellback.(none)
2df8524391
Add "query_sorted" command to mysqltest
...
Usage:
query_sorted <query>;
2007-04-05 20:12:56 +02: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
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
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
ffba52433c
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 09:18:36 +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
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
c7da27b5b2
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
2007-04-05 11:30:19 +08:00
msvensson@pilot.blaudden
c159836fdc
Bug#27344 Total failure to start the server
...
- length($sockdir) >= 80 !!
2007-04-04 19:19:26 +02:00
msvensson@pilot.blaudden
8cd59587d8
Bug#27344 Total failure to start the server
...
- length($sockdir) >= 80 !!
2007-04-04 19:16:09 +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
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
gkodinov/kgeorge@magare.gmz
b530ae54ee
BUG 27513: fixed left-over sql mode from a test case.
2007-04-04 13:38:19 +03:00
tsmith@quadxeon.mysql.com
ab15c0fb94
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/50
2007-04-04 11:06:48 +02:00
msvensson@pilot.blaudden
bc675fb568
Only check for warnings produced by mysqltest if --check-testcases
2007-04-04 10:59:00 +02:00
gkodinov/kgeorge@magare.gmz
41ac6776f5
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27513-5.0-opt
2007-04-04 11:52:53 +03:00
igor@olga.mysql.com
38cf7dee4c
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-03 22:24:57 -07:00
igor@olga.mysql.com
0e14d4c7ed
Improved coverage for the code added to fix bug 27532.
2007-04-03 19:45:37 -07:00
igor@olga.mysql.com
a87e5ac3d5
Fix after manual merge
2007-04-03 17:09:41 -07:00
igor@olga.mysql.com
6aa599fc31
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-03 16:11:27 -07:00