Commit graph

4855 commits

Author SHA1 Message Date
unknown
01df5a157f Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.:/home/patg/test/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
2005-03-15 00:36:38 -08:00
unknown
2b1a8acda5 This changeset contains changes approved in code review by
Konstja and Georg, change sets 1.1806, 1.1805. These changes has been successfully 
tested on both my own workstation (Suse 9.0) and production.mysql.com.


mysql-test/r/federated.result:
  new test results for error handling tests.
mysql-test/t/federated.test:
  new error handling tests
sql/ha_federated.cc:
  - check_foreign_data source added
  - table names now enclosed in '`' to allow for '%' or other characters
  - better error handling
  - mysql_init now checked to see if it returns true/false, error out if false (Georg)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-15 00:32:21 -08:00
unknown
54baac55b6 Merge mysql.com:/home/psergey/mysql-4.1-bug8510
into mysql.com:/home/psergey/mysql-5.0-bug8510


mysql-test/r/ansi.result:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-03-15 09:29:54 +03:00
unknown
155cfb3942 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8510


sql/set_var.cc:
  Auto merged
2005-03-15 04:09:41 +03:00
unknown
897849e5d8 WL#926 "AVG(DISTINCT) and other distincts", part 2 (out of 3): clean up
Item_sum_count_distinct, and
deploy Unique for use with COUNT(DISTINCT) if there is no blob
column in the list of DISTINCT arguments.


mysql-test/r/count_distinct2.result:
  Test results fixed.
mysql-test/r/func_group.result:
  Updated.
mysql-test/r/sum_distinct.result:
  Updated.
mysql-test/t/func_group.test:
  Add a test for COUNT(DISTINCT) and true varchar and case-insensitive
  collation. The table in the test contains only two distinct values.
mysql-test/t/sum_distinct.test:
  Since now we support INSERT INTO t1 (a) SELECT a+1 FROM t1, shorten
  the test.
  Add a nominal test for AVG(DISTINCT)
sql/item_sum.cc:
  Implementation of cleaned up Item_sum_count_distinct.
  Fixed a bug with COUNT(DISTINCT) and new VARCHAR and collations.
  Fixed a bug wiht AVG(DISTINCT) and wrong number of output digits
  after decimal point.
sql/item_sum.h:
  Cleanup for Item_sum_count_distinct.
  Now if the list of distinct arguments doesn't contain a blob column,
  we always use Unique and merge-sort to find distinct values.
sql/sql_class.h:
  Added a short-cut to find number of elements in Unique if all elements fit
  into memory.
2005-03-15 03:46:19 +03:00
unknown
6950d57ffd Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-14 20:45:10 +01:00
unknown
df93b4fa35 merged
sql/item_cmpfunc.h:
  Auto merged
mysql-test/r/join_outer.result:
  !bk-eb merged
mysql-test/t/join_outer.test:
  !bk-eb merged
2005-03-14 18:46:30 +01:00
unknown
9f4c18f044 WL#2353 EXPLAIN support for condition pushdown 2005-03-14 15:26:10 +01:00
unknown
ebbee9d974 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-03-14 14:47:51 +01:00
unknown
1c23473751 anotehr fix for Item_func_isnotnull::not_null_tables()
mysql-test/r/join_outer.result:
  anotehr test for Item_func_isnotnull::not_null_tables()
mysql-test/t/join_outer.test:
  anotehr test for Item_func_isnotnull::not_null_tables()
2005-03-14 11:04:42 +01:00
unknown
7a105affb2 Item_func_isnotnull::not_null_tables - return 0 if not top-level item
mysql-test/r/join_outer.result:
  test for some obscure usage of IS NOT NULL
mysql-test/t/join_outer.test:
  test for some obscure usage of IS NOT NULL
2005-03-13 23:56:25 +01:00
unknown
2427f3695c correct not_null_tables() for XOR and AND
correct top_level_item for XOR


mysql-test/r/join_outer.result:
  one more test
mysql-test/t/join_outer.test:
  one more test
2005-03-13 16:34:40 +01:00
unknown
dad8e1f59a join_outer.test:
Correction after manual merge.


mysql-test/t/join_outer.test:
  Correction after manual merge.
2005-03-13 01:07:01 -08:00
unknown
7bf4a418cb Manual merge
sql/item_cmpfunc.h:
  Auto merged
2005-03-13 00:40:55 -08:00
unknown
7cecea527d join_outer.result, join_outer.test:
Added a test case for bug #9017.
item_cmpfunc.h:
  A wrong not_null_tables method for Item_cond_xor
  caused a conversion of a left join into an inner join
  that was not valid.


