Commit graph

26713 commits

Author SHA1 Message Date
hf@deer.(none)
6890eae9e5 Merging 2005-09-26 13:15:01 +05:00
ingo@mysql.com
6c70281789 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-09-26 09:56:18 +02:00
ingo@mysql.com
f8203e8765 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-26 09:18:31 +02:00
stewart@mysql.com
f679cc35fb Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-09-26 12:53:33 +10:00
monty@mysql.com
ea6d5f9ec3 Fixed error found during review of new pushed code 2005-09-25 21:22:23 +03:00
serg@serg.mylan
4b24f83f8f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-25 16:07:13 +02:00
ingo@mysql.com
95fa3340c6 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-25 15:51:28 +02:00
serg@serg.mylan
86ad035270 test case fixed to pass w/o innodb 2005-09-25 15:44:05 +02:00
kent@mysql.com
44305ca26c disabled.def:
Disable unstable test cases
  new file
2005-09-25 11:35:32 +02:00
sergefp@mysql.com
2294c9b57a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug13317
2005-09-25 01:36:26 +04:00
serg@serg.mylan
e9d8f0940b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-24 21:45:30 +02:00
stewart@mysql.com
4225d4cd30 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-09-24 12:25:18 +10:00
kent@mysql.com
4e289272b2 mysqlbinlog.test:
Windows have no 'cat' command, use <
mysql.test:
  Windows can't handle single quotes in --exec line
2005-09-24 04:11:51 +02:00
kent@mysql.com
aa74affb19 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-09-24 02:43:28 +02:00
kent@mysql.com
0cfed79ea5 Makefile.am:
Revert to shell test script for test targets
mysqltest.c:
  Windows pclose() returns error code in low byte
mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++
2005-09-24 02:42:38 +02:00
sergefp@mysql.com
061d660615 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-merge-sept24
2005-09-24 03:33:26 +04:00
monty@mysql.com
6c6a25e9d7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-09-24 02:32:34 +03:00
sergefp@mysql.com
9a05a887de Manually merged 2005-09-24 02:39:52 +04:00
sergefp@mysql.com
d0a97917a2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug13419
2005-09-24 01:55:09 +04:00
jimw@mysql.com
844d1244d7 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-23 14:44:41 -07:00
sergefp@mysql.com
d90b988da7 BUG#12232: Addressing docs team feedback: s/inequal/unequal/ 2005-09-24 01:39:50 +04:00
paul@kite-hub.kitebird.com
d69589c1c8 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-09-23 16:00:48 -05:00
paul@kite-hub.kitebird.com
67a643f931 mysqld.cc:
Fix out-of-order status variable.
2005-09-23 15:59:32 -05:00
jimw@mysql.com
e80673d69d Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-23 13:59:14 -07:00
paul@kite-hub.kitebird.com
b83f29d56d mysqld.cc:
Fix out-of-order status variable.
2005-09-23 14:14:34 -05:00
heikki@hundin.mysql.fi
7dc5e67b59 row0ins.c:
Fix a compilation error: Visual C++ does not seem to allow variable declaration in the middle of a program block
2005-09-23 21:36:07 +03:00
dlenev@mysql.com
19b2cd58e8 Fix for yet another compilation failure on Windows which was introduced during
work on WL#2787 "Add view definer/owner to the view definition (.frm) to check
privileges on used tables and stored routines when using a VIEW."
(aka bug #13402 "Windows VS 2003 Compiler error")
2005-09-23 21:28:47 +04:00
jimw@mysql.com
3cd331c29f Merge mysql.com:/home/jimw/my/mysql-5.0-13361
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-23 10:03:29 -07:00
ingo@mysql.com
b9630b50d2 Merge mysql.com:/home/mydev/mysql-4.1-4100
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-23 17:27:07 +02:00
ingo@mysql.com
23cc6fe896 Bug#9112 - Merge table with composite index producing invalid results with some queries
After merge fix
2005-09-23 17:22:36 +02:00
dlenev@mysql.com
d68f3ea17d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13407
2005-09-23 18:30:08 +04:00
osku@127.(none)
93671fb91e Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql/5.0/clean
2005-09-23 16:46:59 +03:00
osku@127.(none)
d563a01afe Merge 127.(none):/home/osku/mysql/5.0/clean
into  127.(none):/home/osku/mysql/5.0/3443
2005-09-23 16:44:25 +03:00
osku@127.(none)
d61708d1c9 Fix bug #3443, better foreign key error messsages. 2005-09-23 16:22:27 +03:00
dlenev@mysql.com
77ac122350 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13407
2005-09-23 17:10:05 +04:00
dlenev@mysql.com
3f9163b074 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-rmuqf
2005-09-23 17:03:49 +04:00
dlenev@mysql.com
b37c586ffe Fixed race conditions in rpl_multi_update and rpl_multi_delete tests which
caused spurious test failures.
2005-09-23 16:59:19 +04:00
msvensson@neptunus.(none)
22c1bb4e6d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-23 14:38:26 +02:00
msvensson@neptunus.(none)
d55eeed8fd Merge from 4.1 to 5.0 2005-09-23 14:37:22 +02:00
serg@serg.mylan
d4eaa0ecc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-23 14:36:38 +02:00
msvensson@neptunus.(none)
00bcf8cd8e Bug #7037 Test "mysql_protocols" fails on Solaris 8 + 9 /x86 2005-09-23 14:07:31 +02:00
osku@127.(none)
06077eb1eb InnoDB: Minor fixes. 2005-09-23 14:31:31 +03:00
sergefp@mysql.com
40ba88ca07 Fix for BUG#13419: In "ref" optimizer, take into account that item=Item_func_in(x,y) is
not equivalent to "x=y" when item->negated == TRUE.
2005-09-23 13:43:20 +04:00
ingo@mysql.com
bf89c139a4 Merge mysql.com:/home/mydev/mysql-4.0-4000
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-09-23 10:49:08 +02:00
osku@127.(none)
945ea8a98b Merge 127.(none):/home/osku/mysql/5.0/clean
into  127.(none):/home/osku/mysql/5.0/13315
2005-09-23 11:22:05 +03:00
osku@127.(none)
e6b3261556 InnoDB: Fix bug #13315, index columns having a maximum length of 767. 2005-09-23 11:20:34 +03:00
ingo@mysql.com
4025d2965b Bug#9112 - Merge table with composite index producing invalid results with some queries
The problem was an ab-use of last_rkey_length.
Formerly we saved the packed key length (of the search key)
in this element. But in certain cases it got replaced by 
the (packed) result key length.
Now we use a new element of MI_INFO to save the packed key 
length of the search key.
2005-09-23 10:15:11 +02:00
msvensson@neptunus.(none)
7ba13b16bd BUG#7037 MySQL Bugs: #7037: Test "mysql_protocols" fails on Solaris 8 + 9 /x86 2005-09-23 09:47:41 +02:00
msvensson@neptunus.(none)
02c7645cc1 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-23 09:18:56 +02:00
brian@zim.(none)
f5c00b0dbd Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/fix-5.0
2005-09-22 19:46:16 -07:00