Commit graph

21,171 commits

Author SHA1 Message Date
unknown
6d0ec316a8 mysql.1.in:
Fix path that needs no parameterization.


man/mysql.1.in:
  Fix path that needs no parameterization.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-14 19:59:00 -06: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
ce4f43cb86 Merge 4.1 - 5.0
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_berkeley.cc:
  Auto merged
2005-03-15 01:14:59 +02:00
unknown
2722a28691 Bug #6660 mysqldump creates bad pathnames on Windows
This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows.  However, this patch fixes the bug in mysqldump.c

mysqldump.c:
  Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows


client/mysqldump.c:
  Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-14 16:47:35 -06: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
72ae2a5884 sql/log.cc
don't set LOG_EVENT_BINLOG_IN_USE_F for relay logs
sql/sql_repl.cc
    clear LOG_EVENT_BINLOG_IN_USE_F flag before sending an event to a slave


sql/log.cc:
  don't set LOG_EVENT_BINLOG_IN_USE_F for relay logs
sql/sql_repl.cc:
  clear LOG_EVENT_BINLOG_IN_USE_F flag before sending an event to a slave
2005-03-14 17:53:24 +01:00
unknown
79a005fe0c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-14 19:47:46 +03:00
unknown
8ee298cc75 Updated error message to be more informative. Previous error message
"Access denied to database mysql" was actually not just misleading, but
also wrong.

Bug#7905.
2005-03-14 16:59:09 +02:00
unknown
66eaf5f243 Removed unnecessary current_thd 2005-03-14 15:53:44 +01:00
unknown
d9910c5ee7 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0


sql/set_var.cc:
  Auto merged
2005-03-14 17:27:10 +03: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
87b40f2013 Removed files that disabled ndb tests 2005-03-14 12:27:02 +01:00
unknown
90697f2467 BUG#6554 Problem Building MySql on Fedora Core 3
- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3


sql/ha_berkeley.cc:
  Moved list of bdb extension to file scope
sql/ha_ndbcluster.cc:
  Moved list of ndb extesions to file scope
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-14 12:07:49 +01:00
unknown
10852be938 dict0load.c:
dict_load_table(): Refuse to open ROW_FORMAT=COMPACT tables
  of MySQL 5.0.3 and later.


innobase/dict/dict0load.c:
  dict_load_table(): Refuse to open ROW_FORMAT=COMPACT tables
  of MySQL 5.0.3 and later.
2005-03-14 12:43:22 +02:00
unknown
096a7d6358 Marked missing file gone 2005-03-14 11:37:26 +01:00
unknown
6c256bb2fa Removed 2005-03-14 11:12:54 +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
174a177ccb print more information 2005-03-14 09:27:34 +01:00
unknown
27f82edceb Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into linux.site:/home/marty/MySQL/mysql-5.0


sql/mysql_priv.h:
  Auto merged
2005-03-14 09:21:15 +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
2a0b2e93e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/media/sda1/mysql/mysql-5.0-926
2005-03-14 01:47:24 +03:00
unknown
ec372b09fe print xa recovery progress
add names to handlertons
trans_need_2pc() macro


sql/examples/ha_archive.cc:
  add names to handlertons
sql/ha_berkeley.cc:
  add names to handlertons
sql/ha_innodb.cc:
  add names to handlertons
sql/ha_ndbcluster.cc:
  add names to handlertons
sql/handler.cc:
  print xa recovery progress
sql/handler.h:
  add names to handlertons
  trans_need_2pc() macro
sql/log.cc:
  add names to handlertons
2005-03-13 21:58:09 +01:00
unknown
7652a38941 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/media/sda1/mysql/mysql-5.0-926


sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-03-13 23:53:30 +03:00
unknown
1534ed8e15 WL#926 "SUM(DISTINCT) and AVG(DISTINCT)": improvement of SUM(DISTINCT) and
implementation of AVG(DISTINCT) which utilizes the approach with Fields.
The patch implemented in October is portede to the up-to-date tree 
containing DECIMAL type.
Tests for AVG(DISTINCT) (although there is not much to test provided
that SUM(DISTINCT) works), cleanups for COUNT(DISTINCT) and GROUP_CONCAT()
will follow in another changeset.


sql/field.cc:
  A handy way to init create_field used for use with virtual tmp tables.
  Feel free to extend it for your own needs.
sql/field.h:
  Declaration for create_field::init_for_tmp_table()
sql/item.cc:
  Implementation for a framework used to easily handle different result
  types of SQL expressions. Instead of having instances of each possible 
  result type (integer, decimal, double) in every item, variables
  of all used types are moved to struct Hybrid_type.
  Hybrid_type can change its dynamic type in runtime, and become,
  for instance, DECIMAL from INTEGER.
  All type-specific Item operations are moved to the class hierarchy
  Hybrid_type_traits. Item::decimals and Item::max_length can
  be moved to Hybrid_type as well.
