Commit graph

33916 commits

Author SHA1 Message Date
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)
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
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
joerg@trift2.
3406fcea39 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  trift2.:/MySQL/M50/push-5.0
2006-11-28 18:45:10 +01:00
joerg@trift2.
3680ba8706 Merge trift2.:/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-11-28 18:39:17 +01:00
joerg@trift2.
648e86e108 netware/BUILD/nwbootstrap : Editing "mwenv" is now obsolete and even plain wrong - drop it. 2006-11-28 18:36: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
kent@mysql.com/kent-amd64.(none)
de6eb0afb2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-28 18:11:21 +01:00
kent@mysql.com/kent-amd64.(none)
d3f73f27fa Makefile.am:
Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.
2006-11-28 18:08:30 +01:00
kent@mysql.com/kent-amd64.(none)
d9e0763cba Merge mysql.com:/home/kent/bk/mysql-4.1-build
into  mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-28 18:07:50 +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
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
msvensson@neptunus.(none)
cc2821944f Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 14:52:28 +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
ramil/ram@mysql.com/myoffice.izhnet.ru
c06cceb0fc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug21587/my50-bug21587
2006-11-28 16:09:05 +04:00
joerg@trift2.
dd97e53171 Merge trift2.:/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-11-28 13:03:32 +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)
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
kent@mysql.com/kent-amd64.(none)
ae605ec9d8 Merge mysql.com:/home/kent/bk/mysql-4.1-build
into  mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-28 00:42:41 +01:00
monty@mysql.com/nosik.monty.fi
9c3a2a0d8e Increased heap max length to > 4G for 64 bit machines
Initialize key_part->type on open. This caused key_copy() to fail for bit_fields. (key_copy is used in HANDLER and opt_range)
2006-11-28 00:47:21 +02:00
kent@mysql.com/kent-amd64.(none)
029dbbc2b2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/mysql-5.0-merge
2006-11-27 21:45:16 +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)
5fcb7a4ef1 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.0
2006-11-27 21:21:00 +01:00
kent@mysql.com/kent-amd64.(none)
1b61612f86 ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:
Reenabled build outside source tree
2006-11-27 21:15:25 +01:00