1. 17 Sep, 2003 1 commit
    • unknown's avatar
      SCRUM · 6b05f916
      unknown authored
      prepared statements in embedded library
      
      
      include/mysql.h:
        stmt_execute 'virtual' method added
      include/sql_common.h:
        two functions became global
      libmysql/client_settings.h:
        declaration for cli_stmt_execute
      libmysql/libmysql.c:
        some functions changed to be usable from embedded library
      libmysqld/lib_sql.cc:
        code for embedded stmt_execute added
      sql-common/client.c:
        cli_stmt_execute added to the methods table
      sql/client_settings.h:
        no need for prepared statements in miniclient
      6b05f916
  2. 16 Sep, 2003 8 commits
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · eead70fe
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.stmt
      
      
      eead70fe
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 076b089a
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.stmt
      
      
      076b089a
    • unknown's avatar
      UCS tests · 414bd57b
      unknown authored
      414bd57b
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3952cb0f
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.stmt
      
      
      sql/sql_class.h:
        Auto merged
      3952cb0f
    • unknown's avatar
      SCRUM · d0580715
      unknown authored
      Prepared statements in embedded server
      Several changes in library code with two goals:
      to make mysql_prepare_stmt working in embedded server
      to get rid of #define mysql_interface_func mysql->methods->interface_func
      in user's interface
      
      
      include/mysql.h:
        modifications of interface
        two goals: to implement prepared statements and to get rid
        of #define mysql_proc (mysql->smth) in interface
      include/sql_common.h:
        read_rows function got 'virtual'
      libmysql/client_settings.h:
        interface of some functions declared in client.c moved here
      libmysql/libmysql.c:
        several functions changed with declared goals
      libmysqld/embedded_priv.h:
        libmysqld.c <--> lib_sql.cc interface moved here
      libmysqld/lib_sql.cc:
        all embedded 'virtual' functions moved here so they can be static
      libmysqld/libmysqld.c:
        embedded 'virtual' function was moved out of here
      sql-common/client.c:
        several changes with the declared goal
      sql/sql_class.h:
        place to store statement data added to THD
      sql/sql_prepare.cc:
        storing of prepare_statement result for embedded server added
      d0580715
    • unknown's avatar
      Bug fix: · 62f2cb14
      unknown authored
      http://bugs.mysql.com/bug.php?id=1264
      
      
      62f2cb14
    • unknown's avatar
      Bug fix: · a0c238f6
      unknown authored
      http://bugs.mysql.com/bug.php?id=1264
      
      
      a0c238f6
    • unknown's avatar
      Bug fix: · 0ebd55fc
      unknown authored
      http://bugs.mysql.com/bug.php?id=1129
      From:	Georg Richter
      Description: there is a problem with special chars like umlauts in comments 
      
      
      
      0ebd55fc
  3. 15 Sep, 2003 14 commits
  4. 14 Sep, 2003 3 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5d1b299f
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-868
      
      
      5d1b299f
    • unknown's avatar
      Post merge fixes. Fixed tests after adding UNTIL conditions · b15eba88
      unknown authored
      to SHOW SLAVE STATUS.
      
      
      mysql-test/r/rpl000015.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_empty_master_crash.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_error_ignored_table.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_flush_log_loop.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_loaddata.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_log.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_log_pos.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_max_relay_size.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_openssl.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_redirect.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_replicate_do.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_reset_slave.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_rotate_logs.result:
        Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
      mysql-test/r/rpl_until.result:
        Post merge fix
      mysql-test/t/rpl_until.test:
        Post merge fix
      b15eba88
    • unknown's avatar
      e3b11b1d
  5. 13 Sep, 2003 7 commits
    • unknown's avatar
      Manual merge after commiting START SLAVE UNTIL · 1f82a0de
      unknown authored
      
      sql/lex.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      include/mysqld_error.h:
        Manual merge
      mysql-test/r/rpl000015.result:
        Manual merge
      mysql-test/r/rpl_empty_master_crash.result:
        Manual merge
      mysql-test/r/rpl_flush_log_loop.result:
        Manual merge
      mysql-test/r/rpl_log.result:
        Manual merge
      mysql-test/r/rpl_log_pos.result:
        Manual merge
      mysql-test/r/rpl_redirect.result:
        Manual merge
      mysql-test/r/rpl_replicate_do.result:
        Manual merge
      mysql-test/r/rpl_rotate_logs.result:
        Manual merge
      sql/share/czech/errmsg.txt:
        Manual merge
      sql/share/danish/errmsg.txt:
        Manual merge
      sql/share/dutch/errmsg.txt:
        Manual merge
      sql/share/english/errmsg.txt:
        Manual merge
      sql/share/estonian/errmsg.txt:
        Manual merge
      sql/share/french/errmsg.txt:
        Manual merge
      sql/share/german/errmsg.txt:
        Manual merge
      sql/share/greek/errmsg.txt:
        Manual merge
      sql/share/hungarian/errmsg.txt:
        Manual merge
      sql/share/italian/errmsg.txt:
        Manual merge
      sql/share/japanese/errmsg.txt:
        Manual merge
      sql/share/korean/errmsg.txt:
        Manual merge
      sql/share/norwegian-ny/errmsg.txt:
        Manual merge
      sql/share/norwegian/errmsg.txt:
        Manual merge
      sql/share/polish/errmsg.txt:
        Manual merge
      sql/share/portuguese/errmsg.txt:
        Manual merge
      sql/share/romanian/errmsg.txt:
        Manual merge
      sql/share/russian/errmsg.txt:
        Manual merge
      sql/share/serbian/errmsg.txt:
        Manual merge
      sql/share/slovak/errmsg.txt:
        Manual merge
      sql/share/spanish/errmsg.txt:
        Manual merge
      sql/share/swedish/errmsg.txt:
        Manual merge
      sql/share/ukrainian/errmsg.txt:
        Manual merge
      sql/slave.cc:
        Manual merge
      sql/slave.h:
        Manual merge
      sql/sql_repl.cc:
        Manual merge
      sql/sql_yacc.yy:
        Manual merge
      1f82a0de
    • unknown's avatar
      Implemented support for START SLAVE UNTIL (WL#868) · 2f8f0a7e
      unknown authored
      
      include/mysqld_error.h:
        Added error codes for warnings and error messages for START SLAVE UNTIL
      mysql-test/r/rpl000015.result:
        Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
      mysql-test/r/rpl_empty_master_crash.result:
        Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
      mysql-test/r/rpl_flush_log_loop.result:
        Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
      mysql-test/r/rpl_log.result:
        Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
      mysql-test/r/rpl_log_pos.result:
        Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
      mysql-test/r/rpl_redirect.result:
        Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
      mysql-test/r/rpl_replicate_do.result:
        Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
      mysql-test/r/rpl_rotate_logs.result:
        Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
      sql/lex.h:
        Added UNTIL symbol
      sql/log.cc:
        Invalidating until_log_name comparison result if group_relay_log_name is changed
      sql/log_event.cc:
        Invalidating until_log_name comparison result if group_master_log_name is changed
      sql/repl_failsafe.cc:
        Cancel until condition if LOAD MASTER DATA is executed
      sql/share/czech/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/danish/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/dutch/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/english/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/estonian/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/french/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/german/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/greek/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/hungarian/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/italian/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/japanese/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/korean/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/norwegian-ny/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/norwegian/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/polish/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/portuguese/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/romanian/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/russian/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/serbian/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/slovak/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/spanish/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/swedish/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/share/ukrainian/errmsg.txt:
        Added error and warning message for START SLAVE UNTIL
      sql/slave.cc:
        Fixed wrong locking order in init_relay_log_pos()
        Added until condition fields to SHOW SLAVE STATUS
        Added checking if UNTIL condition is reached 
        (added proper method, added its invocation, reorganized locking 
        in exec_relay_log_event() and next_event())
      sql/slave.h:
        Members in RELAY_LOG_INFO for storing UNTIL condition. Also 
        methods for for invalidation of cached UNTIL condition comparison
        results
      sql/sql_repl.cc:
        Now honoring UNTIL clause then starting slave thread. Proper 
        errors and warnings.
      sql/sql_yacc.yy:
        Added support for UNTIL clause in START SLAVE. This involved 
        extraction of some of master_defs to separate master_file_def
        non-terminal.
      2f8f0a7e
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · df8b036d
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.1
      
      
      df8b036d
    • unknown's avatar
      Fixes for OPTION_FOUND_ROWS in UNION's · aedc0ab0
      unknown authored
      
      mysql-test/r/subselect.result:
        A warning added to subselect test due to the recent changes.
        
        UNION in sub-select returns the empty set, which is why this warning is
        a mistery to me.
      mysql-test/r/union.result:
        two changes.
        
        First one is due to the proper handling of LIMIT offset, limit in 
        UNION without all.
        
        Second is a change in behaviour due to the fact that ORDER by in a 
        UNION without braces is not now applicable to the last SELECT node.
        
        It can not be applied until one bug is fixed (after my vacation).
        
        Should be documented.
      aedc0ab0
    • unknown's avatar
      "normal" warning in test suite disabled · 7eb9d41c
      unknown authored
      bad merge fixed
      
      
      mysql-test/t/isam.test:
        bad merge fixed
      mysql-test/t/lock_tables_lost_commit.test:
        "normal" warning in test suite disabled
      mysql-test/t/subselect.test:
        "normal" warning in test suite disabled
      7eb9d41c
    • unknown's avatar
      error messages from english/errmsg.txt added to other languages. · 80206632
      unknown authored
      bug#1269
      
      
      sql/share/czech/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/danish/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/dutch/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/estonian/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/french/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/german/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/greek/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/hungarian/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/italian/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/japanese/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/korean/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/norwegian-ny/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/norwegian/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/polish/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/portuguese/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/romanian/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/russian/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/serbian/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/slovak/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/spanish/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/swedish/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      sql/share/ukrainian/errmsg.txt:
        error messages from english/errmsg.txt added to other languages.
        bug##1269
      80206632
    • unknown's avatar
      removed double procedure deletetion · 434faadc
      unknown authored
      434faadc
  6. 12 Sep, 2003 7 commits
    • unknown's avatar
      fixed memory leak (now JOIN cleaning procedure always called) · 5b0c15a4
      unknown authored
      
      sql/sql_select.cc:
        always clean JOIN
      5b0c15a4
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 61663eaa
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.1
      
      
      sql/sql_yacc.yy:
        Auto merged
      61663eaa
    • unknown's avatar
      Fix for a bug #1231 · 67dafb01
      unknown authored
      Parse error caused global ORDER BY to be initialized although it should
      not have been.
      
      
      67dafb01
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 774c65c7
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.stmt
      
      
      include/mysql.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/libmysqld.c:
        Auto merged
      774c65c7
    • unknown's avatar
      SCRUM: · dc250a6e
      unknown authored
      #977 Prepared statements in embedded library
      
      
      include/mysql.h:
        read_prepare_result function moved to 'virtual'
      libmysql/client_settings.h:
        declare proper function for libmysql
      libmysql/libmysql.c:
        some code moved from implementation of read_prepare_result to 
        mysql_prepare_result to make creating separate (remote and embedded-server)
        versions easier
      libmysqld/libmysqld.c:
        emb_read_prepare_result prototype
      sql-common/client.c:
        cli_read_prepare_result added to the client_methods
      sql/client_settings.h:
        we don't need prepared statements in mini_client
      sql/sql_prepare.cc:
        embedded send_prep_stmt added
      dc250a6e
    • unknown's avatar
      Monty's merge bug fixed · 11930efb
      unknown authored
      
      libmysqld/lib_sql.cc:
        these definitions moved to be after my_bool declaration
      11930efb
    • unknown's avatar
      Fix results for mix_innodb_myisam_binlog · 32a4e783
      unknown authored
      Optimize calls to current_thd
      
      
      mysql-test/r/mix_innodb_myisam_binlog.result:
        updated results
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Fix for 4.1
      sql/ha_innodb.cc:
        Don't call current_thd in an assert that is not deleted in release version
        (Because current_thd is slow)
      32a4e783