sql/item_cmpfunc.h:
  A wrong not_null_tables method for Item_cond_xor
  caused a conversion of a left join into an inner join
  that was not valid.
mysql-test/t/join_outer.test:
  Added a test case for bug #9017.
mysql-test/r/join_outer.result:
  Added a test case for bug #9017.
2005-03-12 23:31:52 -08:00
unknown
deabb45081 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/mysql_priv.h:
  Auto merged
2005-03-12 20:17:16 +01:00
unknown
fe482074d9 Update tests and test results after merge, disable broken NDB tests
mysql-test/r/information_schema.result:
  Update test result
mysql-test/r/query_cache.result:
  Reset query_cache_type for test
mysql-test/t/query_cache.test:
  Update test result
mysql-test/t/ndb_alter_table.disabled:
  ***MISSING WEAVE***
mysql-test/t/ndb_autodiscover.disabled:
  ***MISSING WEAVE***
mysql-test/t/ndb_autodiscover2.disabled:
  ***MISSING WEAVE***
mysql-test/t/ndb_cache_multi.disabled:
  ***MISSING WEAVE***
mysql-test/t/ndb_cache_multi2.disabled:
  ***MISSING WEAVE***
mysql-test/t/ndb_multi.disabled:
  ***MISSING WEAVE***
mysql-test/t/ndb_restore.disabled:
  ***MISSING WEAVE***
2005-03-11 15:06:03 -08:00
unknown
52050d138e Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
2005-03-11 12:47:29 -08:00
unknown
b1e512128b Merge query_cache tests
Build-tools/Do-compile:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Update results
mysql-test/t/query_cache.test:
  Merge test
2005-03-11 12:38:38 -08:00
unknown
f609d604d2 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2005-03-11 21:37:52 +01:00
unknown
7a053c7d60 BUG#9101 - RELEASE/ROLLBACK TO SAVEPOINT did not forget savepoints correctly
mysql-test/r/innodb.result:
  more savepoint tests
mysql-test/t/innodb.test:
  more savepoint tests
2005-03-11 21:10:41 +01:00
unknown
befe4fa99f Merge test and results
sql/sql_table.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Update results
mysql-test/t/query_cache.test:
  Merge tests
2005-03-11 11:07:32 -08:00
unknown
579e96ce30 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b9029
2005-03-11 12:30:55 +04:00
unknown
324a566832 Merge mysql.com:/home/psergey/mysql-4.1-bug8711
into mysql.com:/home/psergey/mysql-5.0-bug8711


mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
2005-03-11 02:26:38 +03:00
unknown
ff2fcba35b Merge
sql/item_cmpfunc.h:
  Auto merged
mysql-test/r/join_outer.result:
  SCCS merged
mysql-test/t/join_outer.test:
  SCCS merged
2005-03-11 02:23:16 +03:00
unknown
7c90fa7b2c Fix for BUG#8711: "<=>" may have true value for NULL arguments, so make
Item_func_equal::not_null_tables() always return 0.


mysql-test/r/join_outer.result:
  Testcase for BUG#8711
mysql-test/t/join_outer.test:
  Testcase for BUG#8711
sql/item_cmpfunc.h:
  Fix for BUG#8711: "<=>" may have true value for NULL arguments, i.e. it can accept NULL-complemented 
  table rows. This differs from assumptions made in Item_func::not_null_tables(), so add 
  Item_func_equal::not_null_tables().
  Item_func_equal::not_null_tables_cache value doesn't make sense now, but we still let it be
  calculated (and ignore it)
2005-03-11 02:17:03 +03:00
unknown
1690bab938 a fix (bug #9029 Traditional: Wrong SQLSTATE returned for string truncation).
sql/field.cc:
  a fix (bug #9029 Traditional: Wrong SQLSTATE returned for string truncation).
  Should issue ER_DATA_TOO_LONG in 'traditional' mode when data truncated.
2005-03-10 17:08:45 +04:00
unknown
db93db85b6 Merge
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  SCCS merged
2005-03-10 13:59:48 +02:00
unknown
dd843ee4b5 Merge mysql.com:/home/timka/mysql/src/4.1-bug-7425
into mysql.com:/home/timka/mysql/src/4.1-dbg
2005-03-10 11:50:55 +02:00
unknown
83fa3560bc Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
netware/BUILD/mwenv:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2005-03-09 16:53:20 -08:00
unknown
85be2e57ab Manual merge
sql/item_strfunc.cc:
  Auto merged
2005-03-09 10:58:52 -08:00
unknown
146df30f79 Fix for BUG#7425.
The reported problems were due to two completely unrelated omissions.
1) The file sort procedure didn't correctly create the sort key in
   make_sortkey when the sortkey was an unsigned integer.
2) The name resolution procedure for column references inside a HAVING
   clause did not propagate the unsigned_flag of the resolved references.
