1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-07 04:01:59 +03:00

1105 Commits

Author SHA1 Message Date
monty@mysql.com
47bbf768d4 Fixes after merge with 4.1
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
2004-11-03 12:39:38 +02:00
unknown
4f553314ed VIEW support for CHECK TABLE command (WL#1984)
mysql-test/r/view.result:
  test of CHECK TABLE for VIEW
mysql-test/t/view.test:
  test of CHECK TABLE for VIEW
sql/handler.h:
  new check message
sql/sql_table.cc:
  view support for admin table
sql/sql_view.cc:
  check of view MD5 added
sql/sql_view.h:
  check of view MD5 added
2004-10-28 19:37:25 +03:00
bell@sanja.is.com.ua
13f249a025 VIEW support for CHECK TABLE command (WL#1984) 2004-10-28 19:37:25 +03:00
unknown
9f9893c971 fixed detection of updating table on which we select (BUG#6032)
mysql-test/r/view.result:
  Trys update table from which we select using views and subqueries
mysql-test/t/view.test:
  Trys update table from which we select using views and subqueries
sql/sql_acl.cc:
  fix of fix for bug BUG#5976
sql/sql_base.cc:
  protection against temporary tables which have not table->table->table_cache_key
  fixed unique check to skip the same table instences
sql/sql_delete.cc:
  removed next_independent to allow to check VIEW subqueries
sql/sql_insert.cc:
  removed next_independent to allow to check VIEW subqueries
sql/sql_parse.cc:
  removed next_independent to allow to check VIEW subqueries
sql/sql_update.cc:
  removed next_independent to allow to check VIEW subqueries
sql/sql_view.cc:
  removed next_independent to allow to check VIEW subqueries
  optimisation to mark as non-updatable views with subqueries by same table.
sql/table.h:
  removed next_independent to allow to check VIEW subqueries
2004-10-25 17:32:28 +03:00
bell@sanja.is.com.ua
3d389a038e fixed detection of updating table on which we select (BUG#6032) 2004-10-25 17:32:28 +03:00
unknown
fadcd8d3ac fixed db/user privileges getting (BUG#5976)
mysql-test/r/view.result:
  user with global DB privileges test
mysql-test/t/view.test:
  user with global DB privileges test
sql/sql_acl.cc:
  fixed db/user privileges getting
2004-10-22 15:43:22 +03:00
bell@sanja.is.com.ua
3288007235 fixed db/user privileges getting (BUG#5976) 2004-10-22 15:43:22 +03:00
unknown
4d204f4303 added support of view and CHECK OPTION of view to LOAD DATA (BUG#5996)
mysql-test/r/view.result:
  LOAD DATA with view and CHECK OPTION
mysql-test/t/view.test:
  LOAD DATA with view and CHECK OPTION
sql/log_event.cc:
  new parameter for load data
sql/mysql_priv.h:
  new parameter for load data
sql/sql_lex.cc:
  LOAD DATA supported by view
sql/sql_load.cc:
  added support of view and CHECK OPTION of view to LOAD DATA
sql/sql_parse.cc:
  new parameter for CHECK OPTION
2004-10-21 21:53:27 +03:00
bell@sanja.is.com.ua
ed7b229a28 added support of view and CHECK OPTION of view to LOAD DATA (BUG#5996) 2004-10-21 21:53:27 +03:00
unknown
149fda59dd new behaviour of CHECK option build, for mor efficience and more correct:
check option build only according most top VIEW  CHECK OPTION TYPE  (BUG#5993)


mysql-test/r/view.result:
  CASCADED should be used for all underlaying VIEWs
mysql-test/t/view.test:
  CASCADED should be used for all underlaying VIEWs
sql/sql_base.cc:
  new behaviour of CHECK option build, for mor efficience and more correct.
sql/table.cc:
  new behaviour of CHECK option build, for mor efficience and more correct.
sql/table.h:
  new behaviour of CHECK option build, for mor efficience and more correct.
2004-10-21 18:10:59 +03:00
bell@sanja.is.com.ua
926537600e new behaviour of CHECK option build, for mor efficience and more correct:
check option build only according most top VIEW  CHECK OPTION TYPE  (BUG#5993)
2004-10-21 18:10:59 +03:00
unknown
0ea0422907 value should be checked after 'before' trigger work (BUG#5992)
mysql-test/r/view.result:
  changing value by trigger and CHECK OPTION
mysql-test/t/view.test:
  changing value by trigger and CHECK OPTION
sql/sql_insert.cc:
  value should be checked after 'before' trigger work
2004-10-21 17:05:45 +03:00
bell@sanja.is.com.ua
1bd699e04c value should be checked after 'before' trigger work (BUG#5992) 2004-10-21 17:05:45 +03:00
unknown
2aad30394d inserting single value with check option failed always get error (part of BUG#5995)
mysql-test/r/view.result:
  inserting single value with check option failed always get error
mysql-test/t/view.test:
  inserting single value with check option failed always get error
sql/sql_insert.cc:
  inserting single value with check option failed always get error
2004-10-21 14:32:10 +03:00
bell@sanja.is.com.ua
73e4ac715d inserting single value with check option failed always get error (part of BUG#5995) 2004-10-21 14:32:10 +03:00
unknown
adc1bff4f8 Allow inheriting check options if view have not WHERE clause (BUG#5988)
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
2004-10-21 13:30:25 +03:00
bell@sanja.is.com.ua
370edf063d Allow inheriting check options if view have not WHERE clause (BUG#5988) 2004-10-21 13:30:25 +03:00
unknown
0b01d95d21 fixed printing of substring_index (BUG#5911)
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
2004-10-21 13:11:15 +03:00
bell@sanja.is.com.ua
84d4c4eb05 fixed printing of substring_index (BUG#5911) 2004-10-21 13:11:15 +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
bell@sanja.is.com.ua
29593da2f6 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) 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
bell@sanja.is.com.ua
c287345cb8 fixed incorrect type custing (fixed problem with runing tests with --debug (thanks, Sergei Gluhov spoted it)) 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
bell@sanja.is.com.ua
78997a2acd allow merging views with subqueries in WHERE clause (BUG#5504) 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
bell@sanja.is.com.ua
d73ba9660d 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
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
bell@sanja.is.com.ua
da5a55e3cd 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)
2004-10-07 12:13:42 +03:00
unknown
61e96be77f postmerge fix 2004-10-05 15:07:31 +03:00
bell@sanja.is.com.ua
05acd51fba 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
bell@sanja.is.com.ua
a78f817d20 merge 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
monty@mishka.local
76a315410b After merge fixes 2004-10-05 03:05:20 +03:00
unknown
50cc3e4ab0 postmerge fix 2004-10-04 13:45:35 +03:00
bell@sanja.is.com.ua
9d9c950445 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
bell@sanja.is.com.ua
013512abab merge 2004-09-29 17:10:17 +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
bell@sanja.is.com.ua
2264bb01ca new show create view output
mysqldump view support (BUG#4972)
workaround to allow view work after LOCK TABLES
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
bell@sanja.is.com.ua
74e7df0d80 SHOW CREATE VIEW (TABLE) privilege now reqiere show create privilege
(BUG#4777)
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
bell@sanja.is.com.ua
226d4ad8f4 now we allow to careate VIEW without any privileges on view columns (except create view privilege) (BUG#5152) 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
bell@sanja.is.com.ua
09b316f051 updateability of field with collation support (BUG#5506) 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
bell@sanja.is.com.ua
67fcac7a87 support of join view updateability (WL#1809) 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