malff@lambda.hsd1.co.comcast.net.
36e0b66638
fixed coding style
2007-11-05 16:52:04 -07:00
malff@lambda.hsd1.co.comcast.net.
5aeaeb4fc9
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-05 16:34:10 -07:00
aelkin/elkin@koti.dsl.inet.fi
3f7bf58884
bug#27571 asynchronous setting mysql_query
::error and Query_log_e::error_code
...
refining tests as they appear to be non-deterministic.
2007-11-05 22:10:25 +02:00
mleich@five.local.lan
7d01bfda59
Merge five.local.lan:/work/trees/mysql-5.1-build-src-clean
...
into five.local.lan:/work/merge/mysql-5.1-build
2007-11-05 18:58:06 +01:00
malff@lambda.hsd1.co.comcast.net.
f0f63f8ff9
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-05 10:20:20 -07:00
jperkin@production.mysql.com
56f6caaa13
Merge production.mysql.com:/usersnfs/jperkin/bk/bug-27995/5.0
...
into production.mysql.com:/usersnfs/jperkin/bk/build/5.1
2007-11-05 18:01:45 +01:00
malff@lambda.hsd1.co.comcast.net.
00f1af47e4
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-05 09:50:09 -07:00
jperkin@production.mysql.com
51be103e13
Provide better feedback to the user when unable to find MySQL files
...
usually caused by a bad basedir setting.
2007-11-05 17:48:11 +01:00
aelkin/elkin@koti.dsl.inet.fi
27636d5601
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug28597-log_name_upgrade
2007-11-05 18:13:31 +02:00
istruewing@stella.local
3eaf82a175
Bug#31210 - INSERT DELAYED crashes server when used on
...
partitioned table
Trying INSERT DELAYED on a partitioned table, that has not been
used right before, crashes the server. When a table is used for
select or update, it is kept open for some time. This period I
mean with "right before".
Information about partitioning of a table is stored in form of
a string in the .frm file. Parsing of this string requires a
correctly set up lexical analyzer (lex). The partitioning code
uses a new temporary instance of a lex. But it does still refer
to the previously active lex. The delayd insert thread does not
initialize its lex though...
Added initialization for thd->lex before open table in the delayed
thread and at all other places where it is necessary to call
lex_start() if all tables would be partitioned and need to parse
the .frm file.
2007-11-05 16:25:40 +01:00
aelkin/elkin@koti.dsl.inet.fi
571f8be430
Bug #28597 Replication doesn't start after upgrading to 5.1.18
...
Since bug@20166, which replaced the binlog file name generating to base
on pidfile_name instead of the previous glob_hostname, the binlog file
name suddenly started to be stored solely in the absolute path format,
including a case when --log-bin option meant a relative path.
What's more serious, the path for binlog file can lead unrequestedly
to pid-file directory so that after any proper fix for this bug
there might be similar to the bug report consequences for one who
upgrades from post-fix-bug@20166-pre-fix-bug@28597 to post-fix-bug@28597.
Fixed with preserving`pidfile_name' (intr.by bug@20166) but stripping
off its directory part. This restores the original logics of storing
the names in compatible with --log-bin option format and with the
requirement for --log-bin ralative path to corresond to the data directory.
Side effects for this fix:
effective fixing bug@27070, refining its test;
ensuring no overrun for buff can happen anymore (Bug#31836
insufficient space reserved for the suffix of relay log file name);
bug#31837 --remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql missed
in rpl_temporary.test;
fixes Bug@28603 Invalid log-bin default location;
2007-11-05 17:20:10 +02:00
holyfoot/hf@hfmain.(none)
ca321bd657
Merge mysql.com:/home/hf/work/31758/my50-31758
...
into mysql.com:/home/hf/work/31758/my51-31758
2007-11-05 19:11:38 +04:00
holyfoot/hf@hfmain.(none)
fc6a31f38c
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/31758/my51-31758
2007-11-05 19:10:18 +04:00
holyfoot/hf@hfmain.(none)
9e2a652856
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/31758/my50-31758
2007-11-05 19:07:03 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0cccdaba06
merging
2007-11-05 18:43:13 +04:00
holyfoot/hf@hfmain.(none)
439a50a1f0
Merge mysql.com:/home/hf/work/31758/my50-31758
...
into mysql.com:/home/hf/work/31758/my51-31758
2007-11-05 18:27:17 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
18ab121a3c
merging
2007-11-05 18:23:55 +04:00
holyfoot/hf@hfmain.(none)
9f40b1dae3
Merge mysql.com:/home/hf/work/31758/my41-31758
...
into mysql.com:/home/hf/work/31758/my50-31758
2007-11-05 18:12:42 +04:00
istruewing@stella.local
2481d2c1e3
Bug#32108 - subselect.test produces warnings files
...
Comment sign of -- at line begin in test files lead to warnings
from mysqltest.
Changed -- to #.
2007-11-05 14:44:38 +01:00
istruewing@stella.local
aac68041ef
Bug#32107 - ctype_uca.test produces warnings files
...
Comment sign of -- at line begin in test files lead to warnings
from mysqltest.
Changed -- to #.
2007-11-05 14:37:00 +01:00
mats@kindahl-laptop.dnsalias.net
31787d3d56
BUG#31611 (Security risk with BINLOG statement):
...
Incremental patch to remove redundant, but benign, my_error() call.
2007-11-05 14:24:20 +01:00
mats@kindahl-laptop.dnsalias.net
ce78ae901c
Merge mysqldev@production:/data0/mysqldev/my/mysql-5.1-release
...
into kindahl-laptop.dnsalias.net:/home/bk/b31611-mysql-5.1-target-5.1.22
2007-11-05 13:46:46 +01:00
tomas@whalegate.ndb.mysql.com
532ad32da5
workaround for case insensitive filesystems
2007-11-05 13:33:20 +01:00
kaa@polly.(none)
84159db8f7
Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-11-05 14:50:59 +03:00
kaa@polly.(none)
fdaec60f18
Merge polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-11-05 14:48:39 +03:00
kaa@polly.(none)
02b913ad26
Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-11-05 14:45:55 +03:00
gkodinov/kgeorge@magare.gmz
8f6a0a4c3c
Bug #31974 : Wrong EXPLAIN output
...
The fix for bug 31148 is not correct. It does not
have a relation to the problem described in this bug.
And removing the fix will not make the bug to re-appear.
Fixed the bug #31974 by removing the fix for bug 31148
and adding a test case.
2007-11-05 13:19:56 +02:00
kaa@polly.(none)
6b828c8288
Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215
...
into polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215
2007-11-05 13:32:14 +03:00
kaa@polly.(none)
910003b544
Fixed code that parses the DELIMITER command to correctly calculate
...
the length of the remaining input string.
This is to fix mysqldump test failure in PB introduced by the patch
for bug #26215 .
2007-11-05 13:30:31 +03:00
istruewing@stella.local
241cd5f969
Bug#4692 - DISABLE/ENABLE KEYS waste a space
...
Fixed absurd compiler warnings of a Suse 10.1 system.
2007-11-05 10:57:52 +01:00
istruewing@synthia.local
663a80fc89
Merge synthia.local:/home/mydev/mysql-5.1-ateam
...
into synthia.local:/home/mydev/mysql-5.1-axmrg
2007-11-03 12:58:44 +01:00
mats@kindahl-laptop.dnsalias.net
c0138b94f0
BUG#31611 (Security risk with BINLOG statement):
...
Adding check that the user executing a BINLOG statement has SUPER
privileges and aborting execution of the statement with an error
otherwise.
2007-11-03 01:33:48 +01:00
tomas@whalegate.ndb.mysql.com
3c4e580bb4
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-11-02 23:40:19 +01:00
tomas@whalegate.ndb.mysql.com
e981c427d8
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-11-02 23:33:25 +01:00
tomas@whalegate.ndb.mysql.com
ca0cbdd8ee
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-11-02 23:31:23 +01:00
skozlov/ksm@virtop.localdomain
82a2cd5da3
Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
2007-11-03 00:35:47 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
6c67d11f20
WL#3949. Added an option for support "combinations" of mysqld arguments for a suite
2007-11-03 00:32:17 +03:00
antony@pcg5ppc.xiphis.org
626e12624e
fix for 2.4.6 bug should be properly enclosed to not break other versions.
2007-11-02 14:25:48 -07:00
iggy@alf.(none)
02601fff85
Bug#31217 C1033 compilation error on Windows
...
- This workaround is no longer necessary with cmake 2.4.7.
2007-11-02 15:30:39 -04:00
iggy@alf.(none)
c0e9fe8d3f
Merge alf.(none):/src/bug31319/my50-bug31319
...
into alf.(none):/src/bug31319/my51-bug31319
2007-11-02 15:17:37 -04:00
iggy@alf.(none)
f9518db25f
Bug#31319 CMake build does not check for minimum required version
...
- Add check
2007-11-02 15:16:45 -04:00
istruewing@stella.local
097e658640
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-02 15:48:20 +01:00
istruewing@stella.local
c91b119847
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-02 15:47:40 +01:00
kaa@polly.(none)
ec0de2a106
Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-11-02 17:28:54 +03:00
kaa@polly.(none)
e4403f2eb3
Merge polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-11-02 17:26:28 +03:00
kaa@polly.(none)
fa462599ca
Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-11-02 17:23:12 +03:00
istruewing@stella.local
f193dd22fe
Merge stella.local:/home2/mydev/mysql-4.1-axmrg
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-02 15:10:40 +01:00
istruewing@stella.local
6e7c0f8a65
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-02 15:10:13 +01:00
istruewing@stella.local
377f187066
Merge stella.local:/home2/mydev/mysql-4.1-ateam
...
into stella.local:/home2/mydev/mysql-4.1-axmrg
2007-11-02 14:48:36 +01:00
kaa@polly.(none)
794274ab10
5.1-specific changes for bug #26215 after merging the patch from 5.0:
...
- Added trigger tests back.
- Fixed test cases to match the extended output format of SHOW CREATE ...
- Replaced 'gptr' with 'uchar *'.
2007-11-02 16:40:08 +03:00