Commit graph

17367 commits

Author SHA1 Message Date
unknown
41c0945096 item.h:
Revised the fix for bug #7098.
  Corrected the method Item_string::new_item.
sql_select.cc:
  Revised the fix for bug #7098.
  Aborted the previous modifications.


sql/sql_select.cc:
  Revised the fix for bug #7098.
  Aborted the previous modifications.
sql/item.h:
  Revised the fix for bug #7098.
  Corrected the method Item_string::new_item.
2005-02-16 22:51:32 -08:00
unknown
d2a69d8f7d Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-16 21:20:39 -08:00
unknown
7f905da3d8 select.result, select.test:
Added a test case for bug #7098.
sql_select.cc:
  Fixed bug #7098.
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.


sql/sql_select.cc:
  Fixed bug #7098.
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.
mysql-test/t/select.test:
  Added a test case for bug #7098.
mysql-test/r/select.result:
  Added a test case for bug #7098.
2005-02-16 21:17:20 -08:00
unknown
000255ee9d init_db.sql:
Make SQL more readable, substitute hostname at runtime
mysql-test-run.pl:
  Run init scripts with /bin/sh, ignore return code


mysql-test/mysql-test-run.pl:
  Run init scripts with /bin/sh, ignore return code
mysql-test/lib/init_db.sql:
  Make SQL more readable, substitute hostname at runtime
2005-02-17 05:22:14 +01:00
unknown
d475cece23 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-17 03:34:30 +01:00
unknown
3f80899679 Windows compatibility changes of the 'rpl_delete_all',
'ps_1general' and 'fulltext_cache' test cases.


mysql-test/r/fulltext_cache.result:
  To pass on Windows, round to less digits
mysql-test/t/fulltext_cache.test:
  To pass on Windows, round to less digits
mysql-test/t/ps_1general.test:
  To pass on Windows, change \\ to / in result
mysql-test/t/rpl_delete_all.test:
  To pass on Windows, change \\ to / in result
mysql-test/mysql-test-run.pl:
  Pass mysqld --console to catch output on Windows
mysql-test/lib/mtr_process.pl:
  Check error from exec() to avoid becoming a fork() bomb
2005-02-17 02:59:39 +01:00
unknown
89f031b3e9 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
unknown
bc22f79f12 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-17 02:11:03 +01:00
unknown
96f9c9d9d3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1


sql/ha_innodb.cc:
  Auto merged
2005-02-16 16:33:57 +00:00
unknown
dd13aeb7f3 Merge
sql/ha_innodb.cc:
  Auto merged
include/config-win.h:
  SCCS merged
2005-02-16 16:29:56 +00:00
unknown
eab44eaaca Bug#4445
Make a more informative platform info for Windows
2005-02-16 16:05:18 +00:00
unknown
c3dec835b5 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
unknown
dbff1150c5 ndb - fix old decimal type mysql vs ndb
mysql-test/r/ndb_index_ordered.result:
  fix old decimal type mysql vs ndb (re-commit 3)
mysql-test/t/ndb_index_ordered.test:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/ndbapi/NdbDictionary.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/util/NdbSqlUtil.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/common/util/NdbSqlUtil.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionary.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/test/include/NdbSchemaOp.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/tools/restore/consumer.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
sql/ha_ndbcluster.cc:
  fix old decimal type mysql vs ndb (re-commit 3)
2005-02-16 12:45:59 +01:00
unknown
39f5fdeb35 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-16 12:10:13 +01:00
unknown
d8b0113653 Merge
mysql-test/r/fulltext.result:
  SCCS merged
mysql-test/t/fulltext.test:
  SCCS merged
2005-02-16 04:04:34 -06:00
unknown
cb17889f47 fulltext.test, fulltext.result:
Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().


mysql-test/r/fulltext.result:
  Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().
mysql-test/t/fulltext.test:
  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
unknown
0d4ef3a3e0 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
unknown
9ffac369d5 rpl_multi_query.test: disable ps-protocol as PS don't support multi-queries
mysql-test/t/rpl_multi_query.test:
  disable ps-protocol as PS don't support multi-queries
2005-02-16 10:01:05 +01:00
unknown
968e06a804 Manual merge
mysql-test/t/delete.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged
2005-02-15 21:03:17 -08:00
unknown
d6157becb3 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
unknown
f1a97c0c49 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.


sql/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.
mysql-test/t/delete.test:
  Added a test case for bug #8392.
mysql-test/r/delete.result:
  Added a test case for bug #8392.
2005-02-15 18:45:42 -08:00
unknown
1218a7c20c Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
into mysql.com:/home/dellis/bkl/bug-4.1


BitKeeper/etc/logging_ok:
  auto-union
myisam/ft_nlq_search.c:
  Auto merged
