1. 26 Sep, 2005 1 commit
  2. 25 Sep, 2005 2 commits
  3. 24 Sep, 2005 3 commits
  4. 23 Sep, 2005 28 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 470163fe
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-merge-sept24
      
      470163fe
    • unknown's avatar
      Manually merged · 20f97e88
      unknown authored
      
      myisam/mi_check.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/func_in.test:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_select.cc:
        Manually merged.
      20f97e88
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · fca9188f
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-bug13419
      
      fca9188f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · cf1cf307
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      cf1cf307
    • unknown's avatar
      6690e461
    • unknown's avatar
      Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 · 0c5c8a6b
      unknown authored
      into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
      
      
      sql/mysqld.cc:
        merge
      0c5c8a6b
    • unknown's avatar
      mysqld.cc: · a0754c9a
      unknown authored
        Fix out-of-order status variable.
      
      
      sql/mysqld.cc:
        Fix out-of-order status variable.
      a0754c9a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 2a50e32c
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      2a50e32c
    • unknown's avatar
      mysqld.cc: · d894a22c
      unknown authored
        Fix out-of-order status variable.
      
      
      sql/mysqld.cc:
        Fix out-of-order status variable.
      d894a22c
    • unknown's avatar
      row0ins.c: · b9cc841b
      unknown authored
        Fix a compilation error: Visual C++ does not seem to allow variable declaration in the middle of a program block
      
      
      innobase/row/row0ins.c:
        Fix a compilation error: Visual C++ does not seem to allow variable declaration in the middle of a program block
      b9cc841b
    • unknown's avatar
      Fix for yet another compilation failure on Windows which was introduced during · b16c4cd7
      unknown authored
      work on WL#2787 "Add view definer/owner to the view definition (.frm) to check
      privileges on used tables and stored routines when using a VIEW."
      (aka bug #13402 "Windows VS 2003 Compiler error")
      
      
      sql/mysqld.cc:
        handle_connections_namedpipes():
          THD::host member has moved to the Security_context class.
          New THD::security_ctx member points to active security context.
      b16c4cd7
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-13361 · eaa1565c
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/item_strfunc.cc:
        Auto merged
      eaa1565c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 17654a77
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg13407
      
      17654a77
    • unknown's avatar
      Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 · e5a8cb25
      unknown authored
      into  127.(none):/home/osku/mysql/5.0/clean
      
      e5a8cb25
    • unknown's avatar
      Merge 127.(none):/home/osku/mysql/5.0/clean · bb4e92b7
      unknown authored
      into  127.(none):/home/osku/mysql/5.0/3443
      
      
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/include/trx0trx.h:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      mysql-test/r/innodb.result:
        Merge fixes.
      mysql-test/t/innodb.test:
        Merge fixes.
      bb4e92b7
    • unknown's avatar
      Fix bug #3443, better foreign key error messsages. · 3e7edb2b
      unknown authored
      
      innobase/dict/dict0dict.c:
        Add 'add_newline' parameter to dict_print_info_on_foreign_key_in_create_format.
      innobase/include/dict0dict.h:
        Add 'add_newline' parameter to dict_print_info_on_foreign_key_in_create_format.
      innobase/include/os0file.h:
        Add os_file_read_string.
      innobase/include/trx0trx.h:
        Add trx_set_detailed_error and trx_set_detailed_error_from_file functions
        and a detailed_error field to trx_struct.
      innobase/include/ut0mem.h:
        Add ut_strlcpy.
      innobase/os/os0file.c:
        Add os_file_read_string.
      innobase/row/row0ins.c:
        Add row_ins_set_detailed function and call it when needed.
        
        Adapt to changes in dict_print_info_on_foreign_key_in_create_format.
      innobase/trx/trx0trx.c:
        Add trx_set_detailed_error and trx_set_detailed_error_from_file.
        
        Clear trx->detailed_error in trx_create.
      innobase/ut/ut0mem.c:
        Add ut_strlcpy.
      mysql-test/r/innodb.result:
        Add new tests, adapt existing ones whose output was changed.
      mysql-test/t/innodb.test:
        Add new tests, adapt existing ones whose output was changed.
      sql/ha_innodb.cc:
        Add get_error_message.
        
        Clear trx->detailed_error in start_stmt and external_lock.
      sql/ha_innodb.h:
        Add get_error_message.
      sql/handler.cc:
        Add special case code in print_error for HA_ERR_ROW_IS_REFERENCED and
        HA_ERR_NO_REFERENCED_ROW.
        
        Change SETMSG to point to new error messages.
      sql/share/errmsg.txt:
        Add ER_ROW_IS_REFERENCED_2 and ER_NO_REFERENCED_ROW_2.
      3e7edb2b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0204f57d
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg13407
      
      
      sql/mysqld.cc:
        Auto merged
      0204f57d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · da379e4b
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-rmuqf
      
      da379e4b
    • unknown's avatar
      Fixed race conditions in rpl_multi_update and rpl_multi_delete tests which · 8ff2411c
      unknown authored
      caused spurious test failures.
      
      
      mysql-test/t/rpl_multi_delete.test:
        Fixed race condition in test that caused spurious test failure.
        To have predictable result from statements which are run on slave we
        need to sync master and slave explicitly.
      mysql-test/t/rpl_multi_update.test:
        Fixed race condition in test that caused spurious test failure.
        To have predictable result from statements which are run on slave we
        need to sync master and slave explicitly.
      8ff2411c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3ffdca83
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      3ffdca83
    • unknown's avatar
      Merge from 4.1 to 5.0 · 34666c3b
      unknown authored
      
      mysql-test/r/loaddata.result:
        Add drop tablea after test case
      mysql-test/r/type_decimal.result:
        Update warnings
      mysql-test/r/union.result:
        Miss in merge
      mysql-test/t/loaddata.test:
        Add drop table after test case
      sql/opt_sum.cc:
        Add missing }
      sql/sql_load.cc:
        Manual merge
      34666c3b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · bca1622a
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/handler.cc:
        Auto merged
      bca1622a
    • unknown's avatar
      InnoDB: Minor fixes. · 1d07a1c5
      unknown authored
      
      innobase/include/trx0trx.h:
        Fix invalid comment.
      sql/ha_innodb.cc:
        Change some memory allocations to fail-on-error.
        
        Cast argument of my_free to gptr, not char*.
      1d07a1c5
    • unknown's avatar
      Fix for BUG#13419: In "ref" optimizer, take into account that item=Item_func_in(x,y) is · 970e3930
      unknown authored
      not equivalent to "x=y" when item->negated == TRUE.
      
      
      mysql-test/r/func_in.result:
        Testcase for BUG#13419
      mysql-test/t/func_in.test:
        Testcase for BUG#13419
      sql/sql_select.cc:
        Fix for BUG#13419:
        * Take into account that item=Item_func_in(x,y) is not equivalent to "x=y" when 
          item->negated == TRUE.
        * Removed comment that is no longer true.
      970e3930
    • unknown's avatar
      Merge 127.(none):/home/osku/mysql/5.0/clean · 9c2ce93a
      unknown authored
      into  127.(none):/home/osku/mysql/5.0/13315
      
      9c2ce93a
    • unknown's avatar
      InnoDB: Fix bug #13315, index columns having a maximum length of 767. · 2e34a089
      unknown authored
      
      innobase/data/data0data.c:
        Adapt to DICT_MAX_COL_PREFIX_LEN rename.
      innobase/dict/dict0dict.c:
        Adapt to DICT_MAX_COL_PREFIX_LEN rename.
      innobase/include/dict0mem.h:
        Rename DICT_MAX_COL_PREFIX_LEN to DICT_MAX_INDEX_COL_LEN.
      innobase/include/row0mysql.h:
        Add field_lengths parameter to row_create_index_for_mysql.
      innobase/rem/rem0rec.c:
        Adapt to DICT_MAX_COL_PREFIX_LEN rename.
      innobase/row/row0mysql.c:
        Add field_lengths parameter to row_create_index_for_mysql and use it to
        check for too long index columns.
      mysql-test/r/innodb.result:
        New tests.
      mysql-test/t/innodb.test:
        New tests.
      sql/ha_innodb.cc:
        Create temporary field_lengths buffer and pass it to
        row_create_index_for_mysql.
      2e34a089
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · e739669c
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      mysql-test/t/func_group.test:
        Auto merged
      mysql-test/t/loaddata.test:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/r/func_group.result:
        Manual merge
      mysql-test/r/loaddata.result:
        Manual merge
      mysql-test/r/type_decimal.result:
        Manual merge
      mysql-test/r/union.result:
        Manual merge
      sql/field_conv.cc:
        aborting fix for 7589
      sql/opt_sum.cc:
        Manual merge
      sql/sql_load.cc:
        Manual merge
      sql/sql_yacc.yy:
        Aborting fix for 11553
      e739669c
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · dba69910
      unknown authored
      into  zim.(none):/home/brian/mysql/fix-5.0
      
      
      sql/handler.cc:
        Auto merged
      dba69910
  5. 22 Sep, 2005 6 commits
    • unknown's avatar
      This fixed bug 13369. Note, I dislike goto's as well. · fb16683e
      unknown authored
      The alias structure now is a bit more simple and just uses a pointer to replace with the currect name. The giant case statement should go away in the next patch.
      
      
      sql/handler.cc:
        Simplified the code, annd fixed build issue with engines not being compiled.
        I disliek the goto but Serg preferred it over the testing of aliases first :)
      sql/handler.h:
        Removed ht from alias structure.
      fb16683e
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · c4eee8bd
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_sys.h:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/ctype_ujis.test:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      c4eee8bd
    • unknown's avatar
      Bug #13384 mysqltest, no protocol when script contains only lines with eval · 9a0ee3bf
      unknown authored
      
      client/mysqltest.c:
        Set query_executed also for eval, that results in a query being executed and output is
        likely. Commited once again in 5.0
      9a0ee3bf
    • unknown's avatar
      Bug #13384 mysqltest, no protocol when script contains only lines with eval · 7d63ea33
      unknown authored
      
      client/mysqltest.c:
        Set query_executed also for eval, that results in a query being executed and output is likely.
      7d63ea33
    • unknown's avatar
      Fix for bug #13407 "Remote connecting crashes server" and couple of similar · 351d8e39
      unknown authored
      problems which were introduced during work on WL#2787 "Add view definer/owner
      to the view definition (.frm) to check privileges on used tables and stored
      routines when using a VIEW."
      
      In some cases it is better to use value from Security_context::host_or_ip
      instead of value from Security_context::host since the latter can be NULL
      in certain situations (When we can't resolve hostname or we have not done
      this yet).
      
      
      mysql-test/r/skip_name_resolve.result:
        Added test for bug #13407 "Remote connecting crashes server".
      mysql-test/t/skip_name_resolve.test:
        Added test for bug #13407 "Remote connecting crashes server".
      sql/item_strfunc.cc:
        Item_func_user::val_str():
          It is better to use value from Security_context::host_or_ip instead of
          value from Security_context::host in the result of USER() function since
          the latter can be NULL in certain situations (When we can't resolve hostname
          or we have not done this yet. Reverted back to old code).
      sql/mysqld.cc:
        handle_connections_shared_memory():
         THD::host member has moved to the Security_context class.
         New THD::security_ctx member points to active security context.
      sql/sql_show.cc:
        mysqld_list_processes():
          It is better to use value from Security_context::host_or_ip instead of
          value from Security_context::host in the processlist since the latter
          can be NULL in certain situations (When we can't resolve hostname or we
          have not done this yet. Reverted back to old code).
      351d8e39
    • unknown's avatar
      Fix handling of NULL values in decimal fields in FORMAT(). (Bug #13361) · 9068084f
      unknown authored
      
      mysql-test/r/func_str.result:
        Add new results
      mysql-test/t/func_str.test:
        Add new regression test
      sql/item_strfunc.cc:
        Handle NULL decimal fields in FORMAT().
      9068084f