1. 18 May, 2005 2 commits
  2. 17 May, 2005 17 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-10251 · c4df3abb
      unknown authored
      into mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      client/mysqltest.c:
        Auto merged
      c4df3abb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · bcdc5b74
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      bcdc5b74
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9397148d
      unknown authored
      into xiphis.org:/usr/home/antony/work2/p1-bug10246.1
      
      
      9397148d
    • unknown's avatar
      fix embedded build · 0e6674a9
      unknown authored
      
      sql/sql_acl.cc:
        style fix, long line.
        fix for embedded build which I broke
      0e6674a9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · de4ae960
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      de4ae960
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · cdba1d56
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      cdba1d56
    • unknown's avatar
      Merge · 59993e03
      unknown authored
      
      sql/sql_base.cc:
        Auto merged
      59993e03
    • unknown's avatar
      After merge fix · 3f819973
      unknown authored
      
      sql/sql_update.cc:
        Add missing join method
      3f819973
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · 92834915
      unknown authored
      into xiphis.org:/usr/home/antony/work2/p1-bug10246.1
      
      
      92834915
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · 89039f74
      unknown authored
      into xiphis.org:/usr/home/antony/work2/p1-bug10246.1
      
      
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      89039f74
    • unknown's avatar
      Bug#10246 - Parser: bad syntax for GRANT EXECUTE · 55171821
      unknown authored
        Rename some functions
        more fine-grained sp privileges
        make grant/revoke sp grammar less ambigious
      
      
      mysql-test/r/sp-security.result:
        change test for new syntax
      mysql-test/r/system_mysql_db.result:
        change test for new syntax
      mysql-test/t/sp-security.test:
        change test for new syntax
      scripts/mysql_create_system_tables.sh:
        now store routine_type for procs_priv
      scripts/mysql_fix_privilege_tables.sql:
        now store routine_type for procs_priv
      sql/item_func.cc:
        rename of function
      sql/mysql_priv.h:
        rename of function
      sql/sp_head.cc:
        extra arg for check_some_routine_access
      sql/sql_acl.cc:
        rename of function. now handle func/proc acls seperately
      sql/sql_acl.h:
        rename of function
      sql/sql_parse.cc:
        rename of function
        grants for procs handled distinctly from funcs
      sql/sql_show.cc:
        check_some_routine_access extra arg
      sql/sql_base.cc:
        fix for build
      sql/sql_yacc.yy:
        fix for build
      55171821
    • unknown's avatar
      ha_innodb.cc: · 32544f32
      unknown authored
        Fix bug #10359 : remove extra code
      
      
      sql/ha_innodb.cc:
        Fix bug #10359 : remove extra code
      32544f32
    • unknown's avatar
      ha_innodb.h, ha_innodb.cc: · 6358cdee
      unknown authored
        Fix bug #10359 : the critical AUTO-INC bug in InnoDB; since reading of the auto-inc counter in an INSERT was not protected by the AUTO-INC table lock of InnoDB, two inserted rows could get the same value for the auto-inc counter, leading to a duplicate key error
      
      
      sql/ha_innodb.cc:
        Fix bug #10359 : the critical AUTO-INC bug in InnoDB; since reading of the auto-inc counter in an INSERT was not protected by the AUTO-INC table lock of InnoDB, two inserted rows could get the same value for the auto-inc counter, leading to a duplicate key error
      sql/ha_innodb.h:
        Fix bug #10359 : the critical AUTO-INC bug in InnoDB; since reading of the auto-inc counter in an INSERT was not protected by the AUTO-INC table lock of InnoDB, two inserted rows could get the same value for the auto-inc counter, leading to a duplicate key error
      6358cdee
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug9535 · 7d740ed6
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      sql/item_strfunc.h:
        Auto merged
      7d740ed6
    • unknown's avatar
      BUG#9535 Warning for "create table t as select uuid();" · 804ce01a
      unknown authored
       - Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen
        Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5() etc will use 'ascii'
      
      
      mysql-test/r/func_misc.result:
        Test results
      mysql-test/t/func_misc.test:
        Test case
      sql/item_strfunc.h:
        Multiply max_length of Item_func_uuid with system_charset_info->mbmaxlen
      804ce01a
    • 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
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3a9ddef2
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-9643
      
      
      3a9ddef2
  3. 16 May, 2005 21 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-7800 · 9b07cafe
      unknown authored
      into mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/set_var.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      9b07cafe
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ece42b09
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-9643
      
      
      ece42b09
    • unknown's avatar
      Merge with 4.1 to get fix for memory leak · 9c71571f
      unknown authored
      
      client/mysql.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_base.cc:
        merge
      9c71571f
    • unknown's avatar
      Cleanups based on feedback from Monty. · e9beb6d0
      unknown authored
      
      sql/sql_show.cc:
        Use int10_to_str() instead of my_snprintf() for formatting number
      e9beb6d0
    • unknown's avatar
      Fix memory leak · f80fa96d
      unknown authored
      
      client/mysql.cc:
        Remove usage of c_ptr_safe() as this causes a linkage problem when compiling MySQL without inline functions
      sql/sql_base.cc:
        Don't use c_ptr_safe() on this string as this causes a realloc and the String object (allocated by sql_yacc.yy) is never freed
      f80fa96d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0500fefb
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-9643
      
      
      0500fefb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5fa009aa
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-9643
      
      
      libmysql/libmysql.c:
        Auto merged
      5fa009aa
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 50ff7274
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      50ff7274
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1c1cc00a
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-9643
      
      
      include/mysql.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      1c1cc00a
    • unknown's avatar
      A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work" · 1bb1bc69
      unknown authored
      - check on the client the unsupported feature and return 
      an error message if it's been requested.
      Additionally added API support for STMT_ATTR_PREFETCH_ROWS.
      Post-review fixes.
      
      
      include/errmsg.h:
        Add a new error code for "Not implemented" client-side error message.
      include/mysql.h:
        Add a statement attribute STMT_ATTR_PREFETCH_ROWS - unsigned long
        number of rows to fetch per one COM_FETCH command, used when there
        is a read-only cursor.
        Note, that we don't break compatibility by adding this new member
        because MYSQL_STMT is always allocated inside the client library by
        mysql_stmt_init.
      libmysql/errmsg.c:
        Text for the error message CR_NOT_IMPLEMENTED
      libmysql/libmysql.c:
        Implement support for STMT_ATTR_PREFETCH_ROWS
        Return an error message on attempt to set an attribute of a prepared
        statement which is not implemented yet. We probably should be doing
        it in the server: currently the server just ignores unknown attributes.
      tests/mysql_client_test.c:
        A test case for Bug#9643 "CURSOR_TYPE_SCROLLABLE dos not work"
        - check that an error message is returned for CURSOR_TYPE_SCROLLABLE.
        Additionally, check setting of STMT_ATTR_PREFETCH_ROWS.
      1bb1bc69
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 259699b4
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-bug10221
      
      
      259699b4
    • unknown's avatar
      4b2020c5
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 2957088d
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      2957088d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4d3d7032
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      4d3d7032
    • unknown's avatar
      After merge fixes · d15f89c4
      unknown authored
      
      mysql-test/r/alter_table.result:
        Fixed results after merge
      sql/handler.cc:
        Trivial optimzation
      sql/sql_table.cc:
        Trvial optimization
      sql/sql_yacc.yy:
        After merge fix
      sql/unireg.cc:
        Removed argument 'null_fields' from make_empty_rec() as it was not needed
        Moved assert() to right place to take bit fields into account
      d15f89c4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b9a4e7d8
      unknown authored
      into mysql.com:/my/mysql-5.0
      
      
      sql/sql_select.cc:
        Auto merged
      b9a4e7d8
    • unknown's avatar
      Fixed failing tests for not 32 bit intel machines · 70c4325d
      unknown authored
      Fixed bug in mysql_stmt_fetch() when retrieving rows to return
      
      
      mysql-test/r/ps.result:
        Fix to not get warnings if mysql_client_test.test fails
      mysql-test/t/index_merge_ror.test:
        Proper fix for 64 bit intel (which gives uses another, equal good index)
      mysql-test/t/ps.test:
        Fix to not get warnings if mysql_client_test.test fails
      sql-common/client.c:
        More debugging
      sql/sql_prepare.cc:
        Fixed bug in mysql_stmt_fetch() when retrieving rows to return
      sql/sql_select.cc:
        More debugging
      tests/mysql_client_test.c:
        More debugging
      70c4325d
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 5112e25c
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      5112e25c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 70686e25
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      70686e25
    • unknown's avatar
      Build fixes · b0fc53f3
      unknown authored
      
      configure.in:
        Fix for build problems
         - Removing extra semicolon and parentheses, this is not C++ :)
      b0fc53f3
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 03d17059
      unknown authored
      into mysql.com:/usr/home/ram/work/5.0.b10655
      
      
      03d17059