database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-04 06:05:05 +03:00
Code
25,521 Commits 2,971 Branches 349 Tags
Commit Graph

115 Commits

Author SHA1 Message Date
unknown
7517d7e112 Implementation of WL#2486 - 
"Process NATURAL and USING joins according to SQL:2003".

* Some of the main problems fixed by the patch:
  - in "select *" queries the * expanded correctly according to
    ANSI for arbitrary natural/using joins
  - natural/using joins are correctly transformed into JOIN ... ON
    for any number/nesting of the joins.
  - column references are correctly resolved against natural joins
    of any nesting and combined with arbitrary other joins.

* This patch also contains a fix for name resolution of items
  inside the ON condition of JOIN ... ON - in this case items must
  be resolved only against the JOIN operands. To support such
  'local' name resolution, the patch introduces a stack of
  name resolution contexts used at parse time.

NOTICE:
- This patch is not complete in the sense that
  - there are 2 test cases that still do not pass -
    one in join.test, one in select.test. Both are marked
    with a comment "TODO: WL#2486".
  - it does not include a new test specific for the task


mysql-test/include/ps_query.inc:
  Adjusted according to standard NATURAL/USING join semantics.,
mysql-test/r/bdb.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/derived.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/errors.result:
  The column as a whole cannot be resolved, so different error message.
mysql-test/r/fulltext.result:
  Adjusted according to standard JOIN ... ON semantics =>
  the ON condition can refer only to the join operands.
mysql-test/r/fulltext_order_by.result:
  More detailed error message.
mysql-test/r/innodb.result:
  Adjusted according to standard NATURAL/USING join semantics.
  This test doesn't pass completetly yet!
mysql-test/r/insert_select.result:
  More detailed error message.
mysql-test/r/join.result:
  Adjusted according to standard NATURAL/USING join semantics.
  
  NOTICE: there is one test case that still fails, and it is
  commeted out and marked with WL#2486 in the test file.
mysql-test/r/join_crash.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/join_nested.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/join_outer.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/multi_update.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/null_key.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/order_by.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_2myisam.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_3innodb.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_4heap.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_5merge.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_6bdb.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_7ndb.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/select.result:
  Adjusted according to standard NATURAL/USING join semantics.
  
  NOTICE: there is one failing test case which is commented with
  WL#2486 in the test file.
mysql-test/r/subselect.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/type_ranges.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/union.result:
  More detailed error message.
mysql-test/t/bdb.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/errors.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/fulltext.test:
  Adjusted according to standard JOIN ... ON semantics =>
  the ON condition can refer only to the join operands.
mysql-test/t/fulltext_order_by.test:
  More detailed error message.
mysql-test/t/innodb.test:
  Adjusted according to standard NATURAL/USING join semantics.
  This test doesn't pass completetly yet!
mysql-test/t/insert_select.test:
  More detailed error message.
mysql-test/t/join.test:
  Adjusted according to standard NATURAL/USING join semantics.
  
  NOTICE: there is one test case that still fails, and it is
  commeted out and marked with WL#2486 in the test file.
mysql-test/t/join_crash.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/join_nested.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/join_outer.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/null_key.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/order_by.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/select.test:
  Adjusted according to standard NATURAL/USING join semantics.
  
  NOTICE: there is one test case that still fails, and it is
  commeted out and marked with WL#2486 in the test file.
mysql-test/t/subselect.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/type_ranges.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/union.test:
  More detailed error message.
sql/item.cc:
  - extra parameter to find_field_in_tables
  - find_field_in_real_table renamed to find_field_in_table
  - fixed comments/typos
sql/item.h:
  - added [first | last]_name_resolution_table to class
    Name_resolution_context
  - commented old code
  - standardized formatting
sql/mysql_priv.h:
  - refactored the find_field_in_XXX procedures,
  - added a new procedure for natural join table references,
  - renamed the find_field_in_XXX procedures to clearer names
sql/sp.cc:
  - pass the top-most list of the FROM clause to setup_tables
  - extra parameter to find_field_in_tables
sql/sql_acl.cc:
  - renamed find_field_in_table => find_field_in_table_ref
  - extra parameter to find_field_in_table_ref
  - commented old code
