Commit graph

17352 commits

Author SHA1 Message Date
dean@mysql.com
2baf0a158c Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dellis/bkl/bug-4.1
2005-02-16 19:37:53 -06:00
acurtis@pcgem.rdg.cyberkinetica.com
3261bf189a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1
2005-02-16 16:33:57 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b119963f13 Merge 2005-02-16 16:29:56 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
aecc58b3d8 Bug#4445
Make a more informative platform info for Windows
2005-02-16 16:05:18 +00:00
pekka@mysql.com
0d03304294 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2
2005-02-16 12:48:38 +01:00
pekka@mysql.com
7c9a155c4a ndb - fix old decimal type mysql vs ndb 2005-02-16 12:45:59 +01:00
dean@mysql.com
e7f410a14a Merge 2005-02-16 04:04:34 -06:00
dean@mysql.com
87718094aa fulltext.test, fulltext.result:
Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().
2005-02-16 03:13:29 -06:00
guilhem@mysql.com
8e93873d5b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-16 10:02:54 +01:00
guilhem@mysql.com
bbcc1464d5 rpl_multi_query.test: disable ps-protocol as PS don't support multi-queries 2005-02-16 10:01:05 +01:00
igor@rurik.mysql.com
3100f891d2 Manual merge 2005-02-15 21:03:17 -08:00
igor@rurik.mysql.com
d9f66a261b Merge rurik.mysql.com:/home/igor/mysql-4.0
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2005-02-15 18:48:04 -08:00
igor@rurik.mysql.com
d4779d3534 delete.result, delete.test:
Added a test case for bug #8392.
sql_delete.cc:
  Fixed bug #8392.
  The bug caused a crash for a delete statement with ORDER BY
  that explicitly referred to the modified table.
2005-02-15 18:45:42 -08:00
dean@mysql.com
ace1d892f0 Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
into mysql.com:/home/dellis/bkl/bug-4.1
2005-02-15 17:30:40 -06:00
dean@mysql.com
c962d060ac ft_nlq_search.c:
Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)
2005-02-15 17:27:23 -06:00
joerg@mysql.com
109560c5bf Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-02-15 21:03:59 +01:00
marko@hundin.mysql.fi
df0aee432a Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-02-15 16:12:51 +02:00
guilhem@mysql.com
4f41de1cc5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-15 15:12:50 +01:00
joerg@mysql.com
d7f64e01c8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-02-15 15:07:56 +01:00
joerg@mysql.com
e6b815a92e 1) Tag the 4.1.10 released version: bk tag -r 1.2159.8.1 "mysql-4.1.10"
2) Raise the version number to 4.1.11.
2005-02-15 14:13:18 +01:00
guilhem@mysql.com
a8380942bf Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-15 14:12:26 +01:00
monty@mysql.com
44ceb84cdc Merge with 4.0 2005-02-15 14:49:52 +02:00
marko@hundin.mysql.fi
c4ff270284 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-02-15 14:42:14 +02:00
monty@mysql.com
788a2658a3 Better bug fix for #5569: "Incorrect "Access Denied" error with SAME login DIFFERENT host"
This fixes also the reverse lookup bug introduced by the previous patch
2005-02-15 14:42:13 +02:00
ramil@mysql.com
9a042c81e7 A fix. "(int) var" type cast doesn't work correctly for uint32 var
on some 64-bit platforms (e.g. IRIX, non-debug build).
2005-02-15 15:01:20 +04:00
marko@hundin.mysql.fi
a1a78bbc4a InnoDB: Create temporary files in the MySQL tmpdir instead of $TMPDIR.
(Bug #5822)
2005-02-15 11:16:17 +02:00
konstantin@mysql.com
f7512e756f Fix signatures of placement operator delete in places where placement
delete is declared. As we don't use exceptions placement delete is never 
called and the fix only affects numerous warnings when
compiling with MS Visual C++.
For more info see http://www.gotw.ca/gotw/010.htm.
2005-02-15 03:55:44 +03:00
guilhem@mysql.com
55fb16a7a6 1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores"
and fixing it another way (per Monty; a simpler solution which does not increase the number
of binlog events is to always execute DROP TEMPORARY TABLE IF EXISTS on slave). A new test rpl_drop_temp.
2) fixing BUG#8436 "Multiple "stacked" SQL statements cause replication to stop" by setting
thd->query_length to the length of the query being executed, not counting the next queries
if this is a multi-query. Should also improve display of SHOW PROCESSLIST. A new test rpl_multi_query.
2005-02-14 23:47:17 +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
021f9849ef Remove redundant DROP TABLE from test case 2005-02-14 23:45:48 +03:00
svoj@mysql.com
ac7dd8265a Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/svoj/devel/mysql/mysql-4.1
2005-02-14 23:30:03 +04:00
tomas@poseidon.ndb.mysql.com
957312eeb5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-14 16:19:57 +01: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
serg@serg.mylan
10c53ae1e5 remove passwordless remote accounts from windows distro 2005-02-14 11:14:04 +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
heikki@hundin.mysql.fi
961d8b0ebf Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-02-13 21:05:18 +02:00
heikki@hundin.mysql.fi
548f7dbada row0mysql.c:
Backport the column prefix memory corruption fix from 5.0
2005-02-13 21:00:07 +02:00
bell@sanja.is.com.ua
539cbc580a Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2005-02-13 11:18:55 +02:00
hf@deer.(none)
21f1b24c29 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-02-13 02:31:33 +04: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
guilhem@mysql.com
40a2e968f9 new static archive_inited variable, so that archive_db_end() will do something only if archive_db_init() was run before
(protection against destroying uninited mutex in the case where mysqld fails early at startup (before archive_db_init() was called)
and then calls archive_db_end() to clean up).
2005-02-12 19:17:33 +01:00
hf@deer.(none)
1393c8a808 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-02-12 20:12:06 +04:00
hf@deer.(none)
56ea00afbd Fix for bug #8477 (Embedded query_cache test crashes) 2005-02-12 20:09:40 +04: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
73e44adb59 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-11 14:48:12 -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