sql/item.h:
  Declaration for Hybrid_type framework. See also comments for item.cc
  in this changeset.
sql/item_sum.cc:
  Rewritten implementation for Item_sum_sum_distinct (SUM(DISTINCT))
  and added implementation for Item_sum_avg_distinct (AVG(DISTINCT)).
  The classes utilize Hybrid_type class hierarchy and Fields to
  convert SUM/AVG arguments to binary representation and store in a RB-tree.
sql/item_sum.h:
  Declarations for Item_sum_distinct (the new intermediate class used
  for SUM and AVG distinct), Item_sum_sum_distinct, Item_sum_avg_distinct.
sql/sql_select.cc:
  Implementatio of create_virtual_tmp_table().
sql/sql_select.h:
  Declaration for create_virtual_tmp_table.
sql/sql_yacc.yy:
  Grammar support for Item_sum_avg_distinct.
2005-03-13 23:50:43 +03:00
unknown
53ffcff7be row0mysql.c:
Correct web links
fil0fil.c:
  Correct (?) English grammar


innobase/fil/fil0fil.c:
  Correct (?) English grammar
innobase/row/row0mysql.c:
  Correct web links
2005-03-13 22:46:57 +02: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
dad790f36d Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0


Build-tools/Do-compile:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
2005-03-13 12:19:25 +01:00
unknown
a569b08375 set_var.cc, mysqld.cc, ha_innodb.cc, sql_class.h:
Add a settable session variable innodb_support_xa; setting it to 0 can save up to 10 % of CPU time and 150 bytes of space in each undo log
trx0trx.h, trx0undo.c, trx0trx.c, trx0roll.c:
  Enable XA if innodb_support_xa is not set to 0; make prepare to do log fsync's according to innodb_flush_log_at_trx_commit


innobase/trx/trx0roll.c:
  Enable XA if innodb_support_xa is not set to 0; make prepare to do log fsync's according to innodb_flush_log_at_trx_commit
innobase/trx/trx0trx.c:
  Enable XA if innodb_support_xa is not set to 0; make prepare to do log fsync's according to innodb_flush_log_at_trx_commit
innobase/trx/trx0undo.c:
  Enable XA if innodb_support_xa is not set to 0; make prepare to do log fsync's according to innodb_flush_log_at_trx_commit
innobase/include/trx0trx.h:
  Enable XA if innodb_support_xa is not set to 0; make prepare to do log fsync's according to innodb_flush_log_at_trx_commit
sql/sql_class.h:
  Add a settable session variable innodb_support_xa; setting it to 0 can save up to 10 % of CPU time and 150 bytes of space in each undo log
sql/ha_innodb.cc:
  Add a settable session variable innodb_support_xa; setting it to 0 can save up to 10 % of CPU time and 150 bytes of space in each undo log
sql/mysqld.cc:
  Add a settable session variable innodb_support_xa; setting it to 0 can save up to 10 % of CPU time and 150 bytes of space in each undo log
sql/set_var.cc:
  Add a settable session variable innodb_support_xa; setting it to 0 can save up to 10 % of CPU time and 150 bytes of space in each undo log
2005-03-13 12:49:39 +02: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
6b98e786e6 if no xa recovery (or after it):
warning on startup if prepared foreign xids
  error on startup if prepared our xids
  temporarily: always rollback prepared our xids instead of an error


sql/mysql_priv.h:
  opt_tc_log_file made extern
sql/mysqld.cc:
  opt_tc_log_file made extern
  always call ha_recover() even if no previous crash was detected
2005-03-12 20:09:54 +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
a2487c19c2 Merge mysql.com:/home/jimw/my/mysql-5.0-8902
into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysql_priv.h:
  Auto merged
2005-03-11 12:46:11 -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
81647853a1 Merge mysql.com:/home/jimw/my/mysql-4.1-8513
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-11 11:08:04 -08: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
a44711db14 row0sel.c:
row_sel_store_mysql_rec(): Remove unused variable "index".


innobase/row/row0sel.c:
  row_sel_store_mysql_rec(): Remove unused variable "index".
2005-03-11 17:24:43 +02:00
unknown
1fbea39b59 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-03-11 12:33:36 +01:00
unknown
d4e7d91f3e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-03-11 11:32:56 +01:00
unknown
74e5ebeb16 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-03-11 11:30:08 +01:00
unknown
4743f7eb27 Merge
Build-tools/Do-compile:
  SCCS merged
mysql-test/mysql-test-run.sh:
  SCCS merged
scripts/make_win_src_distribution.sh:
  SCCS merged
2005-03-11 11:21:51 +01:00
unknown
335f4fd886 Keep the Perl version of 'mysql-test-run' in sync with the shell script.
mysql-test/lib/mtr_report.pl:
  Keep the Perl version in sync with the shell script so that 'Do-compile' will call
  PS and ES tests even after some previous test failures.
  (See previous change to 'mysql-test-run.sh' and 'Do-compile'.)
2005-03-11 11:08:27 +01:00