mysql-test/r/view.result:
  test of cascaded check option for whiew without WHERE clause
mysql-test/t/view.test:
  test of cascaded check option for whiew without WHERE clause
sql/table.cc:
  Allow inheriting check options if view have not WHERE clause

mysql-test/r/func_str.result:
  fixed printing of substring_index
mysql-test/r/view.result:
  test of substring_index with view
mysql-test/t/view.test:
  test of substring_index with view
sql/item_strfunc.h:
  fixed printing of substring_index

  Fixed bug #6187: a wrong initial setting for const_item_cache
  in Item_cond::fix_fields.


sql/item_cmpfunc.cc:
  Fixed bug #6187: a wrong initial setting for const_item_cache
  in Item_cond::fix_fields.
mysql-test/r/func_test.result:
  Fixed bug #6187: a wrong initial setting for const_item_cache
  in Item_cond::fix_fields.

sql/opt_range.cc:
  A fix (bug #6142: SELECT DISTINCT on key field crashes server)
  Code clean-up.

strings/Makefile.am:
  cleanup

test results corrected


mysql-test/r/range.result:
  test results corrected
mysql-test/t/range.test:
  test results corrected
sql/opt_range.cc:
  compatibility fix

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


BitKeeper/etc/ignore:
  auto-union

strings/llstr.c:
  small optimization
BitKeeper/etc/ignore:
  Added strings/test_decimal to the ignore list

  Change parsing of @image argument.


Docs/Support/texi2html:
  Change parsing of @image argument.

NO SQL
CONTAINS SQL (default)
READS SQL DATA
MODIFIES SQL DATA

These are needed as hints for the replication.
(Before this, we did have the default in the mysql.proc table, but no support in the parser.)


mysql-test/r/sp.result:
  Modified test cases for new data access characteristics.
mysql-test/t/sp.test:
  Modified test cases for new data access characteristics.
scripts/mysql_create_system_tables.sh:
  We now support all the SP data access characteristics (not just CONTAINS SQL).
scripts/mysql_fix_privilege_tables.sql:
  We now support all the SP data access characteristics (not just CONTAINS SQL).
sql/lex.h:
  New tokens for SP data access characteristics.
sql/sp.cc:
  Store, print and support alter of data access characteristics.
sql/sp_head.cc:
  Added SP_ prefix to some symbols.
sql/sql_lex.h:
  Added SP_ prefix to some symbols, and added SP data access enum.
sql/sql_yacc.yy:
  Parse SP data access characteristics.
  (And allow "alter ... language sql", mostly as a formality, it was accidently
   put in the wrong clause before.)

sql/opt_range.cc:
  - Pulled code related to WL#1724 outside of #ifndef DBUG_OFF ... #endif which was put there incorrectly
  - Moved all print procedures/method back into one place.

into mysql.com:/home/timka/mysql/src/5.0-1724

server-tools/instance-manager/manager.cc:
  Unnecessary incudes removed
server-tools/instance-manager/mysqlmanager.cc:
  Added missing includes

server-tools/instance-manager/manager.cc:
  missing includes added

server-tools/instance-manager/Makefile.am:
  fixed typo

BitKeeper/etc/ignore:
  Added server-tools/instance-manager/mysqlmanager to the ignore list

sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/key.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/opt_range.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge

sql/item.cc:
  Document actual behavior.
sql/opt_range.cc:
  - Added a test for range predicates comparing incomparable argumens
  - Removed TRP_GROUP_MIN_MAX class members that are not used.
  - Uncommented CPU cost
  - More standard function return values
sql/sql_select.cc:
  Remove unnecessary test.

fix privileges for old style privileges tables on fly (as it do mysql_fix_privilege_tables dut if we have not it run)
fixed forgoten test


mysql-test/r/ps_1general.result:
  SHOW TABLE putput changed
sql/sql_acl.cc:
  fix privileges for old style privileges tables on fly (as it do mysql_fix_privilege_tables dut if we have not it run)

showing table type now is controled by new parameter 'FULL' of SHOW TABLES command (SHOW FULL TABLES) (as it was decided on last dev conf)


mysql-test/r/connect.result:
  returned SHOW TABLES default behaviour
mysql-test/r/ctype_recoding.result:
  returned SHOW TABLES default behaviour
mysql-test/r/drop.result:
  returned SHOW TABLES default behaviour
mysql-test/r/lowercase_table.result:
  returned SHOW TABLES default behaviour
mysql-test/r/rename.result:
  returned SHOW TABLES default behaviour
mysql-test/r/rpl000009.result:
  returned SHOW TABLES default behaviour
mysql-test/r/rpl_error_ignored_table.result:
  returned SHOW TABLES default behaviour
mysql-test/r/select.result:
  returned SHOW TABLES default behaviour
mysql-test/r/sp.result:
  returned SHOW TABLES default behaviour
mysql-test/r/system_mysql_db.result:
  returned SHOW TABLES default behaviour
mysql-test/r/view.result:
  test of new parameter od SHOW TABLES and default behaviour without parameter
mysql-test/t/view.test:
  test of new parameter od SHOW TABLES and default behaviour without parameter
sql/mysql_priv.h:
  parameter added to mysqld_show_tables
sql/sql_parse.cc:
  parameter added to mysqld_show_tables
sql/sql_show.cc:
  showing table type now is controled by new parameter 'FULL' of SHOW TABLES command (SHOW FULL TABLES)
sql/sql_yacc.yy:
  showing table type now is controled by new parameter 'FULL' of SHOW TABLES command (SHOW FULL TABLES)

prevent filling temporary tables of views on list fields command


sql/opt_range.cc:
  debug output fixed
sql/sql_base.cc:
  prevent substituting Item_ref as VIEW fields in WHERE conditions
sql/sql_parse.cc:
  prevent filling temporary tables of views on list fields command

into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0

fixed incorrect type custing (fixed problem with runing tests with --debug (thanks, Sergei Gluhov spoted it))


mysql-test/r/view.result:
  PS with multiupdate and view with collate
mysql-test/t/view.test:
  PS with multiupdate and view with collate
sql/sql_update.cc:
  fixed incorrect type custing

Fixed small error in new .FRM parser which caused it to handle 
improperly escaped strings.


mysql-test/r/trigger.result:
  Added test for bug #5887 "Triggers with string literals cause errors".
mysql-test/t/trigger.test:
  Added test for bug #5887 "Triggers with string literals cause errors".
sql/parse_file.cc:
  read_escaped_string(): We should not fail when we meet \' sequence 
  in escaped string.

into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0

Portability fix (Got different results for double -> longlong when compiling with full optimization)

into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0


sql/sql_yacc.yy:
  Auto merged

mysql-test/r/view.result:
  test of subqueries in merged views
mysql-test/t/view.test:
  test of subqueries in merged views
sql/item_subselect.h:
  new method tu return place of subquery
sql/sql_lex.cc:
  allow merging views with subqueries in WHERE clause
sql/sql_view.cc:
  allow merging views with subqueries in WHERE clause

Now simply give an error if no database. (The "global SP feature" will be
done using PATH instead.)


mysql-test/r/sp-error.result:
  Removed test cases for undone "feature".
mysql-test/t/sp-error.test:
  Removed test cases for undone "feature".
sql/sql_parse.cc:
  Check if created procedure/function has a database; give error if not.
sql/sql_yacc.yy:
  Undid the "global SP feature".

fixed ALTER VIEW syntax
fixed WITH CHECK OPTION clause printing in SHOW CREATE VIEW


mysql-test/r/view.result:
  test of VIEW altering
mysql-test/t/view.test:
  test of VIEW altering
sql/lex.h:
  explicitly mentioned undefined algorithm
sql/sql_show.cc:
  explicitly mentioned undefined algorithm
  added printing WITH CHECK OPTION clause
sql/sql_view.cc:
  test of DELETE privilege and cyclic reference added in case of altering view
  effective and requested WITH CHECK OPTION parameters divided
sql/sql_yacc.yy:
  fixed ALTER VIEW
sql/table.cc:
  effective and requested WITH CHECK OPTION parameters divided
sql/table.h:
  effective and requested WITH CHECK OPTION parameters divided