1. 09 Sep, 2004 5 commits
    • unknown's avatar
      post merge fixes · b386f888
      unknown authored
      
      mysql-test/t/merge.test:
        additional test
      sql/item.h:
        parameter to detect need of saving view field names
      sql/item_subselect.cc:
        arena fix
        used nearest thd pointer
      sql/item_sum.cc:
        after merge fix
      sql/mysql_priv.h:
        after merge fix
      sql/sql_base.cc:
        fixed unique test
        fixed postmerge arena mamgement
      sql/sql_class.h:
        mey method to detect conventional execution
      sql/sql_handler.cc:
        new parameter
      sql/sql_lex.cc:
        fixed postmerge arena mamgement
      sql/sql_parse.cc:
        fixed unique test
      sql/sql_select.cc:
        fixed postmerge arena mamgement
      sql/sql_union.cc:
        fixed postmerge arena mamgement
      sql/sql_view.cc:
        fixed postmerge arena mamgement
      sql/table.cc:
        fixed postmerge arena mamgement
      b386f888
    • unknown's avatar
      merge · ed2c4854
      unknown authored
      
      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
      ed2c4854
    • unknown's avatar
      Update after merge · bc787254
      unknown authored
      bc787254
    • unknown's avatar
      Merge on pull · e18b7ea9
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/my_sys.h:
        Auto merged
      mysql-test/r/func_in.result:
        Auto merged
      e18b7ea9
    • unknown's avatar
      After merge fixes of merge with 4.1 that included the new arena code. · 33efc967
      unknown authored
      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
      33efc967
  2. 08 Sep, 2004 3 commits
    • unknown's avatar
      Fixed BUG#5000: SPs can be created with no default database. · c92b5349
      unknown authored
        Easy to prevent crash, but the question was how to treat this case?
        We ended up implementing the "global" SPs (i.e. with no associated
        db), which were planned but left unresolved when SPs moved into dbs.
        So now things like "call .p()" work too.
      
      
      mysql-test/r/sp-error.result:
        New test case for BUG#5000, and "global" SPs in general.
      mysql-test/t/sp-error.test:
        New test case for BUG#5000, and "global" SPs in general.
      sql/sp.cc:
        Prevent crash when the new db is null.
      sql/sp_head.cc:
        Don't set the db part of the name to thd->db, we have already set it correctly
        in the provided name struct.
        Also, don't attempt to change "no-db" when executing an SP.
      sql/sql_yacc.yy:
        Added support for the "global SP" syntax, e.g ".p()".
      c92b5349
    • unknown's avatar
      Fixed BUG#5258: Stored procedure modified date is 0000-00-00. · 1bf3ce01
      unknown authored
        Althought techically not a but (as it's functioning as designed),
        it was decided that the design should be changed. Some users have
        a problem with dates being '0000-00-00' and the SQL standard specifies
        that the modification date should be the same as the creation date
        at creation.
      
      
      mysql-test/r/sp.result:
        New test case for BUG#5258.
      mysql-test/t/sp.test:
        New test case for BUG#5258.
      sql/sp.cc:
        Set the modification time at creation too.
      1bf3ce01
    • unknown's avatar
      test of updating and fetching from the same table check (BUG##5157) · 7de077f7
      unknown authored
      
      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
      7de077f7
  3. 07 Sep, 2004 4 commits
  4. 06 Sep, 2004 6 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · fcbd2485
      unknown authored
      into silver_beast.(none):/home/cps/mysql/devel/im/default_patch/mysql-5.0
      
      
      fcbd2485
    • unknown's avatar
      postmerge fix (found by Dmitry) · 9c551080
      unknown authored
      
      sql/item.cc:
        postmerge fix
      9c551080
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ca41ecff
      unknown authored
      into silver_beast.(none):/home/cps/mysql/devel/im/default_patch/mysql-5.0
      
      
      ca41ecff
    • unknown's avatar
      Fixed memory allocation: allocated memory wasn't enough to store the · 898e363c
      unknown authored
      final 0 of the string.
      
      
      mysys/default.c:
        Wrong memory allocation fixed.
      898e363c
    • unknown's avatar
      Merge with 4.1 · 4ad51359
      unknown authored
      (Includes merge of arena code in 4.1 and 5.0)
      
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      VC++Files/sql/mysqld.dsp:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/mysql.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      libmysql/client_settings.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      libmysqld/examples/Makefile.am:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/r/connect.result:
        Auto merged
      mysql-test/r/ctype_recoding.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/func_in.result:
        Auto merged
      mysql-test/r/func_like.result:
        Auto merged
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/having.result:
        Auto merged
      mysql-test/r/heap.result:
        Auto merged
      mysql-test/r/join.result:
        Auto merged
      mysql-test/r/key.result:
        Auto merged
      mysql-test/r/lowercase_table.result:
        Auto merged
      mysql-test/r/ndb_autodiscover.result:
        Auto merged
      mysql-test/r/null.result:
        Auto merged
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/range.result:
        Auto merged
      mysql-test/r/rename.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      mysql-test/t/null.test:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      mysql-test/t/rpl_charset.test:
        Auto merged
      mysql-test/t/rpl_heap.test:
        Auto merged
      mysql-test/t/rpl_relayrotate.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      netware/mysql_test_run.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      scripts/mysql_create_system_tables.sh:
        Auto merged
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/records.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_acl.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_rename.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_string.h:
        Auto merged
      sql/table.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      client/mysqlbinlog.cc:
        Merge with 4.1
      configure.in:
        Merge with 4.1
      include/mysqld_error.h:
        Add new error message (1) from 4.1
      mysql-test/mysql-test-run.sh:
        Merge with 4.1
      mysql-test/r/func_gconcat.result:
        Merge with 4.1
      mysql-test/r/func_if.result:
        Merge with 4.1
      mysql-test/r/grant.result:
        Merge with 4.1
      mysql-test/r/join_outer.result:
        Merge with 4.1
      mysql-test/r/rpl_charset.result:
        Merge with 4.1 (This has to be fixed before pushing)
      mysql-test/r/system_mysql_db.result:
        Merge with 4.1.
        Added collation to new privileges
      mysql-test/t/grant.test:
        Merge with 4.1
      mysql-test/t/grant_cache.test:
        Merge with 4.1
      mysql-test/t/show_check.test:
        Merge with 4.1
      sql/Makefile.am:
        Merge with 4.1
      sql/item.cc:
        Merge with 4.1
      sql/item_cmpfunc.cc:
        Merge with 4.1 (arena code)
      sql/item_subselect.cc:
        Merge with 4.1
      sql/item_subselect.h:
        Merge with 4.1
      sql/item_sum.cc:
        Merge with 4.1
      sql/item_sum.h:
        Merge with 4.1
      sql/log.cc:
        Merge with 4.1 (Remove code that is not relevant for 5.0)
      sql/mysqld.cc:
        Merge with 4.1
      sql/opt_range.cc:
        Merge with 4.1
      sql/share/czech/errmsg.txt:
        Merge with 4.1
      sql/share/danish/errmsg.txt:
        Merge with 4.1
      sql/share/dutch/errmsg.txt:
        Merge with 4.1
      sql/share/english/errmsg.txt:
        Merge with 4.1
      sql/share/estonian/errmsg.txt:
        Merge with 4.1
      sql/share/french/errmsg.txt:
        Merge with 4.1
      sql/share/german/errmsg.txt:
        Merge with 4.1
      sql/share/greek/errmsg.txt:
        Merge with 4.1
      sql/share/hungarian/errmsg.txt:
        Merge with 4.1
      sql/share/italian/errmsg.txt:
        Merge with 4.1
      sql/share/japanese/errmsg.txt:
        Merge with 4.1
      sql/share/korean/errmsg.txt:
        Merge with 4.1
      sql/share/norwegian-ny/errmsg.txt:
        Merge with 4.1
      sql/share/norwegian/errmsg.txt:
        Merge with 4.1
      sql/share/polish/errmsg.txt:
        Merge with 4.1
      sql/share/portuguese/errmsg.txt:
        Merge with 4.1
      sql/share/romanian/errmsg.txt:
        Merge with 4.1
      sql/share/russian/errmsg.txt:
        Merge with 4.1
      sql/share/serbian/errmsg.txt:
        Merge with 4.1
      sql/share/slovak/errmsg.txt:
        Merge with 4.1
      sql/share/spanish/errmsg.txt:
        Merge with 4.1
      sql/share/swedish/errmsg.txt:
        Merge with 4.1
      sql/share/ukrainian/errmsg.txt:
        Merge with 4.1
      sql/sql_base.cc:
        Merge with 4.1
      sql/sql_class.cc:
        Merge with 4.1
        Use arena code from 4.1
      sql/sql_class.h:
        Merge with 4.1
        Use arena code from 4.1
      sql/sql_derived.cc:
        Merge with 4.1
      sql/sql_lex.cc:
        Merge with 4.1
      sql/sql_lex.h:
        Merge with 4.1
      sql/sql_parse.cc:
        Merge with 4.1
      sql/sql_prepare.cc:
        Merge with 4.1
      sql/sql_select.cc:
        Merge with 4.1
      sql/sql_table.cc:
        Merge with 4.1
      sql/sql_union.cc:
        Merge with 4.1
      sql/sql_yacc.yy:
        Merge with 4.1
      sql/tztime.cc:
        Merge with 4.1
      tests/client_test.c:
        Merge with 4.1
      4ad51359
    • unknown's avatar
      do not use Item_ref for view fields if it is UPDATE of INSERT (BUG#5263) · 0a04f6b1
      unknown authored
      
      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
      0a04f6b1
  5. 05 Sep, 2004 2 commits
  6. 04 Sep, 2004 6 commits
    • unknown's avatar
      After merge fixes · 9a63c8e0
      unknown authored
      9a63c8e0
    • unknown's avatar
      memory leaks fixed · d7d2712f
      unknown authored
      
      sql/sql_derived.cc:
        memory leak fixed
      sql/sql_view.cc:
        memory leak fixed
      d7d2712f
    • unknown's avatar
      Merge with 4.0 to get latest bug fixes · e85e5739
      unknown authored
      
      configure.in:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/share/dutch/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      mysql-test/r/union.result:
        Merge with 4.0
      mysql-test/t/union.test:
        Merge with 4.0
      sql/ha_innodb.cc:
        Merge with 4.0
      sql/share/german/errmsg.txt:
        Merge with 4.0
      sql/share/portuguese/errmsg.txt:
        Merge with 4.0
      sql/share/russian/errmsg.txt:
        Merge with 4.0
      sql/sql_parse.cc:
        Merge with 4.0
      sql/sql_union.cc:
        Merge with 4.0 (Keep 4.1 code)
      e85e5739
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · d75ea9bc
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      
      mysql-test/r/view.result:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.h:
        Auto merged
      d75ea9bc
    • unknown's avatar
      Print value of Item_param if it has a value (when debugging) · fa3bfbe4
      unknown authored
      
      libmysql/libmysql.c:
        More debug
      sql/item.h:
        Print value of param if it has a value (when debugging)
      sql/log.cc:
        Better variable name
      sql/sql_insert.cc:
        Fix bug casused by merge
      sql/sql_parse.cc:
        Added missing command names (caused crash when running with --debug)
      sql/sql_select.cc:
        More debugging
      sql/sql_yacc.yy:
        Fixed typo
      tests/client_test.c:
        More debugging
      fa3bfbe4
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · a6d00f2e
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
      
      
      a6d00f2e
  7. 03 Sep, 2004 13 commits
    • unknown's avatar
      merged · c0c7e8f5
      unknown authored
      c0c7e8f5
    • unknown's avatar
      BUG#5327 - mi_sort_index() of 2-level tree · f4565513
      unknown authored
      f4565513
    • unknown's avatar
      Merge with pulled code · 99be6d30
      unknown authored
      
      mysql-test/r/view.result:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.h:
        Auto merged
      tests/client_test.c:
        Auto merged
      sql/sql_base.cc:
        Merge
      sql/sql_insert.cc:
        Merge
      sql/sql_select.cc:
        Merge
      sql/sql_view.cc:
        Merge
      sql/table.cc:
        Merge
      99be6d30
    • unknown's avatar
      A fix for bug#4368 '"like" fails in PreparedStatement, crashes · 14c4d0d7
      unknown authored
      server': the bug occurs when arguments of LIKE function are in 
      differentcharacter sets. If these character sets are compatible, 
      we create an item-converter. In prepared mode, this item
      needs to be created in memory of current prepared statement.
      
      
      mysql-test/r/ps.result:
        Test for Bug#4368 added.
      mysql-test/t/ps.test:
        A test case for bug#4368 '"like" fails in PreparedStatement, 
        crashes server'.
      14c4d0d7
    • unknown's avatar
      define macro "DEFINE_ALL_CHARACTER_SETS" in the configure.in completely · 6a5f9b41
      unknown authored
      
      configure.in:
        define macro "DEFINE_ALL_CHARACTER_SETS" completely
      6a5f9b41
    • unknown's avatar
      Cleanup of new code pushed into 5.0 since last pull · d0211cf5
      unknown authored
      Merged the different find_xxxx_table_in_list functions to one + some inline functions
      
      
      mysql-test/r/view.result:
        Fix result (remove not used view from show tables)
      sql/item_subselect.cc:
        Remove not used functions
      sql/item_subselect.h:
        Remove not used functions
      sql/mysql_priv.h:
        Merged the different find_xxxx_table_in_list functions to one + some inline functions
      sql/sql_acl.cc:
        More debugging + simple cleanups
      sql/sql_base.cc:
        Merged the different find_xxxx_table_in_list functions to one + some inline functions
        Indentation cleanups & more comments
      sql/sql_delete.cc:
        Namechange
      sql/sql_insert.cc:
        Simple optimizations & Style cleanups
        Merged common code (in mysql_prepare_insert_check_table)
      sql/sql_lex.cc:
        function name changes
        More comments
      sql/sql_parse.cc:
        Function name changes
        Made check_one_table_access returning bool
        More debugging in 'check_access'
        Added function 'check_some_access', which is used when creating a view
      sql/sql_prepare.cc:
        Resetting flag directly after test makes code easier to read
      sql/sql_select.cc:
        Code simplifications
      sql/sql_show.cc:
        Indentation cleanups.
        Fixed typo in name
      sql/sql_update.cc:
        Function name change
      sql/sql_view.cc:
        Simple optimizations.
        Style fixes.
        Remove view_field_names[]
        Simplified 'check_key_in_view()'
      sql/table.cc:
        Simplified new code in openfrm()
        variable name change i -> item
        Indentation changes
      sql/table.h:
        Fixed typo in variable name
        Method name change in field iterator: end() -> end_of_fields()
      tests/client_test.c:
        Changed number to macro
      d0211cf5
    • unknown's avatar
      ufter review fix · 1948909a
      unknown authored
      
      sql/sql_view.cc:
        name of variable changed to make merge easy
        removed charset field
      sql/table.h:
        removed charset field
        layout fixed
      1948909a
    • unknown's avatar
      sql_yacc.yy: · 0d34c635
      unknown authored
        Allow FROM or IN in SHOW KEYS, as in other SHOW statements.
      
      
      sql/sql_yacc.yy:
        Allow FROM or IN in SHOW KEYS, as in other SHOW statements.
      0d34c635
    • unknown's avatar
      Fix for bug #4373: \u behaves differently · 164c5145
      unknown authored
      164c5145
    • unknown's avatar
      add engine=MyISAM to all create table statements in · f7f85eb6
      unknown authored
      mysql_create_system_tables, just in case
      
      
      scripts/mysql_create_system_tables.sh:
        add engine=MyISAM to all create table statements, just in case
      f7f85eb6
    • unknown's avatar
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · c1f29705
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
      
      
      configure.in:
        Auto merged
      c1f29705
    • unknown's avatar
      1. discarded term.h from the distribution · 37aad6bb
      unknown authored
      2. changed key_* to el_ley_* in the libedit key.h
         (because it's in the conflict with the aix definitions)
      3. use libedit_term.h instead of term.h in the cmd-line-utils/libedit/el.h
      4. added definition of MIN in the cmd-line-utils/libedit/read.c 
         (if it wasn't defined yet)
      5. discarded definition of SUNOS macro from configure.in 
         (now we don't include term.h in the el.h at all)
      
      
      BitKeeper/deleted/.del-term.h~23716a5310508e0:
        Delete: cmd-line-utils/libedit/term.h
      cmd-line-utils/libedit/Makefile.am:
        discarded term.h from the distribution
      cmd-line-utils/libedit/el.c:
        changed 
        key_init -> el_key_init
        key_end -> el_key_end
      cmd-line-utils/libedit/el.h:
        change 
          #include "term.h" 
        to 
          #include "libedit_term.h"
      cmd-line-utils/libedit/key.c:
        changed functions key_... to el_key_... 
        because it's in conflict with the aix definitions
      cmd-line-utils/libedit/key.h:
        changed functions key_... to el_key_... 
        because it's in conflict with the aix definitions
      cmd-line-utils/libedit/map.c:
        changed functions key_... to el_key_... 
        because it's in conflict with the aix definitions
      cmd-line-utils/libedit/read.c:
        1. added definition of MIN
        2. fixed problems with undefined uint
        3. changed key_get to el_key_get
      cmd-line-utils/libedit/term.c:
        1. discarded #include "term.h" at all
        2. changed functions key_* to el_key_*
        3. add declaration of el_key__decode_str
      cmd-line-utils/libedit/tty.c:
        changed functions key_... to el_key_... 
        because it's in conflict with the aix definitions
      configure.in:
        discarded definition of SUNOS macro
        (libedit doesn't require it anymore)
      37aad6bb
  8. 02 Sep, 2004 1 commit