Commit graph

274 commits

Author SHA1 Message Date
unknown
15ccd96103 column name changd 2004-10-12 00:45:52 +03:00
unknown
8b026230ff 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)
2004-10-10 13:15:14 +03:00
unknown
13ec43179c 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
2004-10-09 18:51:19 +03:00
unknown
1e623bb9c3 allow merging views with subqueries in WHERE clause (BUG#5504)
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
2004-10-07 22:54:31 +03:00
unknown
72ed0fc022 test of DELETE privilege and cyclic reference added in case of altering view (BUG#5148)
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
2004-10-07 15:43:04 +03:00
unknown
62ce24cf9c sql_updatable_view_key replaced with updatable_views_with_limit
now default behaviour do not prevent any updates of view.
Also updating VIEWs of queries without LIMIT clause will not be checked at all (there will not be even warning)
(changes according to discussion on last dev-conf)


mysql-test/r/view.result:
  sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
mysql-test/t/view.test:
  sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
sql/mysqld.cc:
  sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
sql/set_var.cc:
  sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
sql/sql_class.h:
  sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
sql/sql_view.cc:
  sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
sql/sql_view.h:
  sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
2004-10-07 12:13:42 +03:00
unknown
61e96be77f postmerge fix 2004-10-05 15:07:31 +03:00
unknown
75730fb37e merge
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
2004-10-05 13:41:51 +03:00
unknown
2f9c7c0b09 After merge fixes
mysql-test/r/mysqldump.result:
  Fixed tests (changed becasue of new checking of float numbers during parsing)
2004-10-05 03:05:20 +03:00
unknown
50cc3e4ab0 postmerge fix 2004-10-04 13:45:35 +03:00
unknown
40ac8462d5 merge
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
2004-09-29 17:10:17 +03:00
unknown
e05e18606b post review changes:
CHECK OPTION moved to one function
view name added to error messages


mysql-test/r/view.result:
  error messages changed
sql/share/czech/errmsg.txt:
  view name added
sql/share/danish/errmsg.txt:
  view name added
sql/share/dutch/errmsg.txt:
  view name added
sql/share/english/errmsg.txt:
  view name added
sql/share/estonian/errmsg.txt:
  view name added
sql/share/french/errmsg.txt:
  view name added
sql/share/german/errmsg.txt:
  view name added
sql/share/greek/errmsg.txt:
  view name added
sql/share/hungarian/errmsg.txt:
  view name added
sql/share/italian/errmsg.txt:
  view name added
sql/share/japanese/errmsg.txt:
  view name added
sql/share/korean/errmsg.txt:
  view name added
sql/share/norwegian-ny/errmsg.txt:
  view name added
sql/share/norwegian/errmsg.txt:
  view name added
sql/share/polish/errmsg.txt:
  view name added
sql/share/portuguese/errmsg.txt:
  view name added
sql/share/romanian/errmsg.txt:
  view name added
sql/share/russian/errmsg.txt:
  view name added
sql/share/serbian/errmsg.txt:
  view name added
sql/share/slovak/errmsg.txt:
  view name added
sql/share/spanish/errmsg.txt:
  view name added
sql/share/swedish/errmsg.txt:
  view name added
sql/share/ukrainian/errmsg.txt:
  view name added
sql/sql_class.h:
  view reference saved
sql/sql_insert.cc:
  CHECK OPTION moved to one function
sql/sql_update.cc:
  CHECK OPTION moved to one function
sql/sql_view.cc:
  view name added to error message
sql/table.cc:
  CHECK OPTION moved to one function
sql/table.h:
  CHECK OPTION moved to one function
2004-09-29 16:35:01 +03:00
unknown
66b4c82eac new show create view output
mysqldump view support (BUG#4972)
workaround to allow view work after LOCK TABLES


client/mysqldump.c:
  view support
mysql-test/r/lowercase_view.result:
  new show create view output
mysql-test/r/view.result:
  new show create view output
  test of locked views
mysql-test/t/view.test:
  new show create view output
  test of locked views
sql/sql_base.cc:
  workaround to allow view work after LOCK TABLES
sql/sql_show.cc:
  new show create view output (to help mysql dump detect views)
2004-09-24 12:50:10 +03:00
unknown
d700f3bcca SHOW CREATE VIEW (TABLE) privilege now reqiere show create privilege
(BUG#4777)


mysql-test/r/view.result:
  fixed SHOW CREATE VIEW privileges requrements
mysql-test/t/view.test:
  fixed SHOW CREATE VIEW privileges requrements
sql/sql_acl.cc:
  fixed command name
2004-09-17 22:23:59 +03:00
unknown
f284ce04c4 now we allow to careate VIEW without any privileges on view columns (except create view privilege) (BUG#5152)
mysql-test/r/view.result:
  now we allow to careate VIEW without any privileges on view columns (except create view privilege)
  test of blocking try of getting more privileges on colemn with vierw using
mysql-test/t/view.test:
  now we allow to careate VIEW without any privileges on view columns (except create view privilege)
  test of blocking try of getting more privileges on colemn with vierw using
sql/sql_view.cc:
  now we allow to careate VIEW without any privileges on view columns (except create view privilege)
2004-09-17 00:16:57 +03:00
unknown
29ec367edd updateability of field with collation support (BUG#5506)
mysql-test/r/view.result:
   Collation with view update
mysql-test/t/view.test:
   Collation with view update
sql/item.h:
  updateability of field with collation support
sql/item_strfunc.h:
  updateability of field with collation support
sql/sql_insert.cc:
  updateability of field with collation support
sql/sql_update.cc:
  updateability of field with collation support
sql/sql_view.cc:
  updateability of field with collation support
2004-09-16 23:45:20 +03:00
unknown
9aa459f0df support of join view updateability (WL#1809)
include/mysqld_error.h:
  new error mesaages
mysql-test/r/view.result:
  tests of updatint/inserting join views
mysql-test/t/view.test:
  tests of updatint/inserting join views
sql/mysql_priv.h:
  support of "usual UPDATE" -> "multi UPDATE" conversion
sql/share/czech/errmsg.txt:
  new error mesaages
sql/share/danish/errmsg.txt:
  new error mesaages
sql/share/dutch/errmsg.txt:
  new error mesaages
sql/share/english/errmsg.txt:
  new error mesaages
sql/share/estonian/errmsg.txt:
  new error mesaages
sql/share/french/errmsg.txt:
  new error mesaages
sql/share/german/errmsg.txt:
  new error mesaages
sql/share/greek/errmsg.txt:
  new error mesaages
sql/share/hungarian/errmsg.txt:
  new error mesaages
sql/share/italian/errmsg.txt:
  new error mesaages
sql/share/japanese/errmsg.txt:
  new error mesaages
sql/share/korean/errmsg.txt:
  new error mesaages
sql/share/norwegian-ny/errmsg.txt:
  new error mesaages
sql/share/norwegian/errmsg.txt:
  new error mesaages
sql/share/polish/errmsg.txt:
  new error mesaages
sql/share/portuguese/errmsg.txt:
  new error mesaages
sql/share/romanian/errmsg.txt:
  new error mesaages
sql/share/russian/errmsg.txt:
  new error mesaages
sql/share/serbian/errmsg.txt:
  new error mesaages
sql/share/slovak/errmsg.txt:
  new error mesaages
sql/share/spanish/errmsg.txt:
  new error mesaages
sql/share/swedish/errmsg.txt:
  new error mesaages
sql/share/ukrainian/errmsg.txt:
  new error mesaages
sql/sql_base.cc:
  test to avoid join virew to be catched here
sql/sql_class.h:
  support of join views add to update
sql/sql_delete.cc:
  support of join views add to delete(error issue)
sql/sql_insert.cc:
  support of join views add to insert
  (order of some check changed, to allow find table which will be inserted in, when we will know which fields will be inserted)
  mechanism of calling setup_tables() only once fixed for INSERT SELECT
sql/sql_parse.cc:
  support of "usual UPDATE" -> "multi UPDATE" conversion
  mysql_insert_select_prepare now called in same environment for usual queries and PS preparing
  support of join views add to delete (error issue)
sql/sql_prepare.cc:
  support of "usual UPDATE" -> "multi UPDATE" conversion
  support of join views add to delete (error issue)
sql/sql_update.cc:
  support of join views add to update
sql/sql_view.cc:
  join views made updatable
sql/sql_view.h:
  insert_view_fields now can check some errors
sql/table.cc:
  methods to support recursive walk by tables tree
sql/table.h:
  methods to support recursive walk by tables tree
2004-09-15 23:42:56 +03:00
unknown
55a8c28c27 fixed merged view fields names (BUG#5147)
support of merged VIEW over several tables added (WL#1809)


mysql-test/r/view.result:
  merge of VIEW with several tables
mysql-test/t/view.test:
  merge of VIEW with several tables
sql/item.cc:
  renaming Item and restoring item name on cleunup()
sql/item.h:
  renaming Item and restoring item name on cleunup()
  debug output added
sql/item_cmpfunc.h:
  setup_conds() changed to support two tables lists
sql/item_subselect.cc:
  list of table leaves used instead of local table list for name resolving
sql/mysql_priv.h:
  setup_conds() and setup_tables() changed to support two tables lists
sql/opt_sum.cc:
  list of table leaves used instead of local table list for name resolving
sql/sp.cc:
  setup_tables() changed to support two tables lists
sql/sql_base.cc:
  skip temporary tables in table finding
  fixed merged view fields names (BUG#5147)
sql/sql_delete.cc:
  setup_conds() and setup_tables() changed to support two tables lists
sql/sql_help.cc:
  setup_tables() changed to support two tables lists
sql/sql_insert.cc:
  setup_tables() changed to support two tables lists
  name handling support
sql/sql_lex.cc:
  allow view with several tables for MERGE
sql/sql_lex.h:
  new table list
sql/sql_load.cc:
  setup_tables() changed to support two tables lists
sql/sql_olap.cc:
  setup_tables() changed to support two tables lists
sql/sql_parse.cc:
  new list support
sql/sql_prepare.cc:
  new list support
sql/sql_select.cc:
  list of table leaves used instead of local table list for name resolving
sql/sql_update.cc:
  setup_conds() and setup_tables() changed to support two tables lists
sql/sql_view.cc:
  support of MERGED VIEWS with several tables
sql/sql_yacc.yy:
  removed blanks in new code
sql/table.cc:
  fixed setup view code
  support of merged VIEW over several tables added
sql/table.h:
  fixed merged view fields names (BUG#5147)
2004-09-14 19:28:29 +03:00
unknown
e4dc7e5a40 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0


mysql-test/r/view.result:
  Auto merged
2004-09-11 18:50:54 +03:00
unknown
952a778d23 Fix bad output in SHOW CREATE VIEW, update affected
test result.


mysql-test/r/view.result:
  Update test result to match sql_show.cc change.
sql/sql_show.cc:
  Fix bad output in SHOW CREATE VIEW.
2004-09-10 15:04:28 -05:00
unknown
8b2ffdbfb9 view with WHERE in nested join (BUG#5511)
mysql-test/r/view.result:
  view with WHERE in nested join
mysql-test/t/view.test:
  view with WHERE in nested join
sql/table.cc:
  fixed merging of VIEW
2004-09-10 22:39:04 +03:00
unknown
0650a2840e Merge
sql/sql_handler.cc:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged
2004-09-10 14:01:02 +03:00
unknown
ed2c4854dd merge
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2004-09-09 16:52:22 +03:00
unknown
e18b7ea959 Merge on pull
BitKeeper/etc/logging_ok:
  auto-union
include/my_sys.h:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
2004-09-09 07:26:28 +03:00
unknown
33efc9677d After merge fixes of merge with 4.1 that included the new arena code.
Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset
Prefix addresses with 0x for easier comparisons of debug logs
Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
This fix changed some 'index' queries to 'range' queries in the test suite
Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
This fix removed of a lot of 'Using where' notes in the test suite.
Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
Give NOTE instead of WARNING for safe field-type conversions


Makefile.am:
  Don't automaticly update files from bk
client/mysqlbinlog.cc:
  Merge with 4.1 (+ apply bug fixes for --offset and --start-position)
include/my_sys.h:
  Faster clear_alloc_root()
mysql-test/r/bdb.result:
  Updated results after merge
mysql-test/r/create.result:
  Updated results after merge
mysql-test/r/func_group.result:
  Updated results after merge
mysql-test/r/func_if.result:
  Updated results after merge
mysql-test/r/heap_btree.result:
  Updated results after merge
mysql-test/r/index_merge.result:
  Updated results after merge
mysql-test/r/index_merge_ror.result:
  Updated results after merge
mysql-test/r/innodb.result:
  Updated results after merge
mysql-test/r/join_outer.result:
  Updated results after merge
mysql-test/r/mysqlbinlog2.result:
  Updated results after merge
mysql-test/r/negation_elimination.result:
  Updated results after merge
mysql-test/r/null.result:
  Updated results after merge
  Added more tests
mysql-test/r/null_key.result:
  Updated results after merge
  Added more tests
mysql-test/r/order_by.result:
  Updated results after merge
mysql-test/r/range.result:
  Updated results after merge
  Added more tests
mysql-test/r/rpl_charset.result:
  Updated results after merge
mysql-test/r/sp-error.result:
  Updated results after merge
mysql-test/r/sp.result:
  Updated results after merge
  Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle
mysql-test/r/type_blob.result:
  Updated results after merge
  (Some warnings are now notes)
mysql-test/r/user_var.result:
  Updated results after merge
  Added more tests
mysql-test/r/variables.result:
  Updated results after merge
mysql-test/r/view.result:
  Updated results after merge
mysql-test/t/mysqlbinlog2.test:
  Updated tests to use new positions
mysql-test/t/null.test:
  More tests
mysql-test/t/null_key.test:
  More tests
mysql-test/t/range.test:
  More tests
mysql-test/t/rpl_charset.test:
  Avoid big diffs in the future if tests changes
mysql-test/t/sp-error.test:
  Updated error numbers
mysql-test/t/sp-security.test:
  Updated error numbers
mysql-test/t/sp.test:
  Updated results after merge
  Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle
mysql-test/t/user_var.test:
  More tests
mysql-test/t/view.test:
  Updated error numbers
mysys/my_alloc.c:
  Write into debug log the address of the allocated area
sql/ha_isam.cc:
  Prefix addresses with 0x for easier comparisons of debug logs
sql/ha_myisam.cc:
  Prefix addresses with 0x for easier comparisons of debug logs
sql/ha_ndbcluster.cc:
  Add missing enum to switch
sql/handler.cc:
  remove compiler warning
sql/item.cc:
  More debugging
  Simple cleanup
sql/item.h:
  Move Item::cleanup() to item.cc
sql/item_cmpfunc.cc:
  Fix arena code
sql/item_subselect.cc:
  After merge fixes
sql/item_subselect.h:
  After merge fixes
sql/item_sum.cc:
  Updated comment
sql/log_event.cc:
  Remove wrong test
sql/mysql_priv.h:
  Indentation fixes
sql/mysqld.cc:
  After merge fixes
  Added 0x to pointers in debug log
sql/opt_range.cc:
  Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
  This fix changed some 'index' queries to 'range' queries in the test suite
sql/set_var.cc:
  Indentation fixes
sql/sp_head.cc:
  Set state to INITIALIZED to make SP work with new arena code
sql/sql_base.cc:
  After merge fixes
sql/sql_class.cc:
  More debugging
  Use clear_alloc_root() instead of init_alloc_root() as the former is faster
sql/sql_class.h:
  New method 'only_prepare()'
sql/sql_lex.cc:
  After merge fixes
sql/sql_lex.h:
  After merge fixes
sql/sql_parse.cc:
  Fix for timezone tables. (The old way to add timezone tables to global list in 'create_total_list' doesn't work anymore)
  Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
sql/sql_prepare.cc:
  After merge fixes
sql/sql_select.cc:
  Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
  This fix removed of a lot of 'Using where' notes in the test suite
sql/sql_table.cc:
  Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
sql/sql_union.cc:
  After merge fix
sql/sql_view.cc:
  After merge fix
sql/table.cc:
  After merge fix
sql/tztime.cc:
  Update timezone table handling to use new table lists structure
sql/tztime.h:
  Update timezone table handling to use new table lists structure
sql/unireg.cc:
  Use 0x before pointers
2004-09-09 06:59:26 +03:00
unknown
7de077f7df test of updating and fetching from the same table check (BUG##5157)
mysql-test/r/lowercase_view.result:
  test of updating and fetching from the same table check
mysql-test/r/view.result:
  test of updating and fetching from the same table check
mysql-test/t/lowercase_view.test:
  test of updating and fetching from the same table check
mysql-test/t/view.test:
  test of updating and fetching from the same table check
sql/mysql_priv.h:
  unique table test
sql/sql_base.cc:
  unique table test which take into account views added
sql/sql_delete.cc:
  unique table test which take into account views added
sql/sql_insert.cc:
  unique table test which take into account views added
sql/sql_parse.cc:
  unique table test which take into account views added
sql/sql_update.cc:
  unique table test which take into account views added
sql/sql_view.cc:
  unique table test which take into account views added
sql/table.h:
  save next independent (do not belong to current view) table
2004-09-08 10:18:04 +03:00
unknown
6e0b468f18 requre BASE TABLE for HANDLER (BUG#5277)
mysql-test/r/view.result:
  HANDLER with VIEW
mysql-test/t/view.test:
  HANDLER with VIEW
sql/sql_handler.cc:
  requre BASE TABLE for HANDLER
2004-09-07 10:42:23 +03:00
unknown
44ca1f80a8 added CHECK option test for INSERT ... ON DUPLICATE KEY UPDATE (WL#1983)
mysql-test/r/view.result:
  CHECK OPTION with INSERT ... ON DUPLICATE KEY UPDATE
mysql-test/t/view.test:
  CHECK OPTION with INSERT ... ON DUPLICATE KEY UPDATE
sql/sql_class.h:
  new parameters added to save CHECK OPTION
  constructor moved
sql/sql_insert.cc:
  new parameters added to save CHECK OPTION
  check of CHECK OPTION added
  constructor moved
sql/sql_parse.cc:
  new parameters added to save CHECK OPTION
2004-09-06 23:55:36 +03:00
unknown
c05fbd4c0b merge
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  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/german/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/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/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
sql/table.h:
  Auto merged
2004-09-06 15:56:38 +03:00
unknown
0a04f6b165 do not use Item_ref for view fields if it is UPDATE of INSERT (BUG#5263)
mysql-test/r/view.result:
  INSERT into VIEW with ON DUPLICATE
mysql-test/t/view.test:
  INSERT into VIEW with ON DUPLICATE
sql/sql_insert.cc:
  do not use Item_ref for view fields if it is UPDATE of INSERT
2004-09-06 14:37:10 +03:00
unknown
704fb6daf7 CHECK OPTIONs added (WL#1983)
include/mysqld_error.h:
  new error messages
mysql-test/r/view.result:
  test of CHECK OPTION in a views
mysql-test/t/view.test:
  test of CHECK OPTION in a views
sql/share/czech/errmsg.txt:
  new error messages
sql/share/danish/errmsg.txt:
  new error messages
sql/share/dutch/errmsg.txt:
  new error messages
sql/share/english/errmsg.txt:
  new error messages
sql/share/estonian/errmsg.txt:
  new error messages
sql/share/french/errmsg.txt:
  new error messages
sql/share/german/errmsg.txt:
  new error messages
sql/share/greek/errmsg.txt:
  new error messages
sql/share/hungarian/errmsg.txt:
  new error messages
sql/share/italian/errmsg.txt:
  new error messages
sql/share/japanese/errmsg.txt:
  new error messages
sql/share/korean/errmsg.txt:
  new error messages
sql/share/norwegian-ny/errmsg.txt:
  new error messages
sql/share/norwegian/errmsg.txt:
  new error messages
sql/share/polish/errmsg.txt:
  new error messages
sql/share/portuguese/errmsg.txt:
  new error messages
sql/share/romanian/errmsg.txt:
  new error messages
sql/share/russian/errmsg.txt:
  new error messages
sql/share/serbian/errmsg.txt:
  new error messages
sql/share/slovak/errmsg.txt:
  new error messages
sql/share/spanish/errmsg.txt:
  new error messages
sql/share/swedish/errmsg.txt:
  new error messages
sql/share/ukrainian/errmsg.txt:
  new error messages
sql/sql_insert.cc:
  CHECK OPTIONs added
sql/sql_lex.h:
  CHECK OPTIONs added
sql/sql_update.cc:
  CHECK OPTIONs added
sql/sql_view.cc:
  new parameter added
  returnrd values fixed
sql/sql_yacc.yy:
  CHECK OPTIONs added
sql/table.cc:
  CHECK OPTIONs added
sql/table.h:
  CHECK OPTIONs added
2004-09-03 15:18:40 +03:00
unknown
5feaa7b677 checked INTO clause during view creation (BUG#5332)
include/mysqld_error.h:
  bug name and number of bugs fixed
mysql-test/r/view.result:
  VIEW over SELECT with prohibited clauses
mysql-test/t/view.test:
  VIEW over SELECT with prohibited clauses
sql/share/czech/errmsg.txt:
  error message made more general
sql/share/danish/errmsg.txt:
  error message made more general
sql/share/dutch/errmsg.txt:
  error message made more general
sql/share/english/errmsg.txt:
  error message made more general
sql/share/estonian/errmsg.txt:
  error message made more general
sql/share/french/errmsg.txt:
  error message made more general
sql/share/german/errmsg.txt:
  error message made more general
sql/share/greek/errmsg.txt:
  error message made more general
sql/share/hungarian/errmsg.txt:
  error message made more general
sql/share/italian/errmsg.txt:
  error message made more general
sql/share/japanese/errmsg.txt:
  error message made more general
sql/share/korean/errmsg.txt:
  error message made more general
sql/share/norwegian-ny/errmsg.txt:
  error message made more general
sql/share/norwegian/errmsg.txt:
  error message made more general
sql/share/polish/errmsg.txt:
  error message made more general
sql/share/portuguese/errmsg.txt:
  error message made more general
sql/share/romanian/errmsg.txt:
  error message made more general
sql/share/russian/errmsg.txt:
  error message made more general
sql/share/serbian/errmsg.txt:
  error message made more general
sql/share/slovak/errmsg.txt:
  error message made more general
sql/share/spanish/errmsg.txt:
  error message made more general
sql/share/swedish/errmsg.txt:
  error message made more general
sql/share/ukrainian/errmsg.txt:
  error message made more general
sql/sql_view.cc:
  checked INTO clause during view creation
2004-09-02 12:09:26 +03:00
unknown
1bbf71849f fixed bug handling in views (BUG#5276)
mysql-test/r/view.result:
  bug handlimg from VIEWs
mysql-test/t/view.test:
  bug handlimg from VIEWs
sql/sql_base.cc:
  fixed bug handling in views
2004-09-02 07:40:48 +03:00
unknown
5009663b07 fixed printing of characters casting operartion (BUG#5264)
mysql-test/r/view.result:
  view with cast operation
mysql-test/t/view.test:
  view with cast operation
sql/item_timefunc.cc:
  fixed printing of characters casting operartion
2004-09-02 00:11:40 +03:00
unknown
292f8adf50 fixed staistic of subquery if outer field resolved in merged view (BUG#5247)
mysql-test/r/view.result:
  problem with used_tables() of outer reference resolved in VIEW
mysql-test/t/view.test:
  problem with used_tables() of outer reference resolved in VIEW
sql/item.cc:
  fixed staistic of subquery if outer field resolved in merged view
2004-09-01 23:27:40 +03:00
unknown
a3695785e4 system charset (with wich VIEW printed) saved in .frm and restored before parsing view (BUG#5163)
mysql-test/r/view.result:
  VIEWs with national characters
mysql-test/t/view.test:
  VIEWs with national characters
sql/sql_view.cc:
  system charset (with wich VIEW printed) saved in .frm and restored before parsing view
sql/table.h:
  system charset (with wich VIEW printed) saved in .frm
2004-09-01 22:48:59 +03:00
unknown
321918b300 fixed printing of real constants (BUG#5160)
mysql-test/r/view.result:
  VIEW with floating point (long bumber) as column
mysql-test/t/view.test:
  VIEW with floating point (long bumber) as column
sql/item.cc:
  fixed printing of real constants
sql/item.h:
  fixed printing of real constants
2004-09-01 20:30:48 +03:00
unknown
c33897765f adding mysql.proc to table list if view contains stored procedures (BUG#5151)
mysql-test/r/view.result:
  fixed test
  VIEW over droped function
mysql-test/t/view.test:
  VIEW over droped function
sql/item_func.cc:
  after review fix
sql/sp.cc:
  hint to find mysql.proc
sql/sql_lex.h:
  hint to find mysql.proc
sql/sql_parse.cc:
  hint to find mysql.proc
sql/sql_view.cc:
  adding mysql.proc to table list if view contains stored procedures
2004-09-01 19:00:41 +03:00
unknown
d3423ca699 ORDER clause printing fixed (BUG#5156)
mysql-test/r/subselect.result:
  ORDER clause printing fixed
mysql-test/r/view.result:
  order by refers on integer field
mysql-test/t/view.test:
  order by refers on integer field
sql/sql_lex.cc:
  ORDER clause printing fixed
sql/sql_parse.cc:
  fields for correct ORDER printing added
sql/sql_select.cc:
  fields for correct ORDER printing added
sql/table.h:
  fields for correct ORDER printing added
2004-08-31 11:58:45 +03:00
unknown
6e314e047d fixed open_and_lock_tables result processing (all open_and_lock_tables revision)
fixed printing of COLLATE operation
(BUG#5155)


mysql-test/r/case.result:
  fixed printing of COLLATE operation
mysql-test/r/func_if.result:
  fixed printing of COLLATE operation
mysql-test/r/func_in.result:
  fixed printing of COLLATE operation
mysql-test/r/func_str.result:
  fixed printing of COLLATE operation
mysql-test/r/func_test.result:
  fixed printing of COLLATE operation
mysql-test/r/view.result:
  VIEW with collation
mysql-test/t/view.test:
  VIEW with collation
sql/item_strfunc.cc:
  fixed printing of COLLATE operation
sql/item_strfunc.h:
  fixed printing of COLLATE operation
sql/sp_head.cc:
  fixed open_and_lock_tables result processing
sql/sql_base.cc:
  fixed open_and_lock_tables result processing
sql/sql_delete.cc:
  fixed open_and_lock_tables result processing
sql/sql_help.cc:
  fixed open_and_lock_tables result processing
sql/sql_load.cc:
  fixed open_and_lock_tables result processing
sql/sql_parse.cc:
  fixed open_and_lock_tables result processing
sql/sql_prepare.cc:
  fixed open_and_lock_tables result processing
sql/sql_show.cc:
  fixed open_and_lock_tables result processing
sql/sql_update.cc:
  fixed open_and_lock_tables result processing
2004-08-31 10:06:38 +03:00
unknown
fa8a74b3ba fixed case when real length very close to calculated (BUG#5150)
mysql-test/r/view.result:
  tested problem when function name length close to ALIGN_SIZE
mysql-test/t/view.test:
  tested problem when function name length close to ALIGN_SIZE
sql/item_func.cc:
  fixed case when real length very close to calculated (less then ALIGN)
2004-08-30 22:52:50 +03:00
unknown
36b5ed33c8 fixed printing of stored procedure functions names (BUG#5149)
mysql-test/r/view.result:
  VIEW based on functions with  complex names
mysql-test/t/view.test:
  VIEW based on functions with  complex names
sql/item_func.cc:
  fixed printing of stored procedure functions names
2004-08-30 21:47:52 +03:00
unknown
7a6f5cf1b4 Item name for VIEW added to find_field_in_table (BUG#5147)
mysql-test/r/view.result:
  VIEW of VIEW with column renaming
mysql-test/t/view.test:
  VIEW of VIEW with column renaming
sql/mysql_priv.h:
  Item name for VIEW added to find_field_in_table
sql/sql_acl.cc:
  new parameter
sql/sql_base.cc:
  Item name for VIEW added to find_field_in_table
2004-08-27 00:08:59 +03:00
unknown
3b8c2da84e fixed updateability VIEW detection (Bug#5146)
fixed other Item_ref methods where result_field involved


mysql-test/r/view.result:
  statements added to distinct in temporary table with a VIEW test
  test of agggregate over aggregate with view
mysql-test/t/view.test:
  statements added to distinct in temporary table with a VIEW test
  test of agggregate over aggregate with view
sql/item.cc:
  fixed other Item_ref methods where result_field involved
sql/item.h:
  fixed other Item_ref methods where result_field involved
sql/sql_lex.cc:
  fixed updateability VIEW detection
2004-08-26 14:34:56 +03:00
unknown
ac0d94a98a fix of Item_ref with result_field (BUG#5104)
mysql-test/r/view.result:
  distinct in temporary table with a VIEW
mysql-test/t/view.test:
  distinct in temporary table with a VIEW
sql/item.cc:
  fix of Item_ref with result_field
sql/item.h:
  fix of Item_ref with result_field
2004-08-26 13:11:06 +03:00
unknown
7bba8128ed full text function moving to current select (BUG#4822)
mysql-test/r/view.result:
  VIEW with full text
mysql-test/t/view.test:
  VIEW with full text
sql/table.cc:
  full text function moving to current select
2004-08-25 16:14:42 +03:00
unknown
29c44654ff removing archive of .frm-s added (BUG#4821)
mysql-test/r/view.result:
  Removing database with .frm archives
mysql-test/t/view.test:
  Removing database with .frm archives
sql/parse_file.cc:
  fixed revision number printing
sql/sql_db.cc:
  removing archive of .frm-s added
2004-08-25 14:57:57 +03:00
unknown
367d882bb3 wording changed (postreview fix)
mysql-test/r/view.result:
  wording changed
sql/sql_base.cc:
  wording changed
2004-08-25 08:56:46 +03:00
unknown
d8f599bcdc fixes name outout for SHOW CREATE VIEW command (BUG#5162)
mysql-test/r/view.result:
  SHOW CREATE VIEW output changed
  test of SHOW CREATE VIEW for view with spaces in the name
mysql-test/t/view.test:
  test of SHOW CREATE VIEW for view with spaces in the name
sql/sql_show.cc:
  fixes name outout for SHOW CREATE VIEW command
2004-08-24 23:07:34 +03:00
unknown
b8785595b9 new method to detect commands where all VIEWs should be temporary tables (BUG#4803)
mysql-test/r/view.result:
  Showing VIEW with VIEWs in subquery
mysql-test/t/view.test:
  Showing VIEW with VIEWs in subquery
sql/sql_lex.cc:
  new method to detect commands where all VIEWs should be temporary tables
sql/sql_lex.h:
  new method to detect commands where all VIEWs should be temporary tables
sql/sql_view.cc:
  new method to detect commands where all VIEWs should be temporary tables
  debug output added
2004-08-24 22:51:23 +03:00