This patch corrects both problems.


mysql-test/r/select.result:
  Added test result for BUG#7425.
mysql-test/t/select.test:
  Added test for BUG#7425.
sql/filesort.cc:
  Take into account whether 'item' represents a signed or an unsigned integer.
sql/item.cc:
  Once an Item_ref is resolved, propagate the unsigned_flag to the resolved item.
2005-03-09 16:51:03 +02:00
unknown
48577bb59f merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/page0page.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_parser.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-03-09 14:09:06 +01:00
unknown
3b214ab3e8 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-03-09 13:02:51 +01:00
unknown
a0f63f1b81 don't close binlog in the destructor - use explictit MYSQL_LOG::cleanup for this
mysql-test/r/fulltext.result:
  new test, duplicate test removed
mysql-test/t/fulltext.test:
  new test, duplicate test removed
sql/slave.cc:
  close relay log explicitly
2005-03-09 12:29:51 +01:00
unknown
44d66d26dc func_str.result, func_str.test:
Added a test case for bug #8669.
item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.


sql/item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.
mysql-test/t/func_str.test:
  Added a test case for bug #8669.
mysql-test/r/func_str.result:
  Added a test case for bug #8669.
2005-03-09 00:15:51 -08:00
unknown
dd2306839a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-03-09 01:15:42 +00:00
unknown
ce16c895c2 Merge in fix Bug#3788
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/sp.result:
  Merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-08 22:32:09 +00:00
unknown
1250899c0d Fixing post-merge errors 2005-03-09 00:09:18 +02:00
unknown
12c6eb3b08 post merge fixes
sql/sql_parse.cc:
  Auto merged
2005-03-08 22:59:21 +02:00
unknown
39c32324d6 making a better test case for bug #8850
mysql-test/r/sp.result:
  fixing results for new test
mysql-test/t/sp.test:
  making a new test with autocommit set to 0 and 1.
  Second CALL is in autocommit mode to prove that the relevant bug 
  (bug #8550) is fixed.
2005-03-08 22:44:35 +02:00
unknown
abe6094ac4 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-08 19:47:49 +01:00
unknown
f70688e2aa BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
for fulltext searches too
2005-03-08 19:45:55 +01:00
unknown
4e8c5c1969 Fix to make builds possible
mysql-test/r/mysqldump.result:
  Fix for avoiding version text
mysql-test/t/mysqldump.test:
  Fix for avoiding version text
2005-03-08 20:06:08 +02:00
unknown
45b5e513c6 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-08 09:51:00 +01:00
unknown
8e24e6079f Flush entries from the query cache for tables used in
administrative statements that may alter the table, such
as REPAIR TABLE. (Bug #8480)


mysql-test/r/query_cache.result:
  Add new results
mysql-test/t/query_cache.test:
  Add regression test
sql/sql_table.cc:
  Make sure entries are flushed from the query cache for
  any administrative command run on a table that acquires
  a write lock on it (and thus might change it), like 
  REPAIR TABLE.
2005-03-07 18:15:19 -08:00
unknown
25f8623fff Fixed BUG#8937: Stored Procedure: AVG() works as SUM() in SELECT ... INTO statement
mysql-test/r/sp.result:
  New test case for BUG#8937.
mysql-test/t/sp.test:
  New test case for BUG#8937.
sql/item_sum.h:
  Added val_int() method for Item_sum_avg for forced int types (in SPs for instance),
  otherwise Item_sum_sum::val_int() is used.
2005-03-07 18:09:53 +01:00
unknown
00a163d46f Fix for bug #8935 CAST(time AS DECIMAL) crashes
mysql-test/r/cast.result:
  test result
mysql-test/r/func_group.result:
  test result
mysql-test/t/cast.test:
  test case
sql/field.cc:
  this assert isn't correct actually
2005-03-07 20:53:51 +04:00
unknown
804a2a8cdf Reorganized sp.test (all bugs at the end now).
mysql-test/r/sp.result:
  Reorganized tests (all bugs at the end now) and made some tests adopt to the file's style.
mysql-test/t/sp.test:
  Reorganized tests (all bugs at the end now) and made some tests adopt to the file's style.
2005-03-07 17:16:37 +01:00
unknown
16da840b78 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
2005-03-07 16:23:41 +02:00