An error occurred fetching the project authors.
  1. 24 Jun, 2005 1 commit
    • unknown's avatar
      Fix bug#11325 Wrong date comparison in views · fd3ac382
      unknown authored
      Wrong comparing method were choosen which results in false comparison.
      
      Make Item_bool_func2::fix_length_and_dec() to get type and field from
      real_item() to make REF_ITEM pass the check. 
      
      
      sql/item_cmpfunc.cc:
        Fix bug#11325 Wrong date comparison in views
      mysql-test/t/view.test:
        Test case for bug#11325 Wrong date comparison in views.
      mysql-test/r/view.result:
        Test case for bug#11325 Wrong date comparison in views.
      fd3ac382
  2. 23 Jun, 2005 1 commit
    • unknown's avatar
      fixed encrypt() print (BUG#7024) · 3d1172a1
      unknown authored
      mysql-test/r/view.result:
        using encrypt & substring_index in view
      mysql-test/t/view.test:
        using encrypt & substring_index in view
      sql/item_strfunc.h:
        fixed encrypt() print
      3d1172a1
  3. 22 Jun, 2005 2 commits
    • unknown's avatar
      make test result repeatable · da0c9d28
      unknown authored
      da0c9d28
    • unknown's avatar
      Fix bug#11298 insert into select from VIEW produces incorrect result · 401fa3cb
      unknown authored
        when using ORDER BY
      
      Insert were inserting data from last record fetched instead of inserting from 
      temporary table.
      
      Make Item_ref to save data from result_field if it's available rather then
      from *ref on save_in_field() call.
      
      
      
      sql/item.h:
         Fix bug#11298 insert into select from VIEW produces incorrect result when using ORDER BY
      sql/item.cc:
        Fix bug#11298 insert into select from VIEW produces incorrect result when using ORDER BY
      mysql-test/r/view.result:
        Test case for bug#11298 insert into select from VIEW produces incorrect result when using ORDER BY
      mysql-test/t/view.test:
        Test case for bug#11298 insert into select from VIEW produces incorrect result when using ORDER BY
      401fa3cb
  4. 21 Jun, 2005 2 commits
    • unknown's avatar
      fixed view fields names check and generation (changed after Trudy review:... · 612de7c6
      unknown authored
      fixed view fields names check and generation (changed after Trudy review: underlying field names treat as user set ones) (BUG#7448)
      
      
      mysql-test/r/view.result:
        test of view field names generation
      mysql-test/t/view.test:
        test of view field names generation
      sql/item.cc:
        add a flag that indicates that the name of the item was an auto-generated one and so can be changed in a view
      sql/item.h:
        add a flag that indicates that the name of the item was an auto-generated one and so can be changed in a view
        layout fixed
      sql/item_func.cc:
        line made less then 80 columns
      sql/sql_view.cc:
        fixed checking of duplicates of view fields:
        1) case-insensitive system charset/collation is used now to compare view filds
        2) in case if the duplicate field name was of an auto-generated one, we create another unique name for it
      sql/sql_yacc.yy:
        add a flag that indicates that the name of the item was an auto-generated one and so can be changed in a view
      612de7c6
    • unknown's avatar
      Fix bug #7422 "order by" doesn't work · c4257ae3
      unknown authored
      Field with wrong buffer was used to make sort key, which results in producing
      same sort key for all records.
      
      
      
      sql/filesort.cc:
        Fix bug#7422 "order by" doesn't work
      mysql-test/t/view.test:
        Test case for bug#7422 "order by" doesn't work
      mysql-test/r/view.result:
        Test case for bug#7422 "order by" doesn't work
      c4257ae3
  5. 20 Jun, 2005 1 commit
    • unknown's avatar
      fixed time_format printing (BUG#7521) · 58adb70a
      unknown authored
      mysql-test/r/view.result:
        using time_format in view (BUG#7521)
      mysql-test/t/view.test:
        using time_format in view (BUG#7521)
      sql/item_timefunc.h:
        fixed func_name reportion
      58adb70a
  6. 17 Jun, 2005 1 commit
    • unknown's avatar
      fixed printing of sum(distinct ) & avg(distinct ) & cast(... as decimal) (BUG#7015, BUG#11387) · 467ca505
      unknown authored
      mysql-test/r/view.result:
        using sum(distinct ), cast(... as decimal) & avg(distinct ) in views
      mysql-test/t/view.test:
        using sum(distinct ), cast(... as decimal) & avg(distinct ) in views
      sql/item.h:
        Add a comment for Item::print
      sql/item_func.cc:
        Use functype(), not func_name() for item equvalence detection
      sql/item_func.h:
        Missed function typoes added
        Add a comment for Item_func::func_name()
        style fix
      sql/item_strfunc.cc:
        Use functype(), not func_name() for item equvalence detection
      sql/item_strfunc.h:
        Add missing func_name and func_type
      sql/item_sum.cc:
        Item_sum func_name report beggining of function till first argument
      sql/item_sum.h:
        Item_sum func_name report beggining of function till first argument
      sql/item_timefunc.cc:
        Use functype(), not func_name() for item equvalence detection
      sql/item_timefunc.h:
        Add missing func_name and func_type
      sql/item_uniq.h:
        Add missing func_name
      467ca505
  7. 17 May, 2005 1 commit
    • unknown's avatar
      sql_yacc.yy: · afaa3c89
      unknown authored
        missing semicolon added
      sql_base.cc:
        bad merge fixed
      sp_head.cc, view.test, view.result:
        Correct restoring view name in SP table locking BUG#9758
      configure.in:
        restore -fno-implicit-templates -fno-exceptions -fno-rtti in configure
      
      
      configure.in:
        restore -fno-implicit-templates -fno-exceptions -fno-rtti in configure
      mysql-test/r/view.result:
        Correct restoring view name in SP table locking BUG#9758
      mysql-test/t/view.test:
        Correct restoring view name in SP table locking BUG#9758
      sql/sp_head.cc:
        Correct restoring view name in SP table locking BUG#9758
      sql/sql_base.cc:
        bad merge fixed
      sql/sql_yacc.yy:
        missing semicolon added
      afaa3c89
  8. 13 May, 2005 1 commit
    • unknown's avatar
      concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file · b21cf962
      unknown authored
      myisam_max_extra_sort_file_size is depricated
      Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
      Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors
      
      
      
      include/myisam.h:
        Change type of myisam_block_size and myisam_concurrent_insert to make them changeable in mysqld.cc
        Removed not used varaible myisam_max_extra_temp_length
      include/thr_lock.h:
        Added extra parameter to get_status
      myisam/mi_create.c:
        Ensure that myisam_data_pointer_size is honoured
      myisam/mi_dynrec.c:
        If 'append_insert_at_end' is set, only write at end of myisam record file
      myisam/mi_locking.c:
        Add extra argument to 'mi_get_status' to allow thr_lock to signal that we want to do a concurrent insert
        If this is used, we will append new insert rows at end of data file.
        Change mi_check_status() to allow concurrent_inserts even if there are holes in the file when myisam_concurent_insert=2
      myisam/mi_static.c:
        Change behavior of myisam_concurrent_insert so that setting this to 2 allows inserts even if there is a hole in the data file.
        Default value is 2 for MyISAM direct usage but will be set to 1 (old default) by mysqld.cc
      myisam/mi_statrec.c:
        If 'append_insert_at_end' is set, only write at end of myisam record file
      myisam/mi_write.c:
        If 'append_insert_at_end' is set, only write at end of myisam record file
      myisam/myisamdef.h:
        Support for insert-at-end even if there is holes in data file
      mysql-test/r/gis-rtree.result:
        Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
      mysql-test/r/group_min_max.result:
        Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
      mysql-test/r/index_merge.result:
        Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
      mysql-test/r/index_merge_ror.result:
        Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
      mysql-test/r/merge.result:
        Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
      mysql-test/r/myisam.result:
        Test of concurrent_insert=2
      mysql-test/r/null.result:
        Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
      mysql-test/r/preload.result:
        Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
      mysql-test/r/ps_1general.result:
        Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
      mysql-test/r/range.result:
        Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
      mysql-test/r/variables.result:
        concurrent_insert is now a integer, not a boolean
        myisam_extra_sort_file_size is deleted
      mysql-test/r/view.result:
        Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
      mysql-test/t/index_merge.test:
        Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6
      mysql-test/t/myisam.test:
        Test of concurrent_insert=2
      mysql-test/t/ps_1general.test:
        Drop test table
      mysql-test/t/variables.test:
        concurrent_insert is now a integer, not a boolean
        myisam_extra_sort_file_size is deleted
      mysql-test/t/view.test:
        Drop tables that may be left from previous tests
      mysys/thr_lock.c:
        Extra paramter to get_status to signal if concurrent_insert was used
      sql/mysqld.cc:
        concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file
        myisam_max_extra_sort_file_size is depricated
      sql/set_var.cc:
        concurrent-insert is now an integer, not a bool
        myisam_max_extra_sort_file_size is deleted
      b21cf962
  9. 10 May, 2005 1 commit
    • unknown's avatar
      Many files: · e02416c5
      unknown authored
        Fixed bug #8528.
        Representation for single-table views was made similar to
        representation for multi-table views.
      view.test:
        Added test case for bug #8528.
      view.result:
        Added test case for bug #8528. Fixed other test cases.
      
      
      mysql-test/r/view.result:
        Added test case for bug #8528. Fixed other test cases.
      mysql-test/t/view.test:
        Added test case for bug #8528.
      sql/sql_base.cc:
        Fixed bug #8528.
        Representation for single-table views was made similar to
        representation for multi-table views.
      sql/sql_delete.cc:
        Fixed bug #8528.
        Representation for single-table views was made similar to
        representation for multi-table views.
      sql/sql_insert.cc:
        Fixed bug #8528.
        Representation for single-table views was made similar to
        representation for multi-table views.
      sql/sql_parse.cc:
        Fixed bug #8528.
        Representation for single-table views was made similar to
        representation for multi-table views.
      sql/sql_prepare.cc:
        Fixed bug #8528.
        Representation for single-table views was made similar to
        representation for multi-table views.
      sql/sql_select.cc:
        Fixed bug #8528.
        Representation for single-table views was made similar to
        representation for multi-table views.
      sql/sql_update.cc:
        Fixed bug #8528.
        Representation for single-table views was made similar to
        representation for multi-table views.
      sql/sql_view.cc:
        Fixed bug #8528.
        Representation for single-table views was made similar to
        representation for multi-table views.
      sql/table.cc:
        Fixed bug #8528.
        Representation for single-table views was made similar to
        representation for multi-table views.
      sql/table.h:
        Fixed bug #8528.
        Representation for single-table views was made similar to
        representation for multi-table views.
      e02416c5
  10. 22 Apr, 2005 1 commit
    • unknown's avatar
      Fix for BUG#8490: In mysql_make_view for join algorithm views we need · 60496497
      unknown authored
      to insert view's subqueries into select_lex->slave(->next)* chain. 
      In case a join has several such views, don't add the same subqueries several times
      (this forms a loop on the above chain which breaks many parts of the code)
      
      
      mysql-test/r/view.result:
        Testcase for BUG#8490
      mysql-test/t/view.test:
        Testcase for BUG#8490
      60496497
  11. 14 Apr, 2005 1 commit
    • unknown's avatar
      information_schema.result, information_schema.test: · cfefd88d
      unknown authored
        Added a test in connection with the fix for
        bug #6106.
      view.result, view.test:
        Added test cases for bugs #6106/6107.
      sql_show.cc:
        The addition of the case for items of the type REF_ITEM in the
        function uses_only_table_name_fields became necessary after
        the fix for bug #6106.
      sql_base.cc:
        The problem was due to the fact that two different column
        references were glued together though one of them belonged to
        a subquery while another to an outer query. This caused
        eventually a wrong calculation of values for the used_tables
        attribute.
      
      
      sql/sql_base.cc:
        The problem was due to the fact that two different column
        references were glued together though one of them belonged to
        a subquery while another to an outer query. This caused
        eventually a wrong calculation of values for the used_tables
        attribute.
      sql/sql_show.cc:
        The addition of the case for items of the type REF_ITEM in the
        function uses_only_table_name_fields became necessary after
        the fix for bug #6106.
      mysql-test/t/view.test:
        Added test cases for bugs #6106/6107.
      mysql-test/r/view.result:
        Added test cases for bugs #6106/6107.
      mysql-test/t/information_schema.test:
        Added a test in connection with the fix for
        bug #6106.
      mysql-test/r/information_schema.result:
        Added a test in connection with the fix for
        bug #6106.
      cfefd88d
  12. 04 Apr, 2005 1 commit
    • unknown's avatar
      Cleanup tests and results after merge from 4.1 of embedded · 4189e7c8
      unknown authored
      server testing cleanups.
      
      
      mysql-test/r/innodb.result:
        Update results
      mysql-test/r/insert_select-binlog.result:
        Update results
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Update results
      mysql-test/r/ps_1general.result:
        Update results
      mysql-test/r/ps_grant.result:
        Update results
      mysql-test/r/view.result:
        Update results
      mysql-test/t/client_xml.test:
        Skip test with embedded server
      mysql-test/t/flush_read_lock_kill.test:
        Skip test with embedded server
      mysql-test/t/grant3.test:
        Skip test with embedded server
      mysql-test/t/information_schema.test:
        Skip test with embedded server
      mysql-test/t/innodb.test:
        Fix up filenames
      mysql-test/t/multi_update.test:
        Skip test with embedded server
      mysql-test/t/mysqlshow.test:
        Skip test with embedded server
      mysql-test/t/ps_1general.test:
        Move grant-related tests to ps_grant, and fix cleanup of filename
      mysql-test/t/ps_grant.test:
        Add additional tests
      mysql-test/t/sp-security.test:
        Skip test with embedded server
      mysql-test/t/user_limits.test:
        Skip test with embedded server
      mysql-test/t/view.test:
        Split grant-related tests to new test file view_grant
      4189e7c8
  13. 02 Apr, 2005 1 commit
    • unknown's avatar
      fix of required privileges for altering view VIEW (DELETE->DROP) (BUG#9260) · 9139be50
      unknown authored
      mysql-test/r/view.result:
        fix of required privileges for altering view VIEW (DELETE->DROP)
        new test of altering view
      mysql-test/t/view.test:
        fix of required privileges for altering view VIEW (DELETE->DROP)
        new test of altering view
      sql/sql_view.cc:
        fix of required privileges for altering view VIEW (DELETE->DROP)
      9139be50
  14. 28 Mar, 2005 1 commit
    • unknown's avatar
      fixed mechanism of detection selection from table wich we update · daddf263
      unknown authored
      (BUG##9398, BUG#8703)
      fixed wrong join view detection in multi-delete which lead to server crash
      
      
      mysql-test/r/lowercase_view.result:
        added new tests of updation and selection from the same table
      mysql-test/r/view.result:
        added new tests of updation and selection from the same table
        added test of multidelete command over join view which lead to server crash
        test suite from bugs #9398 and #8703
      mysql-test/t/lowercase_view.test:
        added new tests of updation and selection from the same table
      mysql-test/t/view.test:
        added new tests of updation and selection from the same table
        added test of multidelete command over join view which lead to server crash
        test suite from bugs #9398 and #8703
      sql/sql_base.cc:
        changed procedure of finding tables
      sql/sql_class.cc:
        added derived table procession detection
      sql/sql_class.h:
        added derived table procession detection
      sql/sql_delete.cc:
        fixed detection of selection from table which update for multidelete
      sql/sql_derived.cc:
        added derived table procession detection
      sql/sql_lex.cc:
        added detection os SELECTs processed inside derived tables
        removed old mechanism of multidelete/multiupdate table duplication detection (which can't work with views)
      sql/sql_lex.h:
        added detection os SELECTs processed inside derived tables
        removed old mechanism of multidelete/multiupdate table duplication detection (which can't work with views)
      sql/sql_parse.cc:
        removed wrong test of join view (for multidelete in can be not only first table)
      sql/sql_prepare.cc:
        added detection os SELECTs processed inside derived tables (reset it for reusing in PS/SP)
      sql/sql_select.cc:
        added detection os SELECTs processed inside derived tables
      sql/sql_update.cc:
        fixed detection of selection from table which update for multiupdate
      daddf263
  15. 15 Mar, 2005 1 commit
  16. 22 Feb, 2005 1 commit
  17. 10 Feb, 2005 1 commit
    • unknown's avatar
      Better emulation correct SELECT tree for fields expressions of merging view... · 615616b7
      unknown authored
      Better emulation correct SELECT tree for fields expressions of merging view during name resolving (BUG#6394)
      
      
      mysql-test/r/view.result:
        added test with subquery in the FROM clause
      mysql-test/t/view.test:
        added test with subquery in the FROM clause
      sql/table.cc:
        use SELECT in which view is merging as main SELECT for nameresolving to make correct support for subqueries in the view.
      615616b7
  18. 08 Feb, 2005 1 commit
    • unknown's avatar
      WL#2130: Table locking for stored FUNCTIONs · 3f249321
      unknown authored
      Collect all tables and SPs refered by a statement, and open all tables
      with an implicit LOCK TABLES. Do find things refered by triggers and views,
      we open them first (and then repeat this until nothing new is found), before
      doing the actual lock tables.
      
      
      mysql-test/r/information_schema.result:
        Updated result for WL#2130.
      mysql-test/r/lock.result:
        Updated result for WL#2130.
      mysql-test/r/sp-error.result:
        Updated result for WL#2130.
      mysql-test/r/sp.result:
        Updated result for WL#2130.
      mysql-test/r/view.result:
        Updated result for WL#2130.
      mysql-test/t/information_schema.test:
        Disabled one test case due to a bug involving LOCK TABLES,
        which shows up with WL#2130.
      mysql-test/t/lock.test:
        New error message with WL#2130. This change is under debate and might change
        in the future, but will do for now.
      mysql-test/t/sp-error.test:
        Updated for WL#2130. Some tests are voided when table access does work from
        functions.
      mysql-test/t/sp.test:
        Updated for WL#2130.
      mysql-test/t/view.test:
        Updated for WL#2130.
      sql/item_func.cc:
        We now have to set net.no_send_ok for functions too, with WL#2130.
      sql/share/errmsg.txt:
        Reused an error code since the old use was voided by WL#2130, but a new
        one was needed instead (similar, but more specific restriction).
      sql/sp.cc:
        Fixed error handling and collection of used tables for WL#2130.
      sql/sp.h:
        Fixed error handling and collection of used tables for WL#2130.
      sql/sp_head.cc:
        Added support functions for collecting and merging hash tables and lists
        of used tables from SPs and substatements, for WL#2130.
      sql/sp_head.h:
        Added support functions for collecting and merging hash tables and lists
        of used tables from SPs and substatements, for WL#2130.
      sql/sql_base.cc:
        Changed the way table->query_id is tested and set during with locked tables
        in effect. This makes some SP test cases work with WL#2130, but has a side
        effect on some error cases with explicit LOCK TABLES. It's still debated if
        this is the correct way, so it might change.
      sql/sql_class.h:
        Added flags for circumventing some interference between WL#2130 and mysql_make_view().
      sql/sql_derived.cc:
        Added some missing initializations. (Potential bugs.)
      sql/sql_lex.cc:
        Clear the new hash tables for WL#2130.
      sql/sql_lex.h:
        Added hash tables for procedures and tables too (as for functions), for WL#2130.
      sql/sql_parse.cc:
        WL#2130: Make table accesses from stored functions work by adding an implicit
        LOCK TABLES around (most) executed statements. To do this, we have to go through
        a loop where we collect all SPs and tables in mysql_execute_statement.
      sql/sql_prepare.cc:
        Cache both functions and procedures for WL#2130.
      sql/sql_show.cc:
        Added some missing initializations. (Potential bugs.)
      sql/sql_view.cc:
        Shortcut mysql_make_view() if thd->shortcut_make_view is true during
        the pre-open phase for collecting tables in WL#2130. Otherwise, the
        similar mechanism here causes interference.
      sql/sql_yacc.yy:
        For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
      3f249321
  19. 31 Jan, 2005 2 commits
    • unknown's avatar
      fixed problem with groupping by view (BUG#7116) · c02f4c5b
      unknown authored
      mysql-test/r/view.result:
        view and group_concat()
      mysql-test/t/view.test:
        view and group_concat()
      sql/item.cc:
        comments added
      sql/sql_select.cc:
        fixed ORDER/GROUP BY processing for view support
      c02f4c5b
    • unknown's avatar
      fixed problem in view over view setup (BUG#7433) · ba98de43
      unknown authored
      mysql-test/r/view.result:
        view over other view setup
      mysql-test/t/view.test:
        view over other view setup
      sql/table.cc:
        before using ancestor, check that it exists
      ba98de43
  20. 19 Jan, 2005 1 commit
  21. 18 Jan, 2005 1 commit
  22. 05 Jan, 2005 1 commit
    • unknown's avatar
      fixed views with PS protocol · 47dc78e6
      unknown authored
      mysql-test/r/view.result:
        query cache part moved to separate test
      mysql-test/t/view.test:
        query cache part moved to separate test
      sql/item_func.cc:
        fixed for safety
      sql/sql_base.cc:
        do not use real table call with view
        fixed wrapping * substitured items
        fixed fix_fields call parameter (refference)
      sql/sql_yacc.yy:
        added initialisation of SELECT in commands which can use subqueries
      sql/table.cc:
        fised fix_fields call parameter
      sql/table.h:
        new view specific method
      47dc78e6
  23. 04 Jan, 2005 1 commit
    • unknown's avatar
      After merge fixes · bd365f76
      unknown authored
      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
      bd365f76
  24. 30 Dec, 2004 1 commit
    • unknown's avatar
      After merge fixes · 2e8d13c7
      unknown authored
      config/ac-macros/character_sets.m4:
        Added latin1_spanish_ci
      dbug/dbug_analyze.c:
        Remove compiler warnings
      include/my_handler.h:
        Reorder structure arguments to be more optimal
      innobase/dict/dict0load.c:
        Fixed wrong define tag (for MySQL 5.0)
      innobase/fil/fil0fil.c:
        Fixed compiler warning
      innobase/os/os0file.c:
        Fixed compiler warning
      myisam/ft_boolean_search.c:
        Fixed compiler warning
      myisam/ft_static.c:
        Update to use new HA_KEYSEG structure
      myisam/mi_open.c:
        Simple optimization
      myisammrg/myrg_static.c:
        Removed compiler warning
      mysql-test/r/grant.result:
        Update results after merge
      mysql-test/r/index_merge.result:
        Update results after merge
      mysql-test/r/information_schema_inno.result:
        Add missing drop table
      mysql-test/r/lowercase_table.result:
        safety fix
      mysql-test/r/multi_update.result:
        safety fix
      mysql-test/r/ps_1general.result:
        safety fix
      mysql-test/r/ps_2myisam.result:
        Update results after merge
        (set is not anymore of binary type)
      mysql-test/r/ps_3innodb.result:
        Update results after merge
      mysql-test/r/ps_4heap.result:
        Update results after merge
      mysql-test/r/ps_5merge.result:
        Update results after merge
      mysql-test/r/ps_6bdb.result:
        Update results after merge
      mysql-test/r/show_check.result:
        Update results after merge
      mysql-test/r/subselect.result:
        Update results after merge
        (added missing quotes)
      mysql-test/r/timezone2.result:
        Update results after merge
      mysql-test/r/view.result:
        Update results after merge
        (note that INSERT IGNORE will work again after next merge from 4.1)
      mysql-test/t/derived.test:
        Removed empty line
      mysql-test/t/grant.test:
        Update results after merge
      mysql-test/t/information_schema_inno.test:
        added missing drop table
      mysql-test/t/lowercase_table.test:
        safety fix
      mysql-test/t/multi_update.test:
        safety fix
      mysql-test/t/ps_1general.test:
        safety fix
      mysql-test/t/view.test:
        update error codes after merge
      ndb/src/mgmsrv/main.cpp:
        after merge fix
      ndb/tools/ndb_test_platform.cpp:
        removed compiler warnings
      regex/main.c:
        remove compiler warnings
      sql/field.cc:
        Remove compiler warning
      sql/gen_lex_hash.cc:
        Added DBUG support
      sql/ha_myisam.cc:
        Removed warning from valgrind
      sql/ha_ndbcluster.cc:
        Remove compiler warning
      sql/item_cmpfunc.cc:
        Better to use val_int() instead of val_real() as we don't want Item_func_nop_all to return different value than the original ref element
      sql/mysqld.cc:
        Remove compiler warning
      sql/sql_acl.cc:
        More debugging
      sql/sql_lex.cc:
        Remove unnecessary 'else'
      sql/sql_parse.cc:
        After merge fixes
        Simplify reset of thd->server_status for SQLCOM_CALL
      sql/sql_prepare.cc:
        After merge fixes
        Removed possible core dump in mysql_stmt_fetch()
      sql/sql_update.cc:
        After merge fixes (together with Sanja)
      strings/ctype-czech.c:
        Remove compiler warning
      strings/ctype-ucs2.c:
        Remove compiler warning
      strings/ctype-win1250ch.c:
        Remove compiler warning
      strings/xml.c:
        Remove compiler warning
      tests/client_test.c:
        Fix test to work with 5.0
      vio/test-sslserver.c:
        Portability fix
      2e8d13c7
  25. 16 Dec, 2004 1 commit
  26. 29 Nov, 2004 1 commit
    • unknown's avatar
      compatibility fixes · 26fe3289
      unknown authored
      mysql-test/r/strict.result:
        fixed
      mysql-test/r/view.result:
        rolled back
      mysql-test/t/information_schema.test:
        fix for 2GB file size limit
      mysql-test/t/ps_1general.test:
        fix for 2GB file size limit
      mysql-test/t/view.test:
        fix for 2GB file size limit
      sql/field.cc:
        double->int conversion troubles
        cleanup
      sql/item_cmpfunc.h:
        warning fixed
      sql/sql_select.cc:
        division by zero fixed
      26fe3289
  27. 28 Nov, 2004 2 commits
    • unknown's avatar
      view.test: · 4c9c3f32
      unknown authored
      more max_rows for show table status
      comment spellchecking...
      
      
      mysql-test/r/view.result:
        more max_rows for show table status
      mysql-test/t/view.test:
        more max_rows for show table status
        comment spellchecking...
      4c9c3f32
    • unknown's avatar
      limit Max_data_length in 'show table status' · 63c3ab1e
      unknown authored
      63c3ab1e
  28. 25 Nov, 2004 1 commit
    • unknown's avatar
      post-merge fix · f88d0193
      unknown authored
      mysql-test/r/view.result:
        changes in error number, and key in view processing
      mysql-test/t/view.test:
        changes in error number, and key in view processing
      sql/mysql_priv.h:
        changes functions
      sql/sp.cc:
        now we report to setup_tables(), are we setuping SELECT...INSERT
      sql/sql_base.cc:
        fixed finding table, taking in account join view, which can have not TABLE pointer
        now we report to setup_tables(), are we setuping SELECT...INSERT and ennumerete insert table separately
      sql/sql_delete.cc:
        now we report to setup_tables(), are we setuping SELECT...INSERT
      sql/sql_help.cc:
        now we report to setup_tables(), are we setuping SELECT...INSERT
      sql/sql_insert.cc:
        fixed returning value of functions
      sql/sql_load.cc:
        now we report to setup_tables(), are we setuping SELECT...INSERT
        removed second setup_tables call (merge)
      sql/sql_olap.cc:
        now we report to setup_tables(), are we setuping SELECT...INSERT
      sql/sql_parse.cc:
        UPDATE->MULTIUPDATE switching fixed
      sql/sql_prepare.cc:
        UPDATE->MULTIUPDATE switching fixed
      sql/sql_select.cc:
        now we report to setup_tables(), are we setuping SELECT...INSERT
      sql/sql_update.cc:
        UPDATE->MULTIUPDATE switching fixed
      sql/sql_view.cc:
        returning value fixed
      sql/sql_view.h:
        returning value fixed
      f88d0193
  29. 05 Nov, 2004 1 commit
    • unknown's avatar
      new lock for multiupdate: · 8b0ece5e
      unknown authored
      - open and create derived tables
      - detect which tables should be locked for write
      - lock and fill derived tables
      some unitialized variables fixed
      
      
      mysql-test/r/lock_multi.result:
        correct results returned
      mysql-test/r/multi_update.result:
        correct results returned
      mysql-test/r/view.result:
        correct results returned
      mysql-test/t/multi_update.test:
        correct results returned
      mysql-test/t/view.test:
        correct results returned
      sql/mysql_priv.h:
        derived tables processing splited on table creation and table filling
      sql/sql_base.cc:
        derived tables processing splited on table creation and table filling
      sql/sql_class.h:
        function to detect when we need fill derived tables
      sql/sql_derived.cc:
        derived tables processing splited on table creation and table filling
      sql/sql_lex.cc:
        fixed uninitialized value
      sql/sql_load.cc:
        fixed uninitialized value
      sql/sql_parse.cc:
        initialization muved (will be done for all queries)
      sql/sql_prepare.cc:
        preparation of multiupdate changed a bit because new locking procedure
      sql/sql_update.cc:
        new lock for multiupdate:
        - open and create derived tables
        - detect which tables should be locked for write
        - lock and fill derived tables
      sql/table.h:
        place to store select_result between creation and filling tables
      8b0ece5e
  30. 03 Nov, 2004 1 commit
    • unknown's avatar
      Fixes after merge with 4.1 · f5a47f15
      unknown authored
      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
      
      
      BUILD/SETUP.sh:
        Portability fix
      client/mysqltest.c:
        Portability fix
      mysql-test/r/drop.result:
        updated results
      mysql-test/r/func_str.result:
        New warnings (after merge)
      mysql-test/r/insert.result:
        Updated tests
      mysql-test/r/join_nested.result:
        Updated results (because of new column types in 5.0)
      mysql-test/r/lock_multi.result:
        Temporarly wrong results until Sanja fixes multi-update-lock in 5.0
      mysql-test/r/multi_update.result:
        Temporary fix until Sanja fixes multi-update locking
      mysql-test/r/ps_1general.result:
        Update of results after merge
      mysql-test/r/ps_2myisam.result:
        Update of results after merge
      mysql-test/r/ps_3innodb.result:
        Update of results after merge
      mysql-test/r/ps_4heap.result:
        Update of results after merge
      mysql-test/r/ps_5merge.result:
        Update of results after merge
      mysql-test/r/ps_6bdb.result:
        Update of results after merge
      mysql-test/r/query_cache.result:
        Update of results after merge
      mysql-test/r/range.result:
        New results for new tests
      mysql-test/r/rpl_auto_increment.result:
        Update with new 4.0 information
      mysql-test/r/rpl_charset.result:
        After merge fixes
      mysql-test/r/subselect.result:
        After merge fixes
      mysql-test/r/view.result:
        Temporary fix until multi-update-locking is fixed
      mysql-test/t/drop.test:
        Safety fix
      mysql-test/t/multi_update.test:
        Temporary fix until multi-update-locking is fixed
      mysql-test/t/rpl_charset.test:
        More comments
      mysql-test/t/sp-error.test:
        Updated comments
      mysql-test/t/view.test:
        Temporary fix until multi-update-locking is fixed
      scripts/mysql_fix_privilege_tables.sh:
        Better error message
      sql-common/client.c:
        More debugging
      sql/ha_ndbcluster.cc:
        After merge fixes
      sql/handler.cc:
        After merge fixes
      sql/item.cc:
        Simple optimization of creating item
        After merge fixed
        Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
        The problem is that if you compare a string field to a binary string, you can't replace the field with a string constant as the binary comparison may then fail (The original field value may be in a different case)
      sql/item.h:
        Added Item::set_no_const_sub() to be able to mark fields that can't be substituted
      sql/item_cmpfunc.cc:
        Mark fields compared as binary to not be substituted.
      sql/item_func.cc:
        After merge fix
      sql/log_event.cc:
        After merge fix
      sql/mysql_priv.h:
        After merge fix
      sql/opt_range.cc:
        After merge fix
      sql/protocol.cc:
        Made flags uint instead of int (as it's used as a bit mask)
      sql/protocol.h:
        Made flags uint instead of int (as it's used as a bit mask)
      sql/protocol_cursor.cc:
        Made flags uint instead of int (as it's used as a bit mask)
        Indentation cleanups
      sql/sp.cc:
        After merge fixes
        Removed compiler warnings
      sql/sp_head.cc:
        After merge fixes
      sql/sql_base.cc:
        After merge fixes
        Removed 'send_error' from 'insert_fields()' as the error is sent higher up
      sql/sql_class.cc:
        Give assert if set_n_backup_item_arena is used twice
      sql/sql_class.h:
        Give assert if set_n_backup_item_arena is used twice
        After merge fixes
        Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
      sql/sql_handler.cc:
        After merge fixes
      sql/sql_parse.cc:
        After merge fixes
      sql/sql_prepare.cc:
        After merge fixes
      sql/sql_select.cc:
        After merge fixes
        Moved 'build_equal_items' to optimize_cond() (logical place)
      sql/sql_table.cc:
        After merge fixes
      sql/sql_trigger.cc:
        After merge fixes
      sql/sql_update.cc:
        After merge fixes
        (This should be fixed by Sanja to have lower granuality locking of tables in multi-update)
      sql/sql_view.cc:
        After merge fixes
      sql/sql_yacc.yy:
        After merge fixes
        Don't have FOUND as a reserved keyword
      f5a47f15
  31. 28 Oct, 2004 1 commit
    • unknown's avatar
      VIEW support for CHECK TABLE command (WL#1984) · 4f553314
      unknown authored
      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
      4f553314
  32. 25 Oct, 2004 1 commit
    • unknown's avatar
      fixed detection of updating table on which we select (BUG#6032) · 9f9893c9
      unknown authored
      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
      9f9893c9
  33. 22 Oct, 2004 1 commit
    • unknown's avatar
      fixed db/user privileges getting (BUG#5976) · fadcd8d3
      unknown authored
      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
      fadcd8d3
  34. 21 Oct, 2004 3 commits
    • unknown's avatar
      added support of view and CHECK OPTION of view to LOAD DATA (BUG#5996) · 4d204f43
      unknown authored
      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
      4d204f43
    • unknown's avatar
      new behaviour of CHECK option build, for mor efficience and more correct: · 149fda59
      unknown authored
      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.
      149fda59
    • unknown's avatar
      value should be checked after 'before' trigger work (BUG#5992) · 0ea04229
      unknown authored
      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
      0ea04229