Commit graph

5661 commits

Author SHA1 Message Date
serg@serg.mylan
530eecbd99 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-17 14:00:44 +01:00
serg@serg.mylan
2b41b8fa01 post-review fixes. Now ROLLBACK is done in Format_description_log_event 2005-02-17 13:52:16 +01:00
pekka@mysql.com
338f75a49d ndb - fix new decimal type mysql vs. ndb 2005-02-16 21:19:42 +01:00
serg@serg.mylan
5ddb6354a5 after merge fixes 2005-02-16 17:34:02 +01:00
pekka@mysql.com
c32fc95769 ndb - temp: comment out decimal tests t/ndb* 2005-02-16 17:10:17 +01:00
pem@mysql.com
25a9717a03 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-02-16 16:12:52 +01:00
pem@mysql.comhem.se
de2b28c1ad Fixed BUG#8540: Local variable overrides an alias. 2005-02-16 16:06:41 +01:00
pekka@mysql.com
c177f9fc4a Merge 2005-02-16 13:14:21 +01:00
pekka@mysql.com
7c9a155c4a ndb - fix old decimal type mysql vs ndb 2005-02-16 12:45:59 +01:00
msvensson@neptunus.homeip.net
e4ad041abf Fix ndb_autodiscover 2005-02-16 11:02:48 +01:00
gluh@gluh.mysql.r18.ru
638dc7d9e9 Fix for bug#7915: crash,JOIN VIEW, subquery, SELECT .. FROM INFORMATION_SCHEMA.COLUMNS 2005-02-16 13:00:03 +03:00
dlenev@brandersnatch.localdomain
0a96ef4c90 Temporary disabling part of test which fails in --ps-protocol mode. 2005-02-15 22:17:44 +03:00
monty@mysql.com
71e4859389 After merge fixes 2005-02-15 19:25:42 +02:00
monty@mysql.com
38d1a42481 Merge with 4.1 2005-02-15 17:12:13 +02:00
monty@mysql.com
410e51c854 Fixed failing test cases 'row.test' when running with --ps-protocol
Simple optimzations done while reviewing code
2005-02-15 16:45:00 +02:00
serg@serg.mylan
fd828e5b4d manually merged 2005-02-14 21:50:09 +01:00
sergefp@mysql.com
c30f7feba1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8218
2005-02-14 23:49:01 +03:00
sergefp@mysql.com
919f2f2364 Merge mysql.com:/home/psergey/mysql-4.1-bug8218
into mysql.com:/home/psergey/mysql-5.0-bug8218
2005-02-14 23:47:31 +03:00
sergefp@mysql.com
021f9849ef Remove redundant DROP TABLE from test case 2005-02-14 23:45:48 +03:00
matthias@three.local.lan
d6c5089e92 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
2005-02-14 16:34:36 +01:00
gluh@gluh.mysql.r18.ru
29510ce029 Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
Can't repeat information_schema test failure
Fix for lowercase_table3 only
2005-02-14 18:23:10 +03:00
svoj@mysql.com
643b602832 Bug#8351
Fix for crash when using a double quote in boolean fulltext query.
2005-02-14 18:54:12 +04:00
mleich@mysql.com
cb56fcaa94 Removal of a not needed statement 2005-02-14 14:20:43 +01:00
matthias@three.local.lan
e8bf23c16a Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-14 10:23:53 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
4957c4850d Bug#2435
Alter handling for UNION syntax
  Tests for UNION and parentheses
2005-02-13 22:35:52 +00:00
kent@mysql.com
ba3f9acff6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-13 18:22:38 +01:00
sergefp@mysql.com
c0c50efdef Fix for BUG#8218:
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
pointing to the wrong List.
2005-02-12 22:58:54 +03:00
bar@mysql.com
9ba7392306 Bug#8235 Connection collation change & table create with default result in crash 2005-02-12 16:27:22 +04:00
serg@serg.mylan
40da910d4c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 09:38:15 +01:00
serg@serg.mylan
42bb0901a3 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 00:10:07 +01:00
serg@serg.mylan
d355174522 make LOAD INDEX to work 2005-02-12 00:05:13 +01:00
igor@rurik.mysql.com
cdb40830d2 Manual merge 2005-02-11 15:00:29 -08:00
igor@rurik.mysql.com
1bb04b0642 distinct.result:
Adjustment of the result file after the revision of the fix for bug #7520.
2005-02-11 13:44:54 -08:00
igor@rurik.mysql.com
634424ca16 select.result:
After revision of the fix for bug #7520.
table.cc:
  Revised the fix for bug #7520.
  Made it compliant with 5.0 code where the bug does not exist.
2005-02-11 10:39:26 -08:00
matthias@three.local.lan
9c7d94d408 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-11 17:57:35 +01:00
ingo@mysql.com
601a4fdfa2 Merge 2005-02-11 11:59:35 +01:00
igor@rurik.mysql.com
a697e5da15 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 23:48:35 -08:00
igor@rurik.mysql.com
4ef431ad55 select.result:
Adjusted results of the test case for bug #7520 for 4.1.
2005-02-10 23:47:57 -08:00
igor@rurik.mysql.com
06ff30f6c0 Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 22:17:18 -08:00
igor@rurik.mysql.com
8b3d59ad42 select.result, select.test:
Added a test case for bug #7520.
table.cc:
  Fixed bug #7520.
  The bug was caused by a wrong calculation of the field max_key_length for
  a TABLE structure when there was an index on a blob field.
2005-02-10 22:15:38 -08:00
matthias@three.local.lan
54684534fd Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-10 20:28:47 +01:00
mats@mysql.com
6611d3d2f8 Merge mysql.com:/home/bkroot/mysql-5.0
into mysql.com:/home/bk/b7853-mysql-5.0
2005-02-10 19:15:53 +01:00
konstantin@mysql.com
7d735c7207 manual merge 2005-02-10 16:58:02 +03:00
msvensson@neptunus.homeip.net
a172575854 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-10 14:41:52 +01:00
monty@mysql.com
ccb2f3381b Things missing in last changset
After merge fixes
Don't give duplicate warnings for some ::store() functions
2005-02-10 15:41:51 +02:00
msvensson@neptunus.homeip.net
8fb1f824ea Change script to avoiud multiple --debug flags when starting master servers 2005-02-10 14:13:23 +01:00
jimw@mysql.com
845139731b Merge mysql.com:/home/jimw/my/mysql-4.1-zlib
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-09 16:36:24 -08:00
monty@mysql.com
a1a39fab84 Merge with 4.1 2005-02-10 02:27:37 +02:00
matthias@three.local.lan
74ba5b0808 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-09 21:47:54 +01:00
bell@sanja.is.com.ua
70797f571f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-02-09 21:14:06 +02:00