Commit graph

19918 commits

Author SHA1 Message Date
unknown
869b65571d Manual merge
mysql-test/r/select.result:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-17 00:34:06 -08:00
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
efe1ca2053 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 05:25:46 +01: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
bb46b2bf99 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 03:35:55 +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
1e4063f5ff Merge 2005-02-16 20:08:56 -06:00
unknown
a2d3bc8d75 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


mysql-test/t/ps_1general.test:
  Auto merged
2005-02-17 03:04:28 +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
1fbeaf710a Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-02-17 04:19:47 +03:00
unknown
08c2f9e791 Fix a typo caused bdb to be skipped when building with BUILD/compile-*-max
Recommited, as I made a typo in the previous patch myself =)


BUILD/SETUP.sh:
  Fix a typo caused bdb to be skipped when building with BUILD/compile-*-max
2005-02-17 04:18:49 +03: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
6bb46afb5d Merge mysql.com:/home/dellis/bkl/bug-4.1
into mysql.com:/home/dellis/bkl/bug-5.0


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/fulltext.result:
  Auto merged
2005-02-16 17:35:00 -06:00
unknown
8cf5a1cccb Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-xa


configure.in:
  Auto merged
2005-02-17 00:06:09 +01:00
unknown
0e8ad9067d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-02-16 23:27:20 +01:00
unknown
2071fe55c4 Fixes after 4.1->5.0 merge.
mysql-test/r/rpl_multi_query.result:
  result update
mysql-test/t/rpl_multi_query.test:
  binlog position changes from 4.1 to 5.0
sql/sql_base.cc:
  Manually putting back the old code (like I did in 4.1 already, as the 2nd fix for BUG#8055 does not need to change sql_base.cc anymore)
2005-02-16 23:23:20 +01:00
unknown
d6541adb37 Merge serg@bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-16 22:59:17 +01:00
unknown
fced35f74a ndb - fix new decimal type mysql vs. ndb
mysql-test/r/ndb_index_ordered.result:
  fix new decimal mysql vs. ndb
mysql-test/t/ndb_index_ordered.test:
  fix new decimal mysql vs. ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  fix new decimal mysql vs. ndb
ndb/include/ndb_constants.h:
  fix new decimal mysql vs. ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  fix new decimal mysql vs. ndb
ndb/include/util/NdbSqlUtil.hpp:
  fix new decimal mysql vs. ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionary.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix new decimal mysql vs. ndb
ndb/test/include/NdbSchemaOp.hpp:
  fix new decimal mysql vs. ndb
ndb/test/src/HugoCalculator.cpp:
  fix new decimal mysql vs. ndb
ndb/tools/restore/consumer.cpp:
  fix new decimal mysql vs. ndb
sql/ha_ndbcluster.cc:
  fix new decimal mysql vs. ndb
2005-02-16 21:19:42 +01:00
unknown
eb061b352b Merge
mysql-test/r/drop_temp_table.result:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
configure.in:
  SCCS merged
sql/sql_base.cc:
  SCCS merged
sql/sql_parse.cc:
  SCCS merged
2005-02-16 21:03:58 +01:00
unknown
88f264f0ce Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2
2005-02-16 16:54:09 +00:00
unknown
36f6d8afee Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2


include/config-win.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2005-02-16 16:47:29 +00: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
3b592d3273 ndb - temp: comment out decimal tests t/ndb*
mysql-test/r/ndb_index_ordered.result:
  temp: comment out decimal
mysql-test/t/ndb_index_ordered.test:
  temp: comment out decimal
2005-02-16 17:10:17 +01:00
unknown
eab44eaaca Bug#4445
Make a more informative platform info for Windows
2005-02-16 16:05:18 +00:00
unknown
68b52e0fd8 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
unknown
0f466d046c Fixed BUG#8540: Local variable overrides an alias.
mysql-test/r/sp.result:
  New test case for BUG#8540.
mysql-test/t/sp.test:
  New test case for BUG#8540.
sql/item.h:
  Use the existing name (if any) for a SP local variable (to get the correct
  field name in a select in the case of an alias).
2005-02-16 16:06:41 +01:00
unknown
1f6617562a ndb - post-merge fixes
ndb/include/ndb_constants.h:
  post-merge fixes
ndb/include/ndbapi/NdbDictionary.hpp:
  post-merge fixes
ndb/src/common/util/NdbSqlUtil.cpp:
  post-merge fixes
ndb/test/src/HugoCalculator.cpp:
  post-merge fixes
2005-02-16 14:59:17 +01:00
unknown
0be9c0ef75 Merge
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
2005-02-16 13:14:21 +01: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
ec075331b0 Fix ndb_autodiscover
mysql-test/r/ndb_autodiscover.result:
  Added warning printout to result
2005-02-16 11:02:48 +01:00
unknown
0c2a8b45c1 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-16 13:02:47 +03:00
unknown
53944e1c22 Fix for bug#7915: crash,JOIN VIEW, subquery, SELECT .. FROM INFORMATION_SCHEMA.COLUMNS 2005-02-16 13:00:03 +03: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
bcbc61b1b7 Fix for bug #8534 (Compile errors in Precision Math code on Windows)
sql/filesort.cc:
  Type of the parameter changed
sql/my_decimal.cc:
  type of the parameter changed
sql/my_decimal.h:
  Parameter type changed
2005-02-16 11:44:34 +04:00
unknown
04bae3c0eb Fix - to not to call val_xxx in Item_func_interval twice
sql/item_cmpfunc.cc:
  code fixed not to call val_x twice
2005-02-16 11:19:47 +04: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