kent@mysql.com
fab90ce856
mysqld.dsp:
...
Corrected quoting of string "pro-nt"
2005-06-28 04:37:01 +02:00
kent@mysql.com
b3a00568fb
opt_range.cc:
...
Added missing `;' to DBUG_RETURN()
2005-06-28 04:33:06 +02:00
bell@sanja.is.com.ua
b49b5805eb
abort storing query to query cache if warnings appeared (BUG#9414)
2005-06-28 00:52:21 +03:00
jimw@mysql.com
3dd28e98e6
Fix typo in --default-store-engine help. (Bug #11534 )
2005-06-27 10:49:40 -07:00
monty@mysql.com
ec35d6bfca
Fix test after last push
2005-06-27 20:31:02 +03:00
monty@mysql.com
f23603ffeb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2005-06-27 20:31:01 +03:00
monty@mishka.local
7398252d02
Portability fixes
...
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
2005-06-27 20:31:00 +03:00
heikki@hundin.mysql.fi
b3f1c60ed9
Many files:
...
Remove compiler warnings on Windows - Bug #11580
2005-06-27 18:58:32 +03:00
marko@hundin.mysql.fi
99efe90098
InnoDB: After review fixes
2005-06-27 17:25:37 +03:00
marko@hundin.mysql.fi
8064ee217f
InnoDB: Optimize the extension of files. This will greatly speed
...
up CREATE TABLE in innodb_file_per_table=1 mode.
2005-06-27 17:04:57 +03:00
monty@mysql.com
4f5f33473c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2005-06-27 16:49:55 +03:00
monty@mishka.local
6db013ef86
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-06-27 16:47:44 +03:00
monty@mishka.local
83f90e060e
Better bug fix for:
...
#9728 'Decreased functionality in "on duplicate key update
#8147 'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE'
This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part
2005-06-27 16:46:41 +03:00
heikki@hundin.mysql.fi
1fdca62a16
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-06-27 16:14:24 +03:00
msvensson@neptunus.(none)
7d42249bf1
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 15:14:23 +02:00
msvensson@neptunus.(none)
87d681c7bb
Include <sys/wait.h> to get WEXITSTATUS
2005-06-27 15:11:40 +02:00
msvensson@neptunus.(none)
5e703ebbbb
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 15:02:39 +02:00
msvensson@neptunus.(none)
f8472c0e49
Add "#include <stdlib.h>" to define WEXITSTATUS
2005-06-27 15:01:49 +02:00
msvensson@neptunus.(none)
dee0be6eed
Simpler impl.
2005-06-27 14:26:07 +02:00
msvensson@neptunus.(none)
88c96026af
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug10466
2005-06-27 13:12:10 +02:00
msvensson@neptunus.(none)
dcb4789dcb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 12:26:24 +02:00
msvensson@neptunus.(none)
58980a2cbe
Merge problem fixes
2005-06-27 12:25:15 +02:00
konstantin@mysql.com
526af17380
Fix the broken test suite in -debug build.
2005-06-27 14:10:56 +04:00
msvensson@neptunus.(none)
eb41ba25e3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 10:53:08 +02:00
heikki@hundin.mysql.fi
8414902ab6
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-06-27 11:01:03 +03:00
msvensson@neptunus.(none)
13a02cfad2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-27 09:53:11 +02:00
georg@lmy002.wdf.sap.corp
813b077105
Fix for Intel compiler
2005-06-27 09:36:43 +02:00
igor@rurik.mysql.com
7994f27c43
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-25 05:45:50 -07:00
jimw@mysql.com
13773acc1b
If mysql_config is a symlink, resolve it before trying to find the lib and
...
include directories relative to where it is located. (Bug #10986 )
2005-06-24 17:59:19 -07:00
kent@mysql.com
8771dbf4cb
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-25 02:01:34 +02:00
konstantin@mysql.com
9b2d517b79
Free unused JOINs early even if using subqueries.
2005-06-25 00:27:40 +04:00
konstantin@mysql.com
153861fa50
Remove an unrelevant assert.
2005-06-24 23:29:00 +04:00
konstantin@mysql.com
d725562f79
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-join_free2push
2005-06-24 23:14:08 +04:00
konstantin@mysql.com
aa300fa71b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-join_free2push
2005-06-24 22:48:46 +04:00
konstantin@mysql.com
56a37f8e07
- don't call JOIN::join_free(1) twice for every join in JOIN::cleanup().
...
The reason it happened was that both, JOIN::cleanup() and JOIN::join_free(),
went over all nested joins and called cleanup/join_free for them.
For that:
- split recursive and non-recursive parts of JOIN::cleanup() and
JOIN::join_free()
- rename JOIN::cleanup to JOIN::destroy, as it actually destroys its
argument
- move the recursive part of JOIN::cleanup to st_select_lex::cleanup
- move the non-recursive part of JOIN::join_free to the introduced
method JOIN::cleanup().
2005-06-24 22:48:12 +04:00
ingo@mysql.com
ef6d371113
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug8321
2005-06-24 19:47:20 +02:00
ingo@mysql.com
4ab4ee9c7c
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
...
After merge fixes of test result.
2005-06-24 19:47:19 +02:00
kent@mysql.com
c12eede6ec
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-24 19:47:18 +02:00
ingo@mysql.com
1c33fbc4c1
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
...
Bug#10568 - Function 'LAST_DAY(date)' does not return NULL for invalid argument.
Manual merge.
2005-06-24 19:47:18 +02:00
evgen@moonbone.local
182c0ca5b7
Merge
2005-06-24 21:47:17 +04:00
ingo@mysql.com
e81358565b
Bug#8321 - myisampack bug in compression algorithm
...
Added 64-bit extensions, comments, extended statistics
and trace prints.
2005-06-24 19:34:55 +02:00
kent@mysql.com
4a3f9666e6
mysql-test-run.pl:
...
Corrected master server id's
2005-06-24 18:23:59 +02:00
evgen@moonbone.local
3415fae789
Fix bug#11325 Wrong date comparison in views
...
Wrong comparing method were choosen which results in false comparison.
Make Item_bool_func2::fix_length_and_dec() to get type and field from
real_item() to make REF_ITEM pass the check.
2005-06-24 20:16:52 +04:00
ingo@mysql.com
2dcf451b81
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
...
Moved the key statistics update to info().
The table is not locked in open(). This made wrong stats possible.
No test case for the test suite.
This happens only with heavy concurrency.
A test script is added to the bug report.
2005-06-24 17:47:09 +02:00
kent@mysql.com
5b8bac3767
mysql-test-run.sh:
...
Corrected path to CA certificate
2005-06-24 11:56:20 +02:00
ramil@mysql.com
b0e6db14c5
backport for #10568 : Function 'LAST_DAY(date)' does not return NULL for invalid argument.
2005-06-24 14:04:48 +05:00
igor@rurik.mysql.com
6f09af1d95
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-06-24 01:26:35 -07:00
igor@rurik.mysql.com
c3aa161c28
field.cc:
...
Correction after manula merge.
2005-06-24 01:21:18 -07:00
kent@mysql.com
293c225920
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-06-24 10:00:43 +02:00
ramil@mysql.com
66330a9d59
an improvement (bug #7851 : C++ 'new' conflicts with kernel header asm/system.h).
2005-06-24 12:51:11 +05:00