df@kahlann.erinye.com
e6a2d18421
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2006-12-01 10:36:42 +01:00
gni/root@ts3-168.ts.cn.tlan
f913c6bef7
Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb-bj
...
into ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb
2006-12-01 11:24:28 +08:00
df@kahlann.erinye.com
31d0b4e985
minor fix to mtr_process.pl
2006-11-30 13:16:12 +01:00
gkodinov@dl145s.mysql.com
99444d7253
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-11-30 12:20:24 +01:00
msvensson@neptunus.(none)
fb2ffbf203
Merge neptunus.(none):/home/msvensson/mysql/bug10608/my41-bug10608
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-30 11:58:23 +01:00
msvensson@neptunus.(none)
a743e17d8c
Add "chmod" command to mysqltest
2006-11-30 10:54:50 +01:00
kostja@bodhi.local
c6c172e40c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-30 01:58:57 +03:00
istruewing@chilla.local
474203d527
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug23139
2006-11-29 23:05:04 +01:00
msvensson@neptunus.(none)
b23cb23349
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-29 22:50:10 +01:00
msvensson@neptunus.(none)
5f4acf145b
After 5.1.6 just turn on logging, it will be sent to tables by default
2006-11-29 22:49:02 +01:00
kent@mysql.com/kent-amd64.(none)
3643b3689f
Makefile.am:
...
Remove soft links before creating source TAR, to avoid file copies (bug#11865)
2006-11-29 20:22:58 +01:00
gkodinov@dl145s.mysql.com
ac9175a7ef
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt
2006-11-29 15:19:13 +01:00
gkodinov@dl145s.mysql.com
4b8039bf6a
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt
2006-11-29 11:16:50 +01:00
df@kahlann.erinye.com
343e779571
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2006-11-29 10:35:15 +01:00
df@kahlann.erinye.com
1c46f7d841
minor fix
2006-11-29 10:21:59 +01:00
holyfoot/hf@mysql.com/deer.(none)
0b614d0025
fixed compilation failure on hpux
...
the problem is that client tools are compiled with UNDEF_THREADS_HACK
flag, and my thread-related additions to the mysqltest.c can't be compiled.
Easy solution is to disable these in not-embedded case completely.
2006-11-29 09:23:54 +04:00
kostja@bodhi.local
bf3fbb44ae
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-29 02:39:17 +03:00
iggy@rolltop.ignatz42.dyndns.org
761a88ee0d
Bug#20836 Selecting into variables results in wrong results being returned
...
This error is displayed anytime the SELECT statement needs a temp table to
return correct results because the object (select_dumpvar) that represents
variables named in the INTO clause stored the results before the temp
table was considered. The problem was fixed by creating the necessary
Item_func_set_user_var objects once the correct data is ready.
2006-11-28 17:21:39 -05:00
msvensson@neptunus.(none)
7eb487ab26
Move the check that $opt_vardir could be created and was writable to the function
...
where we know how to creat the vardir
Remove unused variable
2006-11-28 23:06:06 +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)
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)
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
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)
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)
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
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
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
kent@mysql.com/kent-amd64.(none)
08e0e06eab
Makefile.am:
...
If using \$(srcdir)/mysql.info in action, use same in rule.
2006-11-28 18:04:10 +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
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)
acf75687fb
Some more checks to avoid removing unwanted directories.
2006-11-28 15:51:52 +01:00
istruewing@chilla.local
671575211b
Bug#23139 - myisamchk and mysqld crash when trying to access table
...
A corrupted compressed table could crash the server and
myisamchk.
The data file of an uncompressed table contains just the records.
There is no header in the data file.
However the data file of a compressed table has a header.
The header describes how the table was compressed. This
information is necessary to extract the records from the
compressed data file.
Part of the compressed data file header are the [de]code tables.
They are numeric representations of the Huffman trees used for
coding and decoding. A Huffman tree is a binary tree. Every
node has two childs. A child can be a leaf or a branch. Leaves
contain the decoded value. Branches point to another tree node.
Since the [de]code table is represented as an array of childs,
the branches need to point at a child within the same array.
The corruption of the compressed data file from the bug report
was a couple of branches that pointed outside their array.
This condition had not been correctly checked.
I added some checks for the pointers in the decode tables.
This type of corruption will no longer crash the server or
myisamchk.
No test case. A corrupted compressed table is required.
2006-11-28 15:46:01 +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
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)
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)
69bd24237a
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 12:40:05 +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)
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
kent@mysql.com/kent-amd64.(none)
12c3e410d4
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kent/bk/mysql-4.1-merge
2006-11-27 21:38:53 +01:00
kent@mysql.com/kent-amd64.(none)
b7e107bf2d
Makefile.am:
...
BSD compatibility
2006-11-27 19:04:57 +01:00
kent@mysql.com/kent-amd64.(none)
6c85ba399d
gen_rec.awk:
...
Fix undefined behaviour.
Many files:
Reenabled build outside ource tree
2006-11-27 18:29:50 +01:00
df@kahlann.erinye.com
34cedd8d77
fixes for mtr_unique.pl
2006-11-24 15:36:04 +01:00
msvensson@neptunus.(none)
fb55bd7a03
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-24 13:39:41 +01:00
msvensson@neptunus.(none)
7d8c8af5a2
Fix merge conflicts
2006-11-24 13:39:09 +01:00