1. 31 Oct, 2007 1 commit
    • unknown's avatar
      Remove net_printf_error(). Do not talk to network directly in · bfae4730
      unknown authored
      check_user()/check_connection()/check_for_max_user_connections().
      
      This is a pre-requisite patch for the fix for Bug#12713 "Error in a stored 
      function called from a SELECT doesn't cause ROLLBACK of statem"
      
      Implement review comments.
      
      
      sql/mysql_priv.h:
        check_for_max_user_connections() is used in one place only, make it static.
      sql/mysqld.cc:
        Remove net_printf_error(): a consolidation of error reporting facilities
        is necessary to simplify maintenance of the query cache, the 
        client-server protocol, stored procedure continue handlers. 
        Rewrite the only place where its use is somewhat justified 
        (my_error() can not be used since we need to report an error for the thread 
        that does not exist) with my_snprintf()/net_send_error().
      sql/protocol.cc:
        Remove net_printf_error().
      sql/protocol.h:
        Remove net_printf_error().
      sql/sql_connect.cc:
        Remove net_printf_error(). In check_connection()/check_user()/
        check_for_max_user_connections() do not write directly to the network,
        but use the standard my_error() mechanism to record an error in THD.
        It will be sent to the client by the caller. This was the last place
        in the server that would attempt to send an error directly, mainly left 
        untouched by 5.0 refactoring because it is executed only during 
        thread startup.
      sql/sql_parse.cc:
        In the old code, when res was greater than 0, it contained an exact 
        error code, e.g. ER_OUT_OF_RESOURCES or NO SUCH DATABASE, 
        or ER_HANDSHAKE_ERROR. I don't know the reason why this error code was 
        ignored, and instead a generic  ER_UNKNOWN_COM_ERROR was pushed into the
        error stack, but knowing the relaxed attitude towards preserving the error
        codes in the old code, I'm inclinded to think that it was a bug.
        
        After this patch, the most specific error message is already pushed,
        so calling my_message() again is useless.
        
        If res is < 0, the error used to be already sent. This is not done
        by the new code, but will be done later, in the end
        of dispatch_command(). When this is done, clear_error() will be called 
        for us - it is in the first lines of do_command.
        
        To sum up, this change is to remove COM_CHANGE_USER specific error handling
        in favor of the standard one employed for all other COM_* commands.
      bfae4730
  2. 30 Oct, 2007 5 commits
    • unknown's avatar
      In ha_delete_table, use a standard mechanism to intercept the error message · 8365a74e
      unknown authored
      and convert it to a warning instead of direct manipulation with the
      thread error stack.
      Fix a bug in handler::print_erorr when a garbled message was
      printed for HA_ERR_NO_SUCH_TABLE.
      This is a pre-requisite patch for the fix for Bug#12713 Error in a stored
      function called from a SELECT doesn't cause ROLLBACK of statem
      
      
      sql/handler.cc:
        Use a standard mechanism to intercept the error message, instead
        of direct manipulation with thread error stack. 
        Fix a bug when for HA_ERR_NO_SUCH_TABLE handler::print_error() would
        print a garbled message.
      sql/log.cc:
        Extend internal error handler interface to carry the message text.
      sql/mysqld.cc:
        Extend internal error handler interface to carry the message text.
      sql/sql_base.cc:
        Extend internal error handler interface to carry the message text.
      sql/sql_class.cc:
        Extend internal error handler interface to carry the message text.
      sql/sql_class.h:
        Extend internal error handler interface to carry the message text.
      sql/sql_error.cc:
        Extend internal error handler interface to carry the message text.
      8365a74e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 1430f4de
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime-inc-2
      
      
      sql/sql_connect.cc:
        Manual merge.
      1430f4de
    • unknown's avatar
      Use an inline getter method (thd->is_error()) to query if there is an error · 24370012
      unknown authored
      in THD.
      In future the error may be stored elsewhere (not in net.report_error) and 
      it's important to start using an opaque getter to simplify merges.
      
      
      sql/filesort.cc:
        net.report_error -> is_error()
      sql/ha_ndbcluster_binlog.cc:
        net.report_error -> is_error()
      sql/item_func.cc:
        net.report_error -> is_error()
      sql/item_subselect.cc:
        net.report_error -> is_error()
      sql/set_var.cc:
        net.report_error -> is_error()
      sql/sp.cc:
        net.report_error -> is_error()
      sql/sp_head.cc:
        net.report_error -> is_error()
      sql/sql_base.cc:
        net.report_error -> is_error()
      sql/sql_class.cc:
        net.report_error -> is_error()
      sql/sql_class.h:
        net.report_error -> is_error()
      sql/sql_connect.cc:
        net.report_error -> is_error()
      sql/sql_delete.cc:
        net.report_error -> is_error()
      sql/sql_insert.cc:
        net.report_error -> is_error()
      sql/sql_parse.cc:
        net.report_error -> is_error()
      sql/sql_prepare.cc:
        net.report_error -> is_error()
      sql/sql_select.cc:
        net.report_error -> is_error()
      sql/sql_union.cc:
        net.report_error -> is_error()
      sql/sql_update.cc:
        net.report_error -> is_error()
      sql/sql_view.cc:
        net.report_error -> is_error()
      sql/sql_yacc.yy:
        net.report_error -> is_error()
      24370012
    • unknown's avatar
      Fix failing init_connect.test (5.1-runtime). · d4d4ba9a
      unknown authored
      
      sql/sql_connect.cc:
        Fix failing init_connect.test (5.1-runtime). Add comments for the unjustified use
        of thd->is_slave_error.
      d4d4ba9a
    • unknown's avatar
      Make sure rpl.rpl_innodb_mixed_dml passes even if rpl_mixed.dat is read-only. · 5f4783cf
      unknown authored
      This is important for a development environment where not all source files
      are checked out.
      
      
      5f4783cf
  3. 29 Oct, 2007 4 commits
    • unknown's avatar
      Merge lambda.weblab:/home/malff/TREE/mysql-5.1-base · f1390330
      unknown authored
      into  lambda.weblab:/home/malff/TREE/mysql-5.1-rt-merge
      
      
      mysql-test/include/mix1.inc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      f1390330
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 08edbe4e
      unknown authored
      into  lambda.weblab:/home/malff/TREE/mysql-5.1-rt-merge
      
      
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/t/udf.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/udf_example.c:
        Auto merged
      sql/udf_example.def:
        Auto merged
      08edbe4e
    • unknown's avatar
      Fix for BUG#27610: ALTER TABLE ROW_FORMAT=... does not · 7c92f118
      unknown authored
      rebuild the table.
      
      The problem was that ROW_FORMAT clause in ALTER TABLE did not trigger
      table reconstruction.
      
      The fix is to rebuild a table if ROW_FORMAT is specified.
      
      
      mysql-test/include/mix1.inc:
        Add a test case for BUG#27610: ALTER TABLE ROW_FORMAT=... does not
        rebuild the table.
      mysql-test/r/innodb_mysql.result:
        Update result file.
      sql/sql_table.cc:
        Rebuild a table if ROW_FORMAT was specified in ALTER TABLE.
      7c92f118
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · 7d9c59b7
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      7d9c59b7
  4. 25 Oct, 2007 2 commits
    • unknown's avatar
      Mimic a rename which Daniel already did in 6.0, · a71a829a
      unknown authored
      to get rid of a name clash among *deleted* files on case-insignificant file systems.
      
      
      BitKeeper/deleted/.del-changelog-bleh:
        Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh
      a71a829a
    • unknown's avatar
      Bug#30854 (Tables name show as binary in slave err msg on vm-win2003-64-b) · 35ca78a0
      unknown authored
      The root cause of this defect is that a call to my_error() is using a
      'LEX_STRING' parameter instead of a 'char*'
      
      This patch fixes the failing calls to my_error(), as well as similar calls
      found during investigation.
      
      This is a compiling bug (see the instrumentation in the bug report), no test cases provided.
      
      
      sql/sql_base.cc:
        Fix broken calls to "..." (va_args) functions.
      sql/sql_table.cc:
        Fix broken calls to "..." (va_args) functions.
      35ca78a0
  5. 24 Oct, 2007 2 commits
  6. 23 Oct, 2007 26 commits
    • unknown's avatar
      result fix · b987945d
      unknown authored
      b987945d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · e085211d
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/type_datetime.test:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/type_datetime.result:
        after merge fix
      e085211d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · fa0e1d6b
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      fa0e1d6b
    • unknown's avatar
      after merge fix · 985e4a64
      unknown authored
      985e4a64
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 95a8bb20
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/client_priv.h:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/query_cache.result:
        manual merge
      mysql-test/include/mix1.inc:
        manual merge
      mysql-test/r/innodb_mysql.result:
        manual merge
      mysql-test/r/type_datetime.result:
        manual merge
      mysql-test/r/type_decimal.result:
        manual merge
      mysql-test/t/query_cache.test:
        manual merge
      mysql-test/t/type_datetime.test:
        manual merge
      mysql-test/t/type_decimal.test:
        manual merge
      sql/item.cc:
        manual merge
      95a8bb20
    • unknown's avatar
      Patch for BUG#30736: Row Size Too Large Error Creating a Table and · 6044965c
      unknown authored
      Inserting Data.
      
      The problem was that under some circumstances Field class was not
      properly initialized before calling create_length_to_internal_length()
      function, which led to assert failure.
      
      The fix is to do the proper initialization.
      
      The user-visible problem was that under some circumstances
      CREATE TABLE ... SELECT statement crashed the server or led
      to wrong error message (wrong results).
      
      
      mysql-test/r/select.result:
        Update result file.
      mysql-test/t/select.test:
        Add a test case for BUG#30736: Row Size Too Large Error
        Creating a Table and Inserting Data.
      sql/sql_table.cc:
        Move sql_field->decimals initialization before
        sql_field->create_length_to_internal_length() call.
      6044965c
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 8479eb1d
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/type_datetime.result:
        manual merge
      mysql-test/r/type_decimal.result:
        manual merge
      mysql-test/t/type_datetime.test:
        manual merge
      mysql-test/t/type_decimal.test:
        manual merge
      sql/item.cc:
        manual merge
      8479eb1d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 6e8919b0
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      6e8919b0
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c448d2ed
      unknown authored
      into  mysql.com:/home/hf/work/30638/my50-30638
      
      
      c448d2ed
    • unknown's avatar
      Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt · 72bd96ae
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
      
      
      72bd96ae
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30638/my50-30638 · f102f668
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      
      sql/opt_range.cc:
        Auto merged
      storage/heap/ha_heap.cc:
        Auto merged
      f102f668
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt · 21469c40
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      
      21469c40
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 · de3eb8fb
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      
      de3eb8fb
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f7f8ca8b
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
      
      
      f7f8ca8b
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 2d4639c4
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
      
      
      2d4639c4
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 619bb76b
      unknown authored
      into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
      
      
      sql/filesort.cc:
        SCCS merged
      619bb76b
    • unknown's avatar
      type conversions fixed to get rid of warnings · 4e5c8bc7
      unknown authored
      
      sql/ha_heap.cc:
        type conversion fix
      sql/opt_range.cc:
        type conversion fix
      4e5c8bc7
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30638/my50-30638 · 0fb0e7ac
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      
      0fb0e7ac
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 0c77be95
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      
      0c77be95
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 09c8f3e6
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
      
      
      09c8f3e6
    • unknown's avatar
      merge 5.0-opt -> 5.1-opt for bug 30825 · 6875b402
      unknown authored
      6875b402
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 73d08e3a
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
      
      
      73d08e3a
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30638/my50-30638 · 707fd691
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      
      sql/opt_range.cc:
        merging
      707fd691
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · bfa5dd2f
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
      
      
      bfa5dd2f
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 084753af
      unknown authored
      into  mysql.com:/home/hf/work/30638/my50-30638
      
      
      084753af
    • unknown's avatar
      type conversion fixed to get rid of warnings · 8262c4f4
      unknown authored
      
      sql/opt_range.cc:
        type conversion fixed
      8262c4f4