1. 04 Oct, 2003 2 commits
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 707efda6
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.stmt
      
      
      sql/sql_parse.cc:
        Auto merged
      707efda6
    • unknown's avatar
      Fix for bugs #1437, #1446 · 0bb1e434
      unknown authored
      
      include/mysql.h:
        read_statistic added to virtual methods
      libmysql/client_settings.h:
        interface for cli_read_statistic added
      libmysql/libmysql.c:
        read_statistic and mysql_stat code changes
      libmysqld/lib_sql.cc:
        emb_read_statistic implemented
        server_version initialized
      sql-common/client.c:
        cli_read_statistic added to the table
      sql/sql_parse.cc:
        storage of result of COM_STATISTIC changed in embedded library
      0bb1e434
  2. 03 Oct, 2003 7 commits
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 56aa0fc3
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      56aa0fc3
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · 19e849b8
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
      
      19e849b8
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · 4ce3127a
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
      
      4ce3127a
    • unknown's avatar
    • unknown's avatar
      editing comments. · 3ec15a74
      unknown authored
      
      mysql-test/t/rpl_relayrotate.test:
        a comment
      sql/log_event.cc:
        removed irrelevant comment, added another one.
      3ec15a74
    • unknown's avatar
      Fix for a rpl_relayrotate failure. · 7f41edd7
      unknown authored
      Changed Rotate_log_event::exec_event() to not increment positions when the
      event is seen in the middle of a transaction.
      
      
      mysql-test/r/rpl_relayrotate.result:
        remove timeout which was too short for Valgrind
      mysql-test/r/rpl_until.result:
        updated error message
      mysql-test/t/rpl_relayrotate.test:
        removed timeout which was too short for Valgrind
      sql/log_event.cc:
        Fix for a rpl_relayrotate failure. The problem was that Rotate_log_event::exec_event()
        believed that the relay log was corrupted. Fixed it by moving the test for
        corruption to Start_log_event::exec_event(). 
        Changed Rotate_log_event::exec_event() to not increment positions when the
        event is seen in the middle of a transaction (that was an old bug found by
        chance :)
      7f41edd7
    • unknown's avatar
      sql_cache.cc, mysql_priv.h: · 42c52649
      unknown authored
        Query cache now takes in account character_set_results and collation_connection
      
      
      sql/mysql_priv.h:
        Query cache now takes in account character_set_results and collation_connection
      sql/sql_cache.cc:
        Query cache now takes in account character_set_results and collation_connection
      42c52649
  3. 02 Oct, 2003 7 commits
    • unknown's avatar
      0761637e
    • unknown's avatar
      minor edit (changed tense) as suggested by our docs team. · d519eb2d
      unknown authored
      Portuguese and Swedish are not affected (they were already translated).
      
      
      sql/share/czech/errmsg.txt:
        changed tense
      sql/share/danish/errmsg.txt:
        changed tense
      sql/share/dutch/errmsg.txt:
        changed tense
      sql/share/english/errmsg.txt:
        changed tense
      sql/share/estonian/errmsg.txt:
        changed tense
      sql/share/french/errmsg.txt:
        changed tense
      sql/share/german/errmsg.txt:
        changed tense
      sql/share/greek/errmsg.txt:
        changed tense
      sql/share/hungarian/errmsg.txt:
        changed tense
      sql/share/italian/errmsg.txt:
        changed tense
      sql/share/japanese/errmsg.txt:
        changed tense
      sql/share/korean/errmsg.txt:
        changed tense
      sql/share/norwegian-ny/errmsg.txt:
        changed tense
      sql/share/norwegian/errmsg.txt:
        changed tense
      sql/share/polish/errmsg.txt:
        changed tense
      sql/share/romanian/errmsg.txt:
        changed tense
      sql/share/russian/errmsg.txt:
        changed tense
      sql/share/serbian/errmsg.txt:
        changed tense
      sql/share/slovak/errmsg.txt:
        changed tense
      sql/share/spanish/errmsg.txt:
        changed tense
      sql/share/ukrainian/errmsg.txt:
        changed tense
      d519eb2d
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 230ce33f
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      230ce33f
    • unknown's avatar
      Had mangled the order of if()s in a previous changeset (1.1596) (not pushed), · cdeb6e44
      unknown authored
      correcting it now. Thanks Dmitri for spotting this.
      
      
      mysql-test/r/user_var.result:
        result update
      mysql-test/t/user_var.test:
        a simple test
      sql/item_func.cc:
        Had mangled the order of if()s in a previous changeset (1.1596) (not pushed),
        correcting it now.
      cdeb6e44
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 66ba1381
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc_struct-4.1
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      66ba1381
    • unknown's avatar
      Structure for storing parameters of query in query cache (asked by Bar) · e4e78370
      unknown authored
      
      sql/mysql_priv.h:
        Structure for storing parameters of query in query cache
      sql/sql_cache.cc:
        Structure for storing parameters of query in query cache
      sql/sql_parse.cc:
        Structure for storing parameters of query in query cache
      e4e78370
    • unknown's avatar
      fix for BUG#1331: "Unexistent user variable is not replicated". · f212ca3b
      unknown authored
      When an update query is to be written to the binlog, and it reads unset
      user variables (example: INSERT INTO t VALUEs(@A) where @A does not exist),
      we create the variable like if it had been set with SET before, and we loop
      (i.e. we redo the steps of logging, now that the variable exists).
      
      
      mysql-test/r/rpl_user_variables.result:
        result update.
      mysql-test/t/rpl_user_variables.test:
        test to see if unset user variables are written to the binlog
      sql/item_func.cc:
        When an update query is to be written to the binlog, and it reads unset
        user variables (example: INSERT INTO t VALUEs(@A) where @A does not exist),
        we create the variable like if it had been set with SET before, and we loop
        (i.e. we redo the steps of logging, now that the variable exists).
      f212ca3b
  4. 01 Oct, 2003 4 commits
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6497f9d0
      unknown authored
      into teton.kitebird.com:/home/paul/mysql-4.1
      
      6497f9d0
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0a413218
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.stmt
      
      0a413218
    • unknown's avatar
      Fix for #1430 · e1108c02
      unknown authored
      there was an error about sendind prepared parameters to the server
      
      
      libmysqld/lib_sql.cc:
        parameter's length added as a parameter
      sql/ha_berkeley.cc:
        these lines sometimes crashes in embedded library
        so i #ifdef-ed it
      sql/item.h:
        add the data_len parameter in the embedded case
      sql/sql_prepare.cc:
        i added macroses to make headers of store_param_xxx functions
        they have different number of parameters in standalone an embedded servers
        also get_param_length now is implemented differently in embedded server
      e1108c02
    • unknown's avatar
      ctype-mb.c: · 0f0d6fa2
      unknown authored
        Stupid typo. Led to compilation failure with non-gcc compilers.
      
      
      strings/ctype-mb.c:
        Stupid typo. Led to compilation failure with non-gcc compilers.
      0f0d6fa2
  5. 30 Sep, 2003 1 commit
  6. 29 Sep, 2003 12 commits
    • unknown's avatar
      29ccd7ca
    • unknown's avatar
      fix for #1344 · c101051c
      unknown authored
      handling of init-file option added to embedded library
      main problem was killing of output (resulting recordsets etc)
      i added checks for empty output in Protocol:: methods
      better solution could be special Protocol_nul class to redirect
      results to nowhere
      
      
      libmysqld/lib_sql.cc:
        code was added to call read_init_file
        Protocol methods now can support output to nowhere
      sql/mysqld.cc:
        bootstrap function extended to work in embedded library
      sql/sql_parse.cc:
        handle_bootstrap modified to work in embedded library
      c101051c
    • unknown's avatar
      Bugfix for #1342 · 1a4637fa
      unknown authored
      I made libmysqld not to do freopen(stdout...)
      I think we need better solution here so i added it as a worklog entry #1247
      
      
      sql/mysqld.cc:
        freopen #ifdef-ed
        Not a perfect solution though
      1a4637fa
    • unknown's avatar
      bugfix for #1375 · 17800c9d
      unknown authored
      
      libmysqld/lib_sql.cc:
        some programs check mysql_error for empty string
      sql/log.cc:
        in embedded library these members can be NULL
      17800c9d
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · dabd99d6
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.stmt
      
      dabd99d6
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 202a0c24
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/help_correction/mysql-4.1
      
      202a0c24
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · 7c6601a2
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/help_correction/mysql-4.1
      
      7c6601a2
    • unknown's avatar
      added fine error messages in scripts/fill_help_tables.sh · fbee388a
      unknown authored
      
      scripts/fill_help_tables.sh:
        added fine error messages
      fbee388a
    • unknown's avatar
      SCRUM · 2b0b46bf
      unknown authored
      embedded library
      some fixes - cleanup procedure changed for embedded library - deletion of
      embedded mysql->thd
      
      
      include/mysql.h:
        free_embedded_thd added to the list of virtual methods
      libmysqld/embedded_priv.h:
        function deleted
      libmysqld/lib_sql.cc:
        function moved upper in file
      sql-common/client.c:
        call of free_embedded_thd added
      2b0b46bf
    • unknown's avatar
      SCRUM · a92ade65
      unknown authored
      WL604 Privilegies in embedded library
      another bug fixed
      
      
      sql/sql_parse.cc:
        flag selection fixed
      a92ade65
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2986975d
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.stmt
      
      
      sql/sql_db.cc:
        Auto merged
      2986975d
    • unknown's avatar
      SCRUM · 77c6cfc2
      unknown authored
      WL#604 Privileges in embedded library
      bugs fixed
      
      
      sql/mysql_priv.h:
        reload_acl_and_cache interface unifdefed
      sql/sql_parse.cc:
        ifdefs added/removed
      77c6cfc2
  7. 26 Sep, 2003 7 commits