msvensson@neptunus.(none)
86f0d1bb03
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-24 12:12:25 +01:00
msvensson@neptunus.(none)
354e9c4ea4
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-24 12:04:58 +01:00
msvensson@neptunus.(none)
d4d675a6e2
mysql_fix_priviileg_tables.sql might be in share/ but not in $path_share
...
since that is where the lang files etc are
2006-11-23 21:12:50 +01:00
anozdrin/alik@booka.
ea47e05f3c
Fix for BUG##24415: Instance manager test im_daemon_life_cycle
...
fails randomly.
The problem was that the test case used command line tool (mysql)
without specifying connect_timeout argument. In some cases,
this lead to hanging of the test case.
The fix is to specify --connect_timeout=1 when starting mysql.
Also, the patch contains polishing and various cleanups to simplify
analyzing of the problems further.
The patch affects only test suite, no server codebase has been
touched.
2006-11-23 22:55:36 +03:00
msvensson@neptunus.(none)
91c3698aba
Convert one more opt_source_dist
2006-11-23 20:08:48 +01:00
msvensson@neptunus.(none)
8c2efdf4bd
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-23 18:19:54 +01:00
monty@mysql.com/nosik.monty.fi
501333f694
Added option --mtr-build-thread to mysql-test-run.pl
...
Load shared libraries from zlib (fixed that mysql-test-run.pl didn't work on some Solaris boxes)
Added connect timeout to test to make im_daemon_life_cycle more predictable
2006-11-23 18:39:10 +02:00
msvensson@neptunus.(none)
cdbc79b500
Make source_dist a "local" global variable
...
And it's not an "opt"
2006-11-23 17:30:32 +01:00
msvensson@neptunus.(none)
8f85eaf925
Remove duplicate "$report_features"
2006-11-23 17:26:06 +01:00
monty@mysql.com/nosik.monty.fi
fb9bb62b1e
Added some missing DBUG_RETURN
...
Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()
2006-11-23 16:41:21 +02:00
msvensson@neptunus.(none)
c76adf6021
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-23 11:57:18 +01:00
msvensson@neptunus.(none)
d3b4712bad
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-23 11:54:25 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
8512b7e5bd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
2006-11-22 14:06:37 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
802f7fc366
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
2006-11-22 12:40:15 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b11dba2f0b
Merge mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
...
into mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
2006-11-22 12:10:18 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
711b6a63be
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
2006-11-22 10:52:44 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c6e856de10
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug22029/my41-bug22029
2006-11-22 10:30:46 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b1a423d9f6
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
2006-11-22 10:27:11 +04:00
iggy@rolltop.ignatz42.dyndns.org
e2a6759c4a
Bug#19799 delimiter command not working correctly when sourcing a sql file
...
- Use more appropriate test case.
2006-11-22 01:27:06 -05:00
iggy@rolltop.ignatz42.dyndns.org
26e05951ab
Bug#19799 delimiter command not working correctly when sourcing a sql file
...
- Post Merge Fix.
2006-11-22 00:52:32 -05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0a415e360c
Merge mysql.com:/usr/home/ram/work/bug22029/my41-bug22029
...
into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
2006-11-22 09:19:51 +04:00
iggy@rolltop.ignatz42.dyndns.org
bface97ecc
Bug#19799 delimiter command not working correctly when sourcing a sql file
...
- Client side readline functions unconditionally search for Unix '\n' line
endings. In this case, the delimiter statement was set to '//\r' instead
of the intended '//'. When removing the '\n' check for and remove
preceeding '\r' character as well.
2006-11-21 21:10:02 -05:00
msvensson@neptunus.(none)
d89db5edf8
When runnig from binary dist the .sql files are found in share/ directory
2006-11-21 21:39:37 +01:00
msvensson@neptunus.(none)
66e3c220c6
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-21 15:58:05 +01:00
kroki/tomash@moonlight.intranet
7cde1656e4
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159
2006-11-21 17:37:57 +03:00
kroki/tomash@moonlight.intranet
0a36a6f382
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159
2006-11-21 17:37:25 +03:00
msvensson@neptunus.(none)
7cf226de11
Rename system_mysql_db_fix.test to system_mysql_db_fix30020 as it tests
...
mysql_fix_privilege_tables.s's ability to convert the system tables as of
3.20 to current system table format
Add similar test for 4.1.23 tables - but use "mysql < mysql_fix_privilege_tables.sql"
so it can be run on any platform.
2006-11-21 15:31:11 +01:00
msvensson@neptunus.(none)
a14ae73f55
Get name for .reject and .log files from result file name
2006-11-21 15:16:12 +01:00
kroki/tomash@moonlight.intranet
cb69318963
Fix after manual merge.
2006-11-21 16:57:23 +03:00
kroki/tomash@moonlight.intranet
2bde57836c
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159
2006-11-21 16:53:33 +03:00
kroki/tomash@moonlight.intranet
0d588f8882
BUG#23159: prepared_stmt_count should be status variable
...
Make Prepared_stmt_count a global status variable, accessible via
SHOW STATUS LIKE 'Prepared_stmt_count';. Documentation should be
updated.
2006-11-21 16:49:18 +03:00
gluh@mysql.com/gluh.(none)
ff38409128
Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash
...
disable filling of I_S tables for EXPLAIN
2006-11-21 13:45:01 +04:00
monty@mysql.com/nosik.monty.fi
306b871d52
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-11-20 22:46:52 +02:00
monty@mysql.com/nosik.monty.fi
e825879800
Remove compiler warnings
...
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
kaa@polly.local
346033a5da
Fix for bug #22077 "DROP TEMPORARY TABLE fails with wrong error if read_only is set"
...
Do not issue a 'read-only' error in case of DROP TEMPORARY TABLE on a non-existing temporary table.
Instead produce the correct "Unknown table" error or warning (in cases when the IF EXISTS clause was specified).
To a documentor: the part of the manual describing the 'read_only' system variable should be clarified to state the following:
"When the read_only variable is set to ON, all operations which create/update/drop tables are rejected with the exceptions for:
1. Any operation performed by the replication thread on a slave server
2. Any operation performed by a user that have the SUPER privilege
3. Any operation that creates/updates/drops only temporary tables"
2006-11-20 17:35:23 +03:00
msvensson@neptunus.(none)
8809a5e27e
mysql_client_test not found when running from binary dist
...
Look in bin for myql_client_test executable
2006-11-20 13:02:49 +01:00
dfischer/df@kahlann.erinye.com
bc8c59c1a8
adaption from 4.1
2006-11-17 17:02:28 +01:00
dfischer/df@kahlann.erinye.com
88ac15ddd1
MTR_BUILD_THREAD=auto selects a value for MTR_BUILD_THREAD from a pool (WL#2690)
2006-11-17 16:52:21 +01:00
msvensson@neptunus.(none)
52cafbccb0
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-17 14:47:14 +01:00
msvensson@neptunus.(none)
4eb86ec2cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-17 13:41:18 +01:00
msvensson@neptunus.(none)
f0d89307a8
Remove unused variables/options that does not have any effect
...
Update usage description
2006-11-17 13:36:10 +01:00
msvensson@neptunus.(none)
d98ffb2ccf
Cleanup --extern implementation, remove some unused variables and check arguments
2006-11-17 13:30:42 +01:00
msvensson@neptunus.(none)
3f2c3f04bf
BUG#24354 option "--extern" of mysql-test-run.pl does not work anymore
2006-11-17 13:20:48 +01:00
msvensson@neptunus.(none)
770a4f7c68
BUG#24274 option "--big-test" of mysql-test-run.pl does not work anymore
2006-11-17 13:14:07 +01:00
msvensson@neptunus.(none)
b3a5d6196f
remove junk comment
2006-11-17 13:10:54 +01:00
msvensson@neptunus.(none)
91af3edd03
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-17 12:47:16 +01:00
msvensson@neptunus.(none)
dbdd10752c
Bug#24274 option "--big-test" of mysql-test-run.pl does not work anymore
...
- Set environment variable BIG_TEST when using --big-test
- Skip comment lines when looking for features a test case supports.
2006-11-17 11:01:09 +01:00
msvensson@neptunus.(none)
d032660b5f
Bug#24354 option "--extern" of mysql-test-run.pl does not work anymore
...
- Dont require restart when using extern and there is no record of
master being started(pid is not known)
2006-11-17 10:46:21 +01:00
holyfoot/hf@mysql.com/deer.(none)
dac2d0fcba
merging
2006-11-17 12:02:36 +04:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/mysql-5.0-0mrg
2006-11-17 10:30:16 +04:00