2005-02-15 17:30:40 -06:00
unknown
3be01953d1 ft_nlq_search.c:
Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)


myisam/ft_nlq_search.c:
  Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-15 17:27:23 -06:00
unknown
69a6d4da0b 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
unknown
dc162f61bb Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-15 16:13:03 +01:00
unknown
6e45648e07 Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1


sql/ha_innodb.cc:
  Auto merged
2005-02-15 16:12:51 +02:00
unknown
da7f5e8c4b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/sql_parse.cc:
  Auto merged
2005-02-15 15:12:50 +01:00
unknown
87ebde0db6 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
unknown
f9982066a3 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.


configure.in:
  Raise the version number from 4.1.10 to 4.1.11.
2005-02-15 14:13:18 +01:00
unknown
9b544cc0e8 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
unknown
e1099fac1f Merge with 4.0
vio/viosocket.c:
  Auto merged
mysql-test/t/group_by.test:
  Use local file
sql/sql_parse.cc:
  Merge with 4.0 to get bug fix for reconnect problem
2005-02-15 14:49:52 +02:00
unknown
c7b5773551 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
unknown
358cfd6c42 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



mysql-test/t/group_by.test:
  Remove empty line
vio/viosocket.c:
  Added function comment
2005-02-15 14:42:13 +02:00
unknown
1d633f645a 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
unknown
658bac84bf InnoDB: Create temporary files in the MySQL tmpdir instead of $TMPDIR.
(Bug #5822)


sql/ha_innodb.cc:
  innobase_mysql_tmpfile(): pass mysql_tmpdir to create_temp_file(),
  so that the MySQL startup option tmpdir will be honored instead of
  the environment variable TMPDIR. (Bug #5822)
2005-02-15 11:16:17 +02:00
unknown
323487b4a8 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-15 04:11:57 +01:00
unknown
de109e463b 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.


sql/item.h:
  Fix the signature of placement operator delete for class Item.
sql/sql_class.cc:
  Add placement delete operator to suppress a warning under Windows.
sql/sql_lex.h:
  Fix the signature of placement operator delete for class LEX
sql/sql_list.h:
  Fix the signature of placement operator delete for class Sql_alloc
sql/sql_string.h:
  Fix the signature of placement operator delete for class Sql_string
2005-02-15 03:55:44 +03:00
unknown
28b0b4513f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-15 00:19:04 +01:00
unknown
4cead8c8a5 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.



mysql-test/r/drop_temp_table.result:
  back to one single DROP
sql/sql_base.cc:
  undoing the fix I had made some days ago: we are back to one single DROP TEMPORARY TABLE for all temp tables.
sql/sql_parse.cc:
  1) set thd->query_length to the length of the query being executed, excluding the other next queries
  if this is a multi-query. The setting happens ASAP, ie. just after we know it's a multi-query, ie. just after yyparse().
  Don't include the ';' in thd->query_length, because this is not good for storage in binlog.
  2) always execute a DROP TEMPORARY TABLE IF EXISTS on slave, don't skip it even if --replicate-ignore-table
2005-02-14 23:47:17 +01:00
unknown
92f55e98dd Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8218


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-14 23:49:01 +03:00
unknown
4173610bd2 Remove redundant DROP TABLE from test case 2005-02-14 23:45:48 +03:00
unknown
3ca0e28ccc 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
unknown
4b4c887a02 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
unknown
de3f93c6ff Bug#8351
Fix for crash when using a double quote in boolean fulltext query.


mysql-test/r/fulltext.result:
  Added a test case for bug #8351.
mysql-test/t/fulltext.test:
  Added a test case for bug #8351.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-14 18:54:12 +04:00
unknown
e2b6480162 remove passwordless remote accounts from windows distro 2005-02-14 11:14:04 +01:00
unknown
a8d2152f97 Bug#2435
Alter handling for UNION syntax
  Tests for UNION and parentheses


mysql-test/r/union.result:
  Bug#2435
    Tests for UNION and parentheses
mysql-test/t/union.test:
  Bug#2435
    Tests for UNION and parentheses
sql/sql_yacc.yy:
  Bug#2435
    Amend handling of UNION with parentheses.
2005-02-13 22:35:52 +00:00
unknown
0d57871425 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1


innobase/row/row0mysql.c:
  Auto merged
sql/sql_cache.cc:
  Auto merged
2005-02-13 21:05:18 +02:00
unknown
4c21a10f27 row0mysql.c:
Backport the column prefix memory corruption fix from 5.0


innobase/row/row0mysql.c:
  Backport the column prefix memory corruption fix from 5.0
2005-02-13 21:00:07 +02:00
unknown
276c90cd8a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-13 19:52:41 +01:00
unknown
b7fadca152 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