msvensson@neptunus.(none)
e5cf7f9f19
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-11-28 22:19:07 +01:00
msvensson@neptunus.(none)
bb0d7ed44b
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 22:17:26 +01:00
msvensson@neptunus.(none)
9235e363a3
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 22:16:52 +01:00
msvensson@neptunus.(none)
05eb532514
Bug#24335 mysql-test-run.pl fails with ActiveState Perl on Windows
...
- Avoid use of mtr_run when executing "mysqld --verbose --help" to find
version and supported features
2006-11-28 22:16:31 +01:00
msvensson@neptunus.(none)
0c48000e6c
Fix missing parameter declaration
2006-11-28 21:57:42 +01:00
msvensson@neptunus.(none)
627a0bf0b4
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 21:20:56 +01:00
msvensson@neptunus.(none)
cc747a02b3
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 21:11:05 +01:00
cmiller@zippy.cornsilk.net
f983166c01
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-28 15:08:16 -05:00
msvensson@neptunus.(none)
04d5a42bbf
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 20:59:57 +01:00
msvensson@neptunus.(none)
b87c49f920
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-11-28 20:52:06 +01:00
msvensson@neptunus.(none)
e61b7b9f64
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 20:51:09 +01:00
msvensson@neptunus.(none)
80d6de7e56
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 20:00:54 +01:00
msvensson@neptunus.(none)
fa8af12651
Look for client binaries also in bin/ directory
2006-11-28 20:00:27 +01:00
msvensson@neptunus.(none)
d74ffcd317
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-11-28 19:55:29 +01:00
msvensson@neptunus.(none)
7c9d0abb19
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 19:54:52 +01:00
msvensson@neptunus.(none)
2346ee93ed
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 19:54:37 +01:00
msvensson@neptunus.(none)
961ae4ab2f
Create new function "run_testcase_mark_logs' and use it to mark start of testcase
...
in all cuurently known log files
2006-11-28 19:54:16 +01:00
df@kahlann.erinye.com
998b05f245
Merge kahlann.erinye.com:/home/df/mysql/build/51
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-merge
2006-11-28 19:53:43 +01:00
msvensson@neptunus.(none)
0aa9ac852f
Tell mysqld where to put the log file
2006-11-28 19:12:59 +01:00
msvensson@neptunus.(none)
75de30a31f
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-11-28 19:12:05 +01:00
msvensson@neptunus.(none)
6de56b75b2
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 19:11:02 +01:00
msvensson@neptunus.(none)
a92c7700bb
Only force mysqld to use log file up until 5.1.6
...
After that it will by default use log tables. That setting can be overruled
by adding a -master.opt file like mysql_client_test has.
2006-11-28 19:10:39 +01:00
cmiller@zippy.cornsilk.net
45ea756c5f
Revert charset breakage.
2006-11-28 13:08:41 -05:00
kent@kent-amd64.(none)
2264dc7da0
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-28 18:31:53 +01:00
andrey@example.com
100dd45ec4
Fix for bug#24395:
...
ALTER TABLE DISABLE KEYS doesn't work when modifying the table
ENABLE|DISABLE KEYS combined with another ALTER TABLE option, different
than RENAME TO did nothing. Also, if the table had disabled keys
and was ALTER-ed then the end table was with enabled keys.
Fixed by checking whether the table had disabled keys and enabling them
in the copied table.
2006-11-28 18:27:32 +01:00
thek@kpdesk.mysql.com
81420d5e38
Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043
...
into kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043
2006-11-28 17:34:03 +01:00
gkodinov@dl145s.mysql.com
32c9e11df9
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-11-28 17:14:16 +01:00
gkodinov/kgeorge@rakia.gmz
a2af397180
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B24156-5.0-opt
2006-11-28 18:09:15 +02:00
gkodinov/kgeorge@macbook.gmz
a6574ac693
Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar
...
statements
Currently the optimizer evaluates loose index scan only for top-level SELECT
statements
Extend loose index scan applicability by :
- Test the applicability of loose scan for each sub-select, instead of the
whole query. This change enables loose index scan for sub-queries.
- allow non-select statements with SELECT parts (like, e.g.
CREATE TABLE .. SELECT ...) to use loose index scan.
2006-11-28 18:06:47 +02:00
msvensson@neptunus.(none)
a4571e29d5
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 16:25:41 +01:00
msvensson@neptunus.(none)
ac2ef7dd5a
Remove the check for writable var dir, it has to be done later on
2006-11-28 16:24:31 +01:00
msvensson@neptunus.(none)
b73f090aa6
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 16:23:13 +01:00
msvensson@neptunus.(none)
e5ff9ebcd8
Add warnings and more error checks in the creation of vardirs
2006-11-28 16:22:59 +01:00
thek@kpdesk.mysql.com
294cb8432f
Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE EXISTS"
...
- CREATE PROCEDURE stores database name based on query context instead
of 'current database' as set by 'USE' according to manual.
The bug reporter interpret the filtering statements as bug for
DROP PROCEDURE based on this behavior.
- Removed the code which changes db context.
- Added code to check that a valid db was supplied.
2006-11-28 16:03:53 +01:00
msvensson@neptunus.(none)
ed4b672fc7
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 15:54:23 +01:00
msvensson@neptunus.(none)
0e58c1ab46
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 15:52:18 +01:00
msvensson@neptunus.(none)
acf75687fb
Some more checks to avoid removing unwanted directories.
2006-11-28 15:51:52 +01:00
msvensson@neptunus.(none)
bccf144260
No need to have a "created_by_mem" file, just read the link and
...
if that is same as opt_mem it can be removed
2006-11-28 15:39:23 +01:00
msvensson@neptunus.(none)
fc1f9bfede
Rename function datadir_setup to datadir_list_setup to avoid mixup
...
with the function where vardir's are created
2006-11-28 15:15:01 +01:00
gkodinov/kgeorge@rakia.gmz
fb41ec6f22
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B11927-5.0-opt
2006-11-28 15:47:53 +02:00
gkodinov/kgeorge@macbook.gmz
42cd956752
BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
...
When implicitly converting string fields to numbers the
string-to-number conversion error was not sent to the client.
Added code to send the conversion error as warning.
We also need to prevent generation of warnings from the places
where val_xxx() methods are called for the sole purpose of updating
the Item::null_value flag.
To achieve that a special function is added (and called) :
update_null_value(). This function will set the no_errors flag and
will call val_xxx(). The warning generation in Field_string::val_xxx()
will use the flag when generating the conversion warnings.
2006-11-28 15:44:11 +02:00
msvensson@neptunus.(none)
9fb79e9189
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 13:57:42 +01:00
msvensson@neptunus.(none)
7239e6133a
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 13:57:38 +01:00
msvensson@neptunus.(none)
896adf77ae
Bug#24354 option "--extern" of mysql-test-run.pl does not work anymore
...
- Better control of when to create/remove vardir
2006-11-28 13:57:07 +01:00
msvensson@neptunus.(none)
90d654646b
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 12:39:22 +01:00
msvensson@neptunus.(none)
afe91a26c6
Fix problem with mysqladmin logging to var/log before var has been created
...
And if var/ has been created, it will be recreated later so the logs
from "mtr_kill_leftovers" will be lost anyway
2006-11-28 12:36:26 +01:00
msvensson@neptunus.(none)
d1ed2e21b8
Backport of patch for bug#24471
2006-11-28 12:33:36 +01:00
msvensson@neptunus.(none)
8a0761201a
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 11:50:48 +01:00
msvensson@neptunus.(none)
26be89ed47
Fix problem with mysqladmin logging to var/log before var has been created
...
And if var/ has been created, it will be recreated later so the logs will
be lost
2006-11-28 11:43:56 +01:00
msvensson@neptunus.(none)
ee4a5b865f
Backport of patch for bug#24471
...
mysql-test-run.pl:
Removed "use diagnostics", reduces Perl speed significantly. Can be
enabled with "perl -Mdiagnostics mysql-test-run.pl".
mtr_report.pl:
Don't try output "skipped" comment if there is none (bug#24471)
2006-11-28 10:31:07 +01:00