sql/sql_base.cc:
  This file contains the core of the implementation of the processing
  of NATURAL/USING joins (WL#2486).
  - added many comments to old code
  - refactored the group of find_field_in_XXX procedures, and added a
    new procedure for natural joins. There is one find_field_in_XXX procedure
    per each type of table reference (stored table, merge view, or natural
    join); one meta-procedure that selects the correct one depeneding on the
    table reference; and one procedure that goes over a list of table
    referenes.
  - NATURAL/USING joins are processed through the procedures:
      mark_common_columns, store_natural_using_join_columns,
      store_top_level_join_columns, setup_natural_join_row_types.
    The entry point to processing NATURAL/USING joins is the
    procedure 'setup_natural_join_row_types'.
  - Replaced the specialized Field_iterator_XXX iterators with one
    generic iterator over the fields of a table reference.
  - Simplified 'insert_fields' and 'setup_conds' due to encapsulation of
    the processing of natural joins in a separate set of procedures.
sql/sql_class.h:
  - Commented old code.
sql/sql_delete.cc:
  - Pass the FROM clause to setup_tables.
sql/sql_help.cc:
  - pass the end name resolution table to find_field_in_tables
  - adjust the list of tables for name resolution
sql/sql_insert.cc:
  - Changed the code that saves and restores the current context to
    support the list of tables for name resolution -
    context->first_name_resolution_table, and
    table_list->next_name_resolution_table.
    Needed to support an ugly trick to resolve inserted columns only in
    the first table.
  - Added Name_resolution_context::[first | last]_name_resolution_table.
  - Commented old code
sql/sql_lex.cc:
  - set select_lex.parent_lex correctly
  - set correct state of the current name resolution context
sql/sql_lex.h:
  - Added a stack of name resolution contexts to support local
    contexts for JOIN ... ON conditions.
  - Commented old code.
sql/sql_load.cc:
  - Pass the FROM clause to setup_tables.
sql/sql_olap.cc:
  - Pass the FROM clause to setup_tables.
sql/sql_parse.cc:
  - correctly set SELECT_LEX::parent_lex
  - set the first table of the current name resoltion context
  - added support for NATURAL/USING joins
  - commented old code
sql/sql_select.cc:
  - Pass the FROM clause to setup_tables.
  - Pass the end table to find_field_in_tables
  - Improved comments
sql/sql_show.cc:
  - Set SELECT_LEX::parent_lex.
sql/sql_update.cc:
  - Pass the FROM clause to setup_tables.
sql/sql_yacc.yy:
  - Added support for a stack of name resolution contexts needed to
    implement name resolution for JOIN ... ON. A context is pushed
    for each new JOIN ... ON, and popped afterwards.
  - Added support for NATURAL/USING joins.
sql/table.cc:
  - Added new class Natural_join_column to hide the heterogeneous
    representation of column references for stored tables and for
    views.
  - Added a new list TABLE_LIST::next_name_resolution_table to
    support name resolution with NATURAL/USING joins. Also added
    other members to TABLE_LIST to support NATURAL/USING joins.
  - Added a generic iterator over the fields of table references
    of various types - class Field_iterator_table_ref
sql/table.h:
  - Added new class Natural_join_column to hide the heterogeneous
    representation of column references for stored tables and for
    views.
  - Added a new list TABLE_LIST::next_name_resolution_table to
    support name resolution with NATURAL/USING joins. Also added
    other members to TABLE_LIST to support NATURAL/USING joins.
  - Added a generic iterator over the fields of table references
    of various types - class Field_iterator_table_ref
tests/mysql_client_test.c:
  Adjusted according to standard NATURAL JOIN syntax.
 2005-08-12 17:57:19 +03:00
unknown
36b6bf2ef3 Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
  Auto merged
include/thr_lock.h:
  Auto merged
mysql-test/t/alias.test:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/bool.test:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/count_distinct2.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ctype_many.test:
  Auto merged
mysql-test/t/ctype_ucs_binlog.test:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/distinct.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/endspace.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/fulltext_order_by.test:
  Auto merged
mysql-test/t/func_compress.test:
  Auto merged
mysql-test/t/func_concat.test:
  Auto merged
mysql-test/t/func_date_add.test:
  Auto merged
mysql-test/t/func_equal.test:
  Auto merged
mysql-test/t/func_if.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_set.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
mysql-test/t/heap_hash.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/keywords.test:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/lock.test:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/mysqlbinlog2.test:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/ndb_charset.test:
  Auto merged
mysql-test/t/ndb_grant.later:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged
mysql-test/t/ndb_update.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysql-test/t/olap.test:
  Auto merged
mysql-test/t/openssl_1.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/ps_4heap.test:
  Auto merged
mysql-test/t/ps_5merge.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/replace.test:
  Auto merged
mysql-test/t/row.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysql-test/t/rpl000018.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_charset.test:
  Auto merged
mysql-test/t/rpl_create_database.test:
  Auto merged
mysql-test/t/rpl_ddl.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_empty_master_crash.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_multi_query.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/rpl_redirect.test:
  Auto merged
mysql-test/t/rpl_relayrotate.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_server_id2.test:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
mysql-test/t/rpl_timezone.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/t/synchronization.test:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysql-test/t/temp_table.test:
  Auto merged
mysql-test/t/timezone2.test:
  Auto merged
mysql-test/t/timezone_grant.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_ranges.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
mysql-test/t/user_var-binlog.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
  Simple merge
mysql-test/r/ps_grant.result:
  Simple merge
mysql-test/t/analyse.test:
  Simple merge
mysql-test/t/auto_increment.test:
  Simple merge
mysql-test/t/bdb.test:
  Simple merge
mysql-test/t/bigint.test:
  Simple merge
mysql-test/t/case.test:
  Simple merge
mysql-test/t/cast.test:
  Simple merge
mysql-test/t/check.test:
  Simple merge
mysql-test/t/count_distinct.test:
  Simple merge
mysql-test/t/ctype_latin1_de.test:
  Simple merge
mysql-test/t/ctype_uca.test:
  Simple merge
mysql-test/t/ctype_ucs.test:
  Simple merge
mysql-test/t/ctype_utf8.test:
  Simple merge
mysql-test/t/delete.test:
  Simple merge
mysql-test/t/flush_block_commit.test:
  Simple merge
mysql-test/t/func_default.test:
  Simple merge
mysql-test/t/func_gconcat.test:
  Simple merge
mysql-test/t/func_group.test:
  Aligned code with 4.1
mysql-test/t/func_in.test:
  Simple merge
mysql-test/t/func_math.test:
  Simple merge
mysql-test/t/func_misc.test:
  Simple merge
mysql-test/t/func_test.test:
  Simple merge
mysql-test/t/func_time.test:
  Simple merge
mysql-test/t/group_by.test:
  Simple merge
mysql-test/t/having.test:
  Simple merge
mysql-test/t/innodb.test:
  Simple merge
mysql-test/t/insert.test:
  Simple merge
mysql-test/t/join_outer.test:
  Simple merge
mysql-test/t/kill.test:
  Simple merge
mysql-test/t/loaddata.test:
  Simple merge
mysql-test/t/lock_multi.test:
  Simple merge
mysql-test/t/multi_update.test:
  Simple merge
mysql-test/t/mysqlbinlog.test:
  Simple merge
mysql-test/t/mysqldump.test:
  Aligned code with 4.1
mysql-test/t/mysqltest.test:
  Simple merge
mysql-test/t/ndb_basic.test:
  Simple merge
mysql-test/t/ndb_cache.test:
  Simple merge
mysql-test/t/ndb_subquery.test:
  Simple merge
mysql-test/t/ps_grant.test:
  Simple merge
mysql-test/t/range.test:
  Simple merge
mysql-test/t/rpl_drop_temp.test:
  Simple merge
mysql-test/t/rpl_loaddata_rule_s.test:
  Simple merge
mysql-test/t/rpl_loaddatalocal.test:
  Simple merge
mysql-test/t/rpl_rotate_logs.test:
  Simple merge
mysql-test/t/rpl_until.test:
  Simple merge
mysql-test/t/rpl_variables.test:
  Simple merge
mysql-test/t/select.test:
  Simple merge
mysql-test/t/sql_mode.test:
  Simple merge
mysql-test/t/type_blob.test:
  Simple merge
mysql-test/t/type_decimal.test:
  Simple merge
mysql-test/t/user_var.test:
  Simple merge
mysql-test/t/variables.test:
  Simple merge
sql/lock.cc:
  Simple optimization
sql/mysql_priv.h:
  Simple merge
sql/sql_table.cc:
  Simple merge
sql/table.cc:
  Simple merge
sql/unireg.cc:
  Simple merge
 2005-07-28 17:09:54 +03:00
unknown
167fb5f170 Added end marker for tests to make future merges easier 
mysql-test/t/alias.test:
  Added end marker for test to make future merges easier
mysql-test/t/alter_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/analyse.test:
  Added end marker for test to make future merges easier
mysql-test/t/analyze.test:
  Added end marker for test to make future merges easier
  Fixed length of comment lines
mysql-test/t/ansi.test:
  Added end marker for test to make future merges easier
mysql-test/t/archive.test:
  Added end marker for test to make future merges easier
mysql-test/t/auto_increment.test:
  Added end marker for test to make future merges easier
mysql-test/t/backup.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-alter-table-1.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-alter-table-2.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-crash.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-deadlock.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-deadlock.tminus:
  Added end marker for test to make future merges easier
mysql-test/t/bdb.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/bench_count_distinct.test:
  Added end marker for test to make future merges easier
mysql-test/t/bigint.test:
  Added end marker for test to make future merges easier
mysql-test/t/binary.test:
  Added end marker for test to make future merges easier
mysql-test/t/blackhole.test:
  Added end marker for test to make future merges easier
mysql-test/t/bool.test:
  Added end marker for test to make future merges easier
mysql-test/t/bulk_replace.test:
  Added end marker for test to make future merges easier
mysql-test/t/case.test:
  Added end marker for test to make future merges easier
mysql-test/t/cast.test:
  Added end marker for test to make future merges easier
mysql-test/t/check.test:
  Added end marker for test to make future merges easier
mysql-test/t/comments.test:
  Added end marker for test to make future merges easier
mysql-test/t/compare.test:
  Added end marker for test to make future merges easier
mysql-test/t/connect.test:
  Added end marker for test to make future merges easier
mysql-test/t/consistent_snapshot.test:
  Added end marker for test to make future merges easier
mysql-test/t/constraints.test:
  Added end marker for test to make future merges easier
mysql-test/t/count_distinct.test:
  Added end marker for test to make future merges easier
mysql-test/t/count_distinct2.test:
  Added end marker for test to make future merges easier
mysql-test/t/count_distinct3.test:
  Added end marker for test to make future merges easier
mysql-test/t/create.test:
  Added end marker for test to make future merges easier
mysql-test/t/create_select_tmp.test:
  Added end marker for test to make future merges easier
mysql-test/t/csv.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_big5.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_collate.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_cp1250_ch.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_cp1251.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_cp932.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_create.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_gbk.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_latin1.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_latin1_de.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_latin2.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_many.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_mb.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_recoding.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_sjis.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_tis620.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_uca.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_ucs.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_ucs_binlog.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_ujis.test:
  Added end marker for test to make future merges easier
mysql-test/t/ctype_utf8.test:
  Added end marker for test to make future merges easier
mysql-test/t/date_formats.test:
  Added end marker for test to make future merges easier
mysql-test/t/delayed.test:
  Added end marker for test to make future merges easier
mysql-test/t/delete.test:
  Added end marker for test to make future merges easier
mysql-test/t/derived.test:
  Added end marker for test to make future merges easier
mysql-test/t/dirty_close.test:
  Added end marker for test to make future merges easier
mysql-test/t/distinct.test:
  Added end marker for test to make future merges easier
mysql-test/t/drop.test:
  Added end marker for test to make future merges easier
mysql-test/t/drop_temp_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/empty_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/endspace.test:
  Added end marker for test to make future merges easier
mysql-test/t/errors.test:
  Added end marker for test to make future merges easier
mysql-test/t/exampledb.test:
  Added end marker for test to make future merges easier
mysql-test/t/explain.test:
  Added end marker for test to make future merges easier
mysql-test/t/flush.test:
  Added end marker for test to make future merges easier
mysql-test/t/flush_block_commit.test:
  Added end marker for test to make future merges easier
mysql-test/t/flush_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/foreign_key.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext2.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_distinct.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_left_join.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_multi.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_order_by.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_update.test:
  Added end marker for test to make future merges easier
mysql-test/t/fulltext_var.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_compress.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_concat.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_crypt.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_date_add.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_default.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_des_encrypt.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_encrypt.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_encrypt_nossl.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_equal.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_gconcat.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_group.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_if.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_in.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_isnull.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_like.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_math.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_misc.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_op.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_regexp.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_sapdb.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_set.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_str.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_system.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_test.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_time.test:
  Added end marker for test to make future merges easier
mysql-test/t/func_timestamp.test:
  Added end marker for test to make future merges easier
mysql-test/t/gcc296.test:
  Added end marker for test to make future merges easier
mysql-test/t/gis-rtree.test:
  Added end marker for test to make future merges easier
mysql-test/t/gis.test:
  Added end marker for test to make future merges easier
mysql-test/t/grant.test:
  Added end marker for test to make future merges easier
mysql-test/t/grant2.test:
  Added end marker for test to make future merges easier
mysql-test/t/grant_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/group_by.test:
  Added end marker for test to make future merges easier
mysql-test/t/handler.test:
  Added end marker for test to make future merges easier
mysql-test/t/having.test:
  Added end marker for test to make future merges easier
mysql-test/t/heap.test:
  Added end marker for test to make future merges easier
mysql-test/t/heap_auto_increment.test:
  Added end marker for test to make future merges easier
mysql-test/t/heap_btree.test:
  Added end marker for test to make future merges easier
mysql-test/t/heap_hash.test:
  Added end marker for test to make future merges easier
mysql-test/t/help.test:
  Added end marker for test to make future merges easier
mysql-test/t/init_connect.test:
  Added end marker for test to make future merges easier
mysql-test/t/init_file.test:
  Added end marker for test to make future merges easier
mysql-test/t/innodb-deadlock.test:
  Added end marker for test to make future merges easier
mysql-test/t/innodb-lock.test:
  Added end marker for test to make future merges easier
mysql-test/t/innodb-replace.test:
  Added end marker for test to make future merges easier
mysql-test/t/innodb.test:
  Added end marker for test to make future merges easier
mysql-test/t/innodb_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/innodb_handler.test:
  Added end marker for test to make future merges easier
mysql-test/t/insert.test:
  Added end marker for test to make future merges easier
mysql-test/t/insert_select-binlog.test:
  Added end marker for test to make future merges easier
mysql-test/t/insert_select.test:
  Added end marker for test to make future merges easier
mysql-test/t/insert_update.test:
  Added end marker for test to make future merges easier
mysql-test/t/isam.test:
  Added end marker for test to make future merges easier
mysql-test/t/join.test:
  Added end marker for test to make future merges easier
mysql-test/t/join_crash.test:
  Added end marker for test to make future merges easier
mysql-test/t/join_outer.test:
  Added end marker for test to make future merges easier
mysql-test/t/key.test:
  Added end marker for test to make future merges easier
mysql-test/t/key_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/key_diff.test:
  Added end marker for test to make future merges easier
mysql-test/t/key_primary.test:
  Added end marker for test to make future merges easier
mysql-test/t/keywords.test:
  Added end marker for test to make future merges easier
mysql-test/t/kill.test:
  Added end marker for test to make future merges easier
mysql-test/t/limit.test:
  Added end marker for test to make future merges easier
mysql-test/t/loaddata.test:
  Added end marker for test to make future merges easier
mysql-test/t/lock.test:
  Added end marker for test to make future merges easier
mysql-test/t/lock_multi.test:
  Added end marker for test to make future merges easier
mysql-test/t/lock_tables_lost_commit.test:
  Added end marker for test to make future merges easier
mysql-test/t/lowercase_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/lowercase_table2.test:
  Added end marker for test to make future merges easier
mysql-test/t/lowercase_table3.test:
  Added end marker for test to make future merges easier
mysql-test/t/lowercase_table_grant.test:
  Added end marker for test to make future merges easier
mysql-test/t/lowercase_table_qcache.test:
  Added end marker for test to make future merges easier
mysql-test/t/merge.test:
  Added end marker for test to make future merges easier
mysql-test/t/metadata.test:
  Added end marker for test to make future merges easier
mysql-test/t/mix_innodb_myisam_binlog.test:
  Added end marker for test to make future merges easier
mysql-test/t/multi_statement.test:
  Added end marker for test to make future merges easier
mysql-test/t/multi_update.test:
  Added end marker for test to make future merges easier
mysql-test/t/myisam-blob.test:
  Added end marker for test to make future merges easier
mysql-test/t/myisam.test:
  Added end marker for test to make future merges easier
mysql-test/t/mysql_client_test.test:
  Added end marker for test to make future merges easier
mysql-test/t/mysql_protocols.test:
  Added end marker for test to make future merges easier
mysql-test/t/mysqlbinlog.test:
  Added end marker for test to make future merges easier
mysql-test/t/mysqlbinlog2.test:
  Added end marker for test to make future merges easier
mysql-test/t/mysqldump.test:
  Added end marker for test to make future merges easier
mysql-test/t/mysqltest.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_alter_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_autodiscover.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_autodiscover2.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_basic.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_blob.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_charset.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_config.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_database.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_grant.later:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_index.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_index_ordered.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_index_unique.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_insert.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_limit.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_lock.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_minmax.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_multi.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_replace.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_restore.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_subquery.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_transaction.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_truncate.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_types.test:
  Added end marker for test to make future merges easier
mysql-test/t/ndb_update.test:
  Added end marker for test to make future merges easier
mysql-test/t/negation_elimination.test:
  Added end marker for test to make future merges easier
mysql-test/t/not_embedded_server.test:
  Added end marker for test to make future merges easier
mysql-test/t/null.test:
  Added end marker for test to make future merges easier
mysql-test/t/null_key.test:
  Added end marker for test to make future merges easier
mysql-test/t/odbc.test:
  Added end marker for test to make future merges easier
mysql-test/t/olap.test:
  Added end marker for test to make future merges easier
mysql-test/t/openssl_1.test:
  Added end marker for test to make future merges easier
mysql-test/t/order_by.test:
  Added end marker for test to make future merges easier
mysql-test/t/order_fill_sortbuf.test:
  Added end marker for test to make future merges easier
mysql-test/t/outfile.test:
  Added end marker for test to make future merges easier
mysql-test/t/overflow.test:
  Added end marker for test to make future merges easier
mysql-test/t/packet.test:
  Added end marker for test to make future merges easier
mysql-test/t/preload.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_10nestset.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_11bugs.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_1general.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_2myisam.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_3innodb.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_4heap.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_5merge.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_6bdb.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_7ndb.test:
  Added end marker for test to make future merges easier
mysql-test/t/ps_grant.test:
  Added end marker for test to make future merges easier
mysql-test/t/query_cache.test:
  Added end marker for test to make future merges easier
mysql-test/t/query_cache_merge.test:
  Added end marker for test to make future merges easier
mysql-test/t/raid.test:
  Added end marker for test to make future merges easier
mysql-test/t/range.test:
  Added end marker for test to make future merges easier
mysql-test/t/rename.test:
  Added end marker for test to make future merges easier
mysql-test/t/repair.test:
  Added end marker for test to make future merges easier
mysql-test/t/replace.test:
  Added end marker for test to make future merges easier
mysql-test/t/rollback.test:
  Added end marker for test to make future merges easier
mysql-test/t/row.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000001.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000002.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000004.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000005.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000006.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000008.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000009.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000010.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000011.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000012.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000013.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000015.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000017.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl000018.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_EE_error.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_alter.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_chain_temp_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_change_master.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_charset.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_commit_after_flush.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_create_database.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_ddl.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_deadlock.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_delete_all.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_do_grant.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_drop.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_drop_temp.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_empty_master_crash.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_error_ignored_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_failed_optimize.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_failsafe.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_flush_log_loop.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_flush_tables.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_free_items.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_get_lock.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_heap.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_ignore_grant.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_init_slave.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_innodb.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_insert_id.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_insert_ignore.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_loaddata.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_loaddata_rule_m.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_loaddata_rule_s.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_loaddatalocal.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_log.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_log_pos.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_many_optimize.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_master_pos_wait.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_max_relay_size.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_misc_functions.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_delete.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_delete2.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_query.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_update.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_update2.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_update3.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_mystery22.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_openssl.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_optimize.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_ps.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_redirect.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_relayrotate.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_relayspace.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_replicate_do.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_reset_slave.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_rewrite_db.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_rotate_logs.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_server_id1.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_server_id2.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_set_charset.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_skip_error.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_sporadic_master.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_start_stop_slave.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_temporary.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_timezone.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_trunc_binlog.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_until.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_user_variables.test:
  Added end marker for test to make future merges easier
mysql-test/t/rpl_variables.test:
  Added end marker for test to make future merges easier
mysql-test/t/select.test:
  Added end marker for test to make future merges easier
mysql-test/t/select_found.test:
  Added end marker for test to make future merges easier
mysql-test/t/select_safe.test:
  Added end marker for test to make future merges easier
mysql-test/t/show_check.test:
  Added end marker for test to make future merges easier
mysql-test/t/skip_name_resolve.test:
  Added end marker for test to make future merges easier
mysql-test/t/sql_mode.test:
  Added end marker for test to make future merges easier
mysql-test/t/status.test:
  Added end marker for test to make future merges easier
mysql-test/t/subselect.test:
  Added end marker for test to make future merges easier
mysql-test/t/subselect2.test:
  Added end marker for test to make future merges easier
mysql-test/t/subselect_gis.test:
  Added end marker for test to make future merges easier
mysql-test/t/subselect_innodb.test:
  Added end marker for test to make future merges easier
mysql-test/t/symlink.test:
  Added end marker for test to make future merges easier
mysql-test/t/synchronization.test:
  Added end marker for test to make future merges easier
mysql-test/t/system_mysql_db.test:
  Added end marker for test to make future merges easier
mysql-test/t/system_mysql_db_fix.test:
  Added end marker for test to make future merges easier
mysql-test/t/system_mysql_db_refs.test:
  Added end marker for test to make future merges easier
mysql-test/t/tablelock.test:
  Added end marker for test to make future merges easier
mysql-test/t/temp_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/timezone.test:
  Added end marker for test to make future merges easier
mysql-test/t/timezone2.test:
  Added end marker for test to make future merges easier
mysql-test/t/timezone3.test:
  Added end marker for test to make future merges easier
mysql-test/t/timezone_grant.test:
  Added end marker for test to make future merges easier
mysql-test/t/truncate.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_blob.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_date.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_datetime.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_decimal.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_enum.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_float.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_nchar.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_ranges.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_set.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_time.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_timestamp.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_uint.test:
  Added end marker for test to make future merges easier
mysql-test/t/type_year.test:
  Added end marker for test to make future merges easier
mysql-test/t/union.test:
  Added end marker for test to make future merges easier
mysql-test/t/update.test:
  Added end marker for test to make future merges easier
mysql-test/t/user_var-binlog.test:
  Added end marker for test to make future merges easier
mysql-test/t/user_var.test:
  Added end marker for test to make future merges easier
mysql-test/t/varbinary.test:
  Added end marker for test to make future merges easier
mysql-test/t/variables.test:
  Added end marker for test to make future merges easier
mysql-test/t/warnings.test:
  Added end marker for test to make future merges easier
 2005-07-28 03:22:47 +03:00
unknown
260bfacaa9 merged 
innobase/row/row0mysql.c:
  Auto merged
sql/hash_filo.h:
  Auto merged
 2005-05-28 01:28:18 +02:00
unknown
6a7dedf259 Fix broken test case (after merge) 
mysql-test/r/union.result:
  Convert back the latin1 characters that where accidently changed during last merge
mysql-test/t/union.test:
  Convert back the latin1 characters that where accidently changed during last merge
 2005-05-26 23:33:20 +03:00
unknown
604799534a merge 
sql/item.cc:
  Auto merged
 2005-05-26 18:33:57 +03:00
unknown
80b0baa740 fixed problem with long string results of expressions in UNIONS (BUG#10025) 
mysql-test/r/union.result:
  test for Bug #10025
mysql-test/t/union.test:
  test for Bug #10025
sql/item.cc:
  set HA_OPTION_PACK_RECORD and change type to MYSQL_TYPE_STRING, to allow correct field creation in case of length more then 255 (creation STRING field with length more then 255)
 2005-05-26 17:30:12 +03:00
unknown
96f629db87 Manual merge. 
client/mysqldump.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
client/client_priv.h:
  Manual merge (still to be corrected!)
 2005-05-26 12:51:44 +02:00
unknown
783705fc65 union.result: 
Results for the above test case
union.test:
  A test case for bug #10032 involving UNION's and ORDER BY clause
sql_yacc.yy:
  Fix for a bug #10032 involving a parser bug with UNION's and ORDER BY


sql/sql_yacc.yy:
  Fix for a bug #10032 involving a parser bug with UNION's and ORDER BY
mysql-test/t/union.test:
  A test case for bug #10032 involving UNION's and ORDER BY clause
mysql-test/r/union.result:
  Results for the above test case
 2005-04-26 21:27:06 +03:00
unknown
b74783d56e merge 
mysql-test/r/ctype_collate.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2005-04-11 15:11:52 +05:00
unknown
ebdf2c0153 ctype_collate.result, ctype_collate.test, union.result, union.test: 
fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.


sql/item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.
mysql-test/t/union.test:
  fixing tests accordingly
mysql-test/r/union.result:
  fixing tests accordingly
mysql-test/t/ctype_collate.test:
  fixing tests accordingly
mysql-test/r/ctype_collate.result:
  fixing tests accordingly
 2005-04-10 12:40:33 +05:00
unknown
ce169a5424 Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly 
Fix that mysql.proc works with new VARCHAR fields
Give warnings for wrong zero dates


configure.in:
  Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly
mysql-test/r/func_time.result:
  New warnings
mysql-test/r/row.result:
  Moved code around to get things to work with --ps-protocol
  Note that one on warning disappered, but it should appear again when bug #9600 is fixed
mysql-test/r/strict.result:
  enabled more tests
  Added more tests
mysql-test/r/union.result:
  Test that UNION generates correct row format
mysql-test/t/row.test:
  Moved test to get things to work with --ps-protocol
mysql-test/t/strict.test:
  enabled more tests
  Added more tests
mysql-test/t/union.test:
  Test that UNION generates correct row format
sql/item.cc:
  Removed compiler warning
  Simple cleanup
sql/sp.cc:
  Fix that mysql.proc works with new VARCHAR fields
sql/time.cc:
  Give warnings for wrong zero dates
tests/mysql_client_test.c:
  More startup information
 2005-04-04 16:43:25 +03:00
unknown
8a898a0b72 merge 4.1->5.0 
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/metadata.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
 2005-03-31 10:39:48 +03:00
unknown
dddabc7edd Merge 
mysql-test/r/metadata.result:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
mysql-test/r/union.result:
  SCCS merged
mysql-test/t/union.test:
  SCCS merged
 2005-03-30 10:27:36 +03:00
unknown
1bb9a7944b Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1 
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
 2005-03-28 14:23:03 +05:00
unknown
e62a32a3a5 union.test: 
Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
  Prove that this problem was fixed with bug9425 fix too.


mysql-test/t/union.test:
  Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
  Prove that this problem was fixed with bug9425 fix too.
 2005-03-28 14:17:47 +05:00
unknown
5a42525027 fixed union types merging and table related metadata (BUG#8824) 
mysql-test/r/func_group.result:
  new result
mysql-test/r/metadata.result:
  new result
  test of metadata of variables, unions and derived tables
mysql-test/r/union.result:
  new results
  test of union of enum
mysql-test/t/metadata.test:
  test of metadata of variables, unions and derived tables
mysql-test/t/union.test:
  test of union of enum
sql/field.cc:
  Field type merging rules added
  Fixed table name/alias returting for field made from temporary tables
sql/field.h:
  removed unned field type reporting
sql/item.cc:
  fixed bug in NEW_DATE type field creartion
  replaced mechanism of merging types of UNION
sql/item.h:
  replaced mechanism of merging types of UNION
sql/item_func.h:
  new item type to make correct field type detection possible
sql/item_subselect.cc:
  added table name parameter to prepare() to show right table alias for derived tables
sql/sql_derived.cc:
  added table name parameter to prepare() to show right table alias for derived tables
sql/sql_lex.h:
  added table name parameter to prepare() to show right table alias for derived tables
sql/sql_parse.cc:
  made function for enum/set pack length calculation
sql/sql_prepare.cc:
  added table name parameter to prepare() to show right table alias for derived tables
sql/sql_select.cc:
  new temporary table field creation by Item_type_holder
  fixed table alias for temporary table
sql/sql_union.cc:
  added table name parameter to prepare() to show right table alias for derived tables
 2005-03-23 08:36:48 +02:00
unknown
e2edf02421 Merge with 4.1 
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
vio/viosocket.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  simple merge
sql/field.cc:
  simple merge
sql/item.h:
  simple merge
sql/sql_lex.h:
  simple merge
sql/sql_yacc.yy:
  Merge
  (join_table_list was not comptely merged. Need to run test to know how things works...)
sql/table.cc:
  Keep code from 5.0, except delted one not needed line
strings/ctype-ucs2.c:
  Auto merge
 2005-02-15 17:12:13 +02: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
1be345edc0 Merge changes 
client/mysqlcheck.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/ft_static.c:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/field.cc:
  Clean up merge
 2005-02-04 11:59:02 -08:00
unknown
66eb71f3fc A fix: bug#6931: Date Type column problem when using UNION-Table 
bug#7833:  Wrong datatype of aggregate column is returned


mysql-test/r/func_group.result:
  Test case for bug 7833:  Wrong datatype of aggregate column is returned
mysql-test/r/union.result:
  Test case for bug 6931: Date Type column problem when using UNION-Table.
mysql-test/t/func_group.test:
  Test case for bug 7833:  Wrong datatype of aggregate column is returned
mysql-test/t/union.test:
  Test case for bug 6931: Date Type column problem when using UNION-Table.
 2005-02-04 15:31:36 +03:00
unknown
dabd01935c after merge fixes 
mysql-test/t/union.test:
  Auto merged
 2005-01-18 23:34:15 +02:00
unknown
59ef5bede9 fixing wrong value for "examined rows" when UNION's are used. 
mysql-test/r/union.result:
  result for a test case for the wrong examined rows with UNION's
mysql-test/t/union.test:
  test case for the wrong examined rows with UNION's
sql/sql_union.cc:
  a patch for the wrong examined rows with UNION's
 2005-01-18 23:13:29 +02:00
unknown
bd365f7622 After merge fixes 
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results


libmysql/libmysql.c:
  Add support for warnings for prepare of prepared statements
mysql-test/r/func_concat.result:
  After merge fixes
mysql-test/r/select.result:
  Delete conflicting tables form previous tests
mysql-test/r/view.result:
  New code from 4.1 fixed old error
mysql-test/t/create.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/func_group.test:
  Remove not needed --disable_ps_protocol
mysql-test/t/func_time.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/having.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/insert_select.test:
  Remove not needed --disable_ps_protocol
mysql-test/t/select.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/sp.test:
  Fixed comment
mysql-test/t/system_mysql_db_fix.test:
  Fix that results is same as from system_mysql_db.test
mysql-test/t/trigger.test:
  Added comment
mysql-test/t/type_blob.test:
  Remove not needed --disable_ps_protocol
mysql-test/t/union.test:
  Run most of the test with --ps-protocol
mysql-test/t/user_limits.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/view.test:
  Removed --error as bug is now fixed
mysql-test/t/warnings.test:
  Ensure that --ps-protocol return same results as normal test
ndb/include/Makefile.am:
  Don't automaticly use SCCS files
sql/ha_ndbcluster.cc:
  Removed compiler warning
sql/log_event.cc:
  After merge fix
sql/sql_class.h:
  After merge fix
sql/sql_insert.cc:
  After merge fix
sql/sql_load.cc:
  After merge fix
sql/sql_prepare.cc:
  Add support for warnings for prepare of prepared statements
sql/sql_update.cc:
  After merge fixes
 2005-01-04 13:46:53 +02:00
unknown
8453693a05 Check that the third UNION part with COLLATE 
clause resolves collation conflict for the
first and the second parts pair.
 2004-11-18 16:15:48 +04:00
unknown
853c2c788c A lot of fixes for prepared statements (PS): 
New mysqltest that can run mysqltest with PS
Added support for ZEROFILL in PS
Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result()
Updated test cases to support --ps-protocol
(Some tests are still run using old protocol)
Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2...
Fixed crash in PS when using sub queries
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries)
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new PS query
group_concat(...ORDER BY) didn't work with PS
Fixed problem with test suite when not using innodb


BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87:
  Delete: mysql-test/t/innodb-lock-master.opt
client/Makefile.am:
  mysqltest now uses regex
client/mysqltest.c:
  Added support for testing of prepared statements (with --ps-protocol)
  Main code was done by Kent, I did mainly some cleanups and minor bug fixes
  New test commands:
  --disable_ps_protocol
  --enable_ps_protocol
  NOTE: new code still has some things that needs to be cleaned up.
  For example run_query_stmt_handle_error() should be made more general so that same code can be used also by 'normal' queries
configure.in:
  mysqltest now uses regex
libmysql/libmysql.c:
  Reset warning_count after prepare (safety). In the future we should also provide warnings on prepare
  integer -> string conversion now handles ZEROFILL
  double -> string conversion is now closer to the one in the server
  Fixed crash when one called mysql_stmt_store_result() without preceding mysql_stmt_bind_result()
libmysqld/examples/Makefile.am:
  mysqltest now uses regex
mysql-test/include/have_query_cache.inc:
  Fixes for --ps-protocol
mysql-test/include/ps_conv.inc:
  Fixes for --ps-protocol
mysql-test/mysql-test-run.sh:
  Added options --ps-protocol
mysql-test/r/ctype_utf8.result:
  Fixed test case
mysql-test/r/fulltext_cache.result:
  Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/r/fulltext_left_join.result:
  Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/r/fulltext_multi.result:
  Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/r/innodb-lock.result:
  Fixed test to work even if Innodb is not compiled in.
mysql-test/t/create.test:
  Fixes for --ps-protocol
mysql-test/t/ctype_utf8.test:
  Remove warnings
mysql-test/t/date_formats.test:
  Fixes for --ps-protocol
mysql-test/t/fulltext_cache.test:
  Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/t/fulltext_left_join.test:
  Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/t/fulltext_multi.test:
  Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/t/func_group.test:
  Fixes for --ps-protocol
mysql-test/t/func_sapdb.test:
  Fixes for --ps-protocol
mysql-test/t/innodb-lock.test:
  Fixed test to work even if Innodb is not compiled in.
mysql-test/t/insert.test:
  Fixes for --ps-protocol
mysql-test/t/insert_select.test:
  Fixes for --ps-protocol
mysql-test/t/insert_update.test:
  Fixes for --ps-protocol
mysql-test/t/metadata.test:
  Fixes for --ps-protocol
mysql-test/t/multi_statement.test:
  Fixes for --ps-protocol
mysql-test/t/ps_1general.test:
  Fixes for --ps-protocol
mysql-test/t/rollback.test:
  Fixes for --ps-protocol
mysql-test/t/rpl_redirect.test:
  Fixes for --ps-protocol
mysql-test/t/rpl_user_variables.test:
  Fixes for --ps-protocol
mysql-test/t/select.test:
  Fixes for --ps-protocol
mysql-test/t/status.test:
  Fixes for --ps-protocol
mysql-test/t/type_blob.test:
  Fixes for --ps-protocol
mysql-test/t/type_float.test:
  Fixes for --ps-protocol
mysql-test/t/union.test:
  Fixes for --ps-protocol
mysql-test/t/warnings.test:
  Fixes for --ps-protocol
mysys/my_alloc.c:
  More debugging information
sql-common/client.c:
  More debugging information
sql-common/my_time.c:
  TIME didn't support full range with PS
sql/field.cc:
  TIME didn't support full range with PS
sql/item_cmpfunc.cc:
  IN(constants,...) didn't work with PS
sql/item_subselect.cc:
  Some subqueries didn't work with PS
sql/item_sum.cc:
  group_concat(...ORDER BY) didn't work with PS
  Removed variable warning_available as 'warning' can be used for this.
sql/item_sum.h:
  Removed not needed variable
sql/protocol.cc:
  TIME didn't support full range with PS
sql/set_var.cc:
  Style fix
sql/sql_base.cc:
  setup_wild() didn't properly restore old arena, which caused core dump in PS when using
  SELECT * FROM t1 NATURAL JOIN t2...
sql/sql_class.cc:
  Style fix
sql/sql_error.cc:
  Style fix
sql/sql_insert.cc:
  Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
sql/sql_lex.h:
  Fix for PS and procedures
sql/sql_parse.cc:
  More debugging information
  Make a copy of 'db' in PS as this may change
  Fixed wrong permissions check in PS and multi-table updates
sql/sql_prepare.cc:
  Fix for PS and SELECT ... PROCEDURE
  Reset all warnings when executing a new query
sql/sql_union.cc:
  Fixes for PS and SELECT ... PROCEDURE
  Reset 'with_wild' as 'wild' is resolved on prepare
 2004-10-26 19:30:01 +03:00
unknown
1412365a3f Bug #6139 UNION doesn't understand collate in the column of second select 2004-10-18 17:56:25 +05:00
unknown
f177c76fb2 Do not try use fields examples is expression and fiend used or SET/ENUM field used in types merging procedure (BUG#5618) 
mysql-test/r/union.result:
  merging ENUM and SET fields in one UNION
mysql-test/t/union.test:
  merging ENUM and SET fields in one UNION
 2004-09-17 13:23:57 +03:00
unknown
9a63c8e0e4 After merge fixes 2004-09-05 02:31:11 +03:00
unknown
e85e573971 Merge with 4.0 to get latest bug fixes 
configure.in:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
mysql-test/r/union.result:
  Merge with 4.0
mysql-test/t/union.test:
  Merge with 4.0
sql/ha_innodb.cc:
  Merge with 4.0
sql/share/german/errmsg.txt:
  Merge with 4.0
sql/share/portuguese/errmsg.txt:
  Merge with 4.0
sql/share/russian/errmsg.txt:
  Merge with 4.0
sql/sql_parse.cc:
  Merge with 4.0
sql/sql_union.cc:
  Merge with 4.0 (Keep 4.1 code)
 2004-09-04 15:59:49 +03:00
unknown
8838c971fa A fix (Bug #4980: union statement with () union () order by produces wrong explain). 2004-09-03 19:59:29 +05:00
unknown
a616e1decb parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204) 
mysql-test/r/union.result:
  test of correct parser stack overflow handling
mysql-test/t/union.test:
  test of correct parser stack overflow handling
sql/sql_parse.cc:
  parameter of my_yyoverflow made independed from YYSIZE_T
sql/sql_yacc.yy:
  parameter of my_yyoverflow made independed from YYSIZE_T
 2004-06-24 02:57:57 +03:00
unknown
a9d4556649 new length detection for non-string in UNION (BUG#4067) 
mysql-test/r/subselect.result:
  new length in UNION
mysql-test/r/union.result:
  new length in UNION
  test of int with wrong display length
mysql-test/t/union.test:
  test of int with wrong display length
sql/item.cc:
  new length detection for non-string
sql/item.h:
  new length detection for non-string
 2004-06-16 16:06:30 +03:00
unknown
1a4f499ca8 EXPLAIN UNION using same routing which used for execution which allow return correct bug messages (Bug #3639) 
EXPLAIN of hidden SELECT of UNION


mysql-test/r/derived.result:
  explain of hidden select
mysql-test/r/subselect.result:
  explain of hidden select
mysql-test/r/union.result:
  explain of hidden select
  correct error messages on explain
mysql-test/t/subselect.test:
  show eliminated costants in WHERE clause
mysql-test/t/union.test:
  correct error messages on EXPLAIN with union
sql/item.cc:
  fixed name constructing for global ORDER BY items
sql/sql_class.h:
  select ID can be negative (for hidden SELECTs)
  removed unused field
sql/sql_lex.cc:
  new flag of UNION EXPLAIN
sql/sql_lex.h:
  new flag of UNION EXPLAIN
  select ID can be negative (for hidden SELECTs)
sql/sql_select.cc:
  EXPLAIN UNION using same routing which used for execution
  explain for hidden SELECT of UNION
sql/sql_union.cc:
  EXPLAIN UNION using same routing which used for execution
 2004-05-06 20:40:21 +03:00
unknown
b52317df71 merge 
mysql-test/r/subselect.result:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2004-05-05 22:30:01 +03:00
unknown
000f76cfb8 after merge fixes 
client/mysqldump.c:
  Fixed problem with multiple tables (--skip-quote didn't work properly for second table)
myisam/myisamchk.c:
  after merge fix
 2004-05-05 21:24:21 +03:00
unknown
f6428e8bb9 caching of queries with isammerge tables forbiden using general way 
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update


mysql-test/r/subselect.result:
  do not show limit if it is not explicit
mysql-test/r/union.result:
  test of LIMIT + ORDER
mysql-test/t/union.test:
  test of LIMIT + ORDER
sql/ha_isammrg.h:
  caching of queries with isammerge tables forbiden
sql/sql_cache.cc:
  removed check on isammerge
sql/sql_lex.cc:
  tag of explicit limit in statement
sql/sql_lex.h:
  tag of explicit limit in statement
sql/sql_parse.cc:
  blanks in empty line removed
  no limit by default (SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause)
sql/sql_union.cc:
  reverted incorrect patch
sql/sql_update.cc:
  reverted incorrect patch
  correct table list passed to class constructor
sql/sql_yacc.yy:
  explicit LIMIT marked
 2004-05-05 21:21:41 +03:00
unknown
af794dde93 union.result: 
fixing typo
union.test:
  fixing type


mysql-test/t/union.test:
  fixing type
mysql-test/r/union.result:
  fixing typo
 2004-05-04 16:48:34 +03:00
unknown
a8adc4a897 union.result, union.test: 
a small fix for the test case


mysql-test/t/union.test:
  a small fix for the test case
mysql-test/r/union.result:
  a small fix for the test case
 2004-05-04 14:11:23 +03:00
unknown
19c91b7920 Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT 
mysql-test/r/union.result:
  Results for a test case for bug involving UNION's and 
  SET SQL_SELECT_LIMIT
mysql-test/t/union.test:
  Test case for bug involving UNION's and 
  SET SQL_SELECT_LIMIT
sql/sql_union.cc:
  Patch  for a bug involving UNION's and SET SQL_SELECT_LIMIT
 2004-05-03 19:15:26 +03:00
unknown
3c01162f0e removed old way to prevent using stack tables for caching Items in PS 
fixed error code in union test


mysql-test/t/union.test:
  right code worr 4.1 error
sql/log_event.cc:
  assign non-cachable for Item status for all stack tables for safety
sql/repl_failsafe.cc:
  assign non-cachable for Item status for all stack tables for safety
sql/slave.cc:
  assign non-cachable for Item status for all stack tables for safety
sql/sql_acl.cc:
  assign non-cachable for Item status for all stack tables for safety
sql/sql_base.cc:
  assign non-cachable for Item status for all stack tables for safety
  non-cachable status processing
sql/sql_cache.cc:
  assign non-cachable for Item status for all stack tables for safety
sql/sql_class.cc:
  removed ald way to prevent using stack tables for caching Items in PS
sql/sql_class.h:
  removed old way to prevent using stack tables for caching Items in PS
sql/sql_help.cc:
  assign non-cachable for Item status for all stack tables for safety
sql/sql_insert.cc:
  assign non-cachable for Item status for all stack tables for safety
  removed old way to prevent using stack tables for caching Items in PS
sql/table.h:
  non-cachable for Item status for tables
 2004-04-04 03:05:44 +03:00
unknown
526b25e263 Merge with 4.0 
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28:
  Auto merged
BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b:
  Auto merged
BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/strings/MASM6x/strings.dsp:
  Auto merged
client/mysqldump.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/t/union.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
sql/nt_servc.cc:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
sql/sql_base.cc:
  Auto merged
 2004-03-25 23:29:45 +02:00
unknown
c0a9df1aae correct support for a mix of UNION/UNION ALL in the same query. 
Bug#1428
 2004-03-23 14:43:24 +01:00
unknown
bb9584fdab union.result: 
A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
union.test:
  A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
sql_union.cc:
  A fix for a bug that allowed table names to be used in ORDER BY columns (But #3064)


sql/sql_union.cc:
  A fix for a bug that allowed table names to be used in ORDER BY columns (But #3064)
mysql-test/t/union.test:
  A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
mysql-test/r/union.result:
   A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
 2004-03-22 16:35:15 +02:00
unknown
28813a9ea9 Added test to show bug in current union implementation 
After merge fixes
Portability fixes


client/mysqltest.c:
  Fixed that unget() is done properly (needed for QNX where one can't do many ungetc() in a row)
include/errmsg.h:
  After merge fixes
mysql-test/mysql-test-run.sh:
  merge fix
mysql-test/r/system_mysql_db.result:
  Updated results for 4.1
mysql-test/r/union.result:
  Added new test
mysql-test/t/derived.test:
  Portability fix (for Mac OS X)
mysql-test/t/system_mysql_db_refs.test:
  Remove warnings
mysql-test/t/union.test:
  Added test to show bug in current union implementation (to be fixed in 4.1)
scripts/mysql_create_system_tables.sh:
  Fix wrong column define
scripts/mysql_fix_privilege_tables.sh:
  Fix for mysql-test-run
scripts/mysql_fix_privilege_tables.sql:
  Merge with 4.0 to get comments.
  Updated so that it works with privilege tables for MySQL 3.23.
sql/repl_failsafe.cc:
  After merge fix
 2004-03-19 18:33:38 +02:00
unknown
7b6b03f340 merge 
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
 2004-02-17 01:52:33 +02:00
unknown
709356d473 Changed wellformedlen to well_formed_len 
Fixed that blobs >16M can be inserted/updated
Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE


include/m_ctype.h:
  Changed wellformedlen to well_formed_len
include/mysql.h:
  Fixed comment
libmysql/libmysql.c:
  Fixed indentation
libmysqld/lib_sql.cc:
  Fixed indentation
mysql-test/r/ctype_utf8.result:
  updated warning numbers
mysql-test/r/innodb.result:
  Moved test to right place
mysql-test/r/myisam-blob.result:
  More test for blobs
mysql-test/r/rpl000002.result:
  Move test to better place
mysql-test/r/rpl_log.result:
  Move test to better place
mysql-test/r/union.result:
  Move test to better place
mysql-test/t/innodb.test:
  Moved test to right place
mysql-test/t/myisam-blob.test:
  More test of blobs
mysql-test/t/rpl000002.test:
  Move test to better place
mysql-test/t/rpl_log.test:
  Move test to better place
mysql-test/t/union.test:
  Move test to better place
sql/field.cc:
  Changed wellformedlen to well_formed_len.
  Fixed that blobs >16M can be inserted/updated (new bug)
sql/field.h:
  Code optimization
sql/sql_lex.cc:
  Changed short variable names
sql/sql_show.cc:
  Optimized quote handling
sql/sql_table.cc:
  Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE
sql/sql_union.cc:
  Added comment
strings/ctype-big5.c:
  Changed wellformedlen to well_formed_len
strings/ctype-bin.c:
  Changed wellformedlen to well_formed_len
strings/ctype-euc_kr.c:
  Changed wellformedlen to well_formed_len
strings/ctype-gb2312.c:
  Changed wellformedlen to well_formed_len
strings/ctype-gbk.c:
  Changed wellformedlen to well_formed_len
strings/ctype-latin1.c:
  Changed wellformedlen to well_formed_len
strings/ctype-mb.c:
  Changed wellformedlen to well_formed_len
strings/ctype-simple.c:
  Changed wellformedlen to well_formed_len
strings/ctype-sjis.c:
  Changed wellformedlen to well_formed_len
strings/ctype-tis620.c:
  Changed wellformedlen to well_formed_len
strings/ctype-ucs2.c:
  Changed wellformedlen to well_formed_len
  Indentation changes
strings/ctype-ujis.c:
  Changed wellformedlen to well_formed_len
strings/ctype-utf8.c:
  Changed wellformedlen to well_formed_len
 2004-02-17 01:35:17 +02:00
unknown
54d93c4153 ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its own TABLE structure 
mysql-test/r/union.result:
  fix for union test becuase now not all fields in UNION allow NULLS
  fix of test
  test suite for BUG#2809
mysql-test/t/union.test:
  test suite for BUG#2809
sql/mysql_priv.h:
  removed unused parameter of setup_tables()
sql/sql_base.cc:
  removed unused parameter of setup_tables()
  cleanup of unused code
sql/sql_class.h:
  removed unused field
sql/sql_help.cc:
  removed unused parameter of setup_tables()
sql/sql_insert.cc:
  removed unused parameter of setup_tables()
sql/sql_lex.cc:
  excluded duplicate tables finding for UNION
sql/sql_load.cc:
  removed unused parameter of setup_tables()
sql/sql_olap.cc:
  removed unused parameter of setup_tables()
sql/sql_prepare.cc:
  removed unused parameter of setup_tables()
sql/sql_select.cc:
  removed unused parameter of setup_tables()
  revert old BUG#2508 patch
sql/sql_union.cc:
  revert old BUG#2508 patch
  removed unused code
sql/sql_update.cc:
  removed unused parameter of setup_tables()
sql/table.h:
  shared used only for multi-update for now
 2004-02-17 01:14:51 +02:00
unknown
0c259c54b0 Merge with public tree 
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/m_ctype.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
mysql-test/r/warnings.result:
  Fix error numbers after merge
sql/share/czech/errmsg.txt:
  Add missing ',' and fix typo
sql/share/danish/errmsg.txt:
  Add missing ',' and fix typo
sql/share/dutch/errmsg.txt:
  Add missing ',' and fix typo
sql/share/estonian/errmsg.txt:
  Add missing ',' and fix typo
sql/share/french/errmsg.txt:
  Add missing ',' and fix typo
sql/share/german/errmsg.txt:
  Add missing ',' and fix typo
sql/share/greek/errmsg.txt:
  Add missing ',' and fix typo
sql/share/hungarian/errmsg.txt:
  Add missing ',' and fix typo
sql/share/italian/errmsg.txt:
  Add missing ',' and fix typo
sql/share/japanese/errmsg.txt:
  Add missing ',' and fix typo
sql/share/korean/errmsg.txt:
  Add missing ',' and fix typo
sql/share/norwegian-ny/errmsg.txt:
  Add missing ',' and fix typo
sql/share/norwegian/errmsg.txt:
  Add missing ',' and fix typo
sql/share/polish/errmsg.txt:
  Add missing ',' and fix typo
sql/share/portuguese/errmsg.txt:
  Add missing ',' and fix typo
sql/share/romanian/errmsg.txt:
  Add missing ',' and fix typo
sql/share/russian/errmsg.txt:
  Add missing ',' and fix typo
sql/share/slovak/errmsg.txt:
  Add missing ',' and fix typo
sql/share/spanish/errmsg.txt:
  Add missing ',' and fix typo
sql/share/swedish/errmsg.txt:
  Add missing ',' and fix typo
sql/share/ukrainian/errmsg.txt:
  Add missing ',' and fix typo
 2004-02-16 10:31:05 +02:00
unknown
a07e48eca0 After merge fixes 
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)


BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
  Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
  Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
  Added DBUG statements
  Added call of my_end() to free all used memory on exit
heap/hp_info.c:
  After merge fixes
heap/hp_open.c:
  After merge fixes
include/heap.h:
  After merge fixes
include/m_ctype.h:
  Use pchar instead of 'int' for character parameters.
  Added 'my_binary_compare()'
include/m_string.h:
  Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
  After merge fixes
innobase/srv/srv0start.c:
  After merge fixes
mysql-test/r/alter_table.result:
  Fixed results after merge
mysql-test/r/auto_increment.result:
  Fixed results after merge
mysql-test/r/bdb.result:
  Fixed results after merge
mysql-test/r/binary.result:
  Fixed results after merge
mysql-test/r/create.result:
  Fixed results after merge
mysql-test/r/ctype_mb.result:
  Fixed results after merge
mysql-test/r/ctype_tis620.result:
  Fixed results after merge
mysql-test/r/ctype_utf8.result:
  Fixed results after merge
mysql-test/r/delete.result:
  Fixed results after merge
mysql-test/r/func_compress.result:
  Fixed results after merge
mysql-test/r/func_gconcat.result:
  Fixed results after merge
mysql-test/r/func_group.result:
  Fixed results after merge
mysql-test/r/func_str.result:
  Fixed results after merge
mysql-test/r/innodb.result:
  Fixed results after merge
mysql-test/r/insert.result:
  Fixed results after merge
mysql-test/r/insert_select.result:
  Fixed results after merge
mysql-test/r/key.result:
  Fixed results after merge
mysql-test/r/loaddata.result:
  Fixed results after merge
mysql-test/r/lock.result:
  Fixed results after merge
mysql-test/r/myisam.result:
  Fixed results after merge
mysql-test/r/null.result:
  Fixed results after merge
mysql-test/r/null_key.result:
  Fixed results after merge
mysql-test/r/order_by.result:
  Fixed results after merge
mysql-test/r/query_cache.result:
  Fixed results after merge
mysql-test/r/range.result:
  Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
  Fixed results after merge
mysql-test/r/rpl_until.result:
  Fixed results after merge
mysql-test/r/subselect.result:
  Fixed results after merge
mysql-test/r/subselect_innodb.result:
  Fixed results after merge
mysql-test/r/type_blob.result:
  Fixed results after merge
mysql-test/r/type_datetime.result:
  Fixed results after merge
mysql-test/r/type_decimal.result:
  Fixed results after merge
mysql-test/r/type_enum.result:
  Fixed results after merge
mysql-test/r/type_float.result:
  Fixed results after merge
mysql-test/r/type_ranges.result:
  Fixed results after merge
mysql-test/r/type_time.result:
  Fixed results after merge
mysql-test/r/type_timestamp.result:
  Fixed results after merge
mysql-test/r/type_uint.result:
  Fixed results after merge
mysql-test/r/type_year.result:
  Fixed results after merge
mysql-test/r/variables.result:
  Fixed results after merge
mysql-test/r/warnings.result:
  Fixed results after merge
mysql-test/t/case.test:
  Fixed shifted error messages
mysql-test/t/create.test:
  Fixed shifted error messages
mysql-test/t/ctype_collate.test:
  Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
  Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
  Fixed shifted error messages
mysql-test/t/derived.test:
  Fixed shifted error messages
mysql-test/t/fulltext.test:
  Fixed shifted error messages
mysql-test/t/func_in.test:
  Fixed shifted error messages
mysql-test/t/func_str.test:
  Fixed shifted error messages
mysql-test/t/func_test.test:
  Fixed shifted error messages
mysql-test/t/grant.test:
  Fixed shifted error messages
mysql-test/t/innodb.test:
  Change to 4.1 syntax
mysql-test/t/key_cache.test:
  Fixed shifted error messages
mysql-test/t/myisam.test:
  New test of blob and end space
mysql-test/t/row.test:
  Fixed shifted error messages
mysql-test/t/rpl_until.test:
  Fixed shifted error messages
mysql-test/t/subselect.test:
  Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
  Fix test to take into account foreign key constraints
mysql-test/t/union.test:
  Fixed shifted error messages
mysql-test/t/user_var.test:
  Fixed shifted error messages
mysql-test/t/variables.test:
  Fixed shifted error messages
mysys/my_handler.c:
  Merge with 4.0 code
sql/ha_heap.cc:
  After merge fixes
sql/handler.cc:
  After merge fixes
sql/item.cc:
  After merge fixes
sql/item_cmpfunc.cc:
  Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
  Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
  More DBUG statements
  Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
  After merge fixes
sql/sql_db.cc:
  After merge fixes
sql/sql_handler.cc:
  After merge fixes
  Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
  After merge fixes
sql/sql_select.cc:
  After merge fixes
  Added function comment for setup_group()
sql/sql_string.cc:
  Added stringcmp() for binary comparison.
  Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
  Added stringcmp()
sql/sql_table.cc:
  After merge fixes
sql/sql_update.cc:
  After merge fixes
sql/sql_yacc.yy:
  Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
  Strip only end space, not other space characters.
strings/ctype-bin.c:
  Removed some not needed functions.
  Added function comments
  Don't remove end space in comparisons
  Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
  Strip only end space, not other space characters.
strings/ctype-gbk.c:
  Strip only end space, not other space characters.
strings/ctype-latin1.c:
  Strip only end space, not other space characters.
strings/ctype-mb.c:
  Strip only end space, not other space characters.
strings/ctype-simple.c:
  Strip only end space, not other space characters.
strings/ctype-sjis.c:
  Strip only end space, not other space characters.
strings/ctype-tis620.c:
  Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
  Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
  Strip only end space, not other space characters.
  Fixed indentation
strings/strto.c:
  Code cleanup
 2004-02-16 10:03:25 +02:00