1. 03 Jun, 2003 1 commit
    • unknown's avatar
      SCRUM: · b36ae963
      unknown authored
      splittiln common client's parts
      
      
      include/sql_common.h:
        superfluous #ifdef-s removed
      libmysql/client_settings.h:
        superfluous #ifdef-s removed
      libmysql/libmysql.c:
        some litter removed
      libmysqld/lib_sql.cc:
        here we had wrong parameters
      mysys/default.c:
        this is not needed anymore - calling code fixed
      sql-common/client.c:
        code trimmed and simplified
      sql/client_settings.h:
        code trimmed
      sql/repl_failsafe.cc:
        option's initialization added
      sql/slave.cc:
        option's initialization added
      b36ae963
  2. 31 May, 2003 1 commit
    • unknown's avatar
      SCRUM: · 516c608e
      unknown authored
      Here is another pack of changes about gathering common client code in
      sql-common/client.c.
      Now i symlink the client.c from sql/ and libmysql/. These directories
      have client_settings.h files to be included to client.c. It contains
      defines and declarations to compile client.c in appropriate manner.
      Also i've added include/sql_common.h, containing declarations of what
      is exported from client.c
      
      I removed as many #ifdef-s from client.c as i dared to. I think it's better
      push it with some extra #ifdef-s now (of course, if everythihg besides it is
      ok) so other people can check the code.
      
      
      Makefile.am:
        symlinking of sql-common/client.c was added
      include/mysql.h:
        MYSQL_CLIENT define moved here from libmysql/Makefile
      libmysql/Makefile.am:
        ../libmysql/client_settings.h added to the list of necessary h-files
      libmysql/Makefile.shared:
        client.lo added to the list of objects
      libmysql/libmysql.c:
        a lot of changes about separating code between libmysql.c and client.c
      mysys/default.c:
        changed to keep compiler happy
      sql-common/client.c:
        a lot of changes about code separating
      sql/Makefile.am:
        mini_client.h has to be removed
      sql/repl_failsafe.cc:
        mysql_real_connect prototype was unified, so we've got to set connection timeout separately
      sql/slave.cc:
        trimming code to the changed function's prototypes
      sql/sql_repl.cc:
        mini_client isn't needed anymore
      516c608e
  3. 30 May, 2003 6 commits
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3b94f23f
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.emb_bind
      
      3b94f23f
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8ae78d3b
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/NEW_HELP/4.1.clear
      
      8ae78d3b
    • unknown's avatar
      fix some warnings in sql_help.cc · e1669403
      unknown authored
      
      sql/sql_help.cc:
        fix some warnings
      e1669403
    • unknown's avatar
      SET character_set_results=NULL is now working · 9073f966
      unknown authored
      9073f966
    • unknown's avatar
      set_var.cc, set_var.h: · 1924c3d1
      unknown authored
        character_set_connection new variable
      
      
      sql/set_var.h:
        character_set_connection new variable
      sql/set_var.cc:
        character_set_connection new variable
      1924c3d1
    • unknown's avatar
      character_set_server is now updatable · 097236f5
      unknown authored
      character_set_database was added
      Code optimization: reuse more code for all character sets variables
      
      
      sql/mysqld.cc:
        character_set_server is now updatable
        character_set_database was added
      sql/set_var.cc:
        character_set_server is now updatable
        character_set_database was added
      sql/set_var.h:
        character_set_server is now updatable
        character_set_database was added
      sql/sql_base.cc:
        character_set_server is now updatable
        character_set_database was added
      sql/sql_class.cc:
        character_set_server is now updatable
        character_set_database was added
      sql/sql_class.h:
        character_set_server is now updatable
        character_set_database was added
      sql/sql_db.cc:
        character_set_server is now updatable
        character_set_database was added
      sql/sql_load.cc:
        character_set_server is now updatable
        character_set_database was added
      sql/sql_table.cc:
        character_set_server is now updatable
        character_set_database was added
      sql/sql_yacc.yy:
        character_set_server is now updatable
        character_set_database was added
      BitKeeper/etc/ignore:
        Added scripts/mysql_create_system_tables to the ignore list
      097236f5
  4. 29 May, 2003 1 commit
  5. 28 May, 2003 8 commits
  6. 27 May, 2003 10 commits
  7. 26 May, 2003 10 commits
    • unknown's avatar
      Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4sm · 3172515c
      unknown authored
      
      sql/mysqld.cc:
        Auto merged
      3172515c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 161ca635
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      sql/field.h:
        Auto merged
      161ca635
    • unknown's avatar
      Portability fix · 4adc3a1c
      unknown authored
      4adc3a1c
    • unknown's avatar
      ixed wrong unlock of tables (new bug) · 3950b703
      unknown authored
      
      sql/sql_delete.cc:
        Comment cleanup
      sql/sql_insert.cc:
        Comment cleanup
      sql/sql_load.cc:
        Comment cleanup
      sql/sql_update.cc:
        Fixed wrong unlock of tables.
        (Unlock must be done after writing to binary log
      3950b703
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0bc6cf9e
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.1-narttu
      
      0bc6cf9e
    • unknown's avatar
      ha_innodb.cc: · 833277af
      unknown authored
        Remove accidenatlly committed debug printfs when query cache is used
      sql_update.cc, sql_load.cc, sql_insert.cc, sql_delete.cc:
        For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
      
      
      sql/sql_delete.cc:
        For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
      sql/sql_insert.cc:
        For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
      sql/sql_load.cc:
        For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
      sql/sql_update.cc:
        For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
      sql/ha_innodb.cc:
        Remove accidenatlly committed debug printfs when query cache is used
      833277af
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · d4af689c
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.1-narttu
      
      
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      d4af689c
    • unknown's avatar
      New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set · a8184622
      unknown authored
       
      
      
      Docs/internals.texi:
        Updated protocol information
      include/mysql.h:
        Added catalog to MYSQL_FIELD
        Added sqlstate handling to protocol
      include/mysql_com.h:
        New 4.1 protocol
      libmysql/libmysql.c:
        Added sqlstate handling
        Added CLIENT_MULTI_RESULTS
      sql/field.cc:
        Indentation cleanup
      sql/field.h:
        Indentation cleanup
      sql/mysql_priv.h:
        Changed arguments to close_connection()
      sql/mysqld.cc:
        Changed arguments to close_connection()
        Added checking of extra arguments to mysqld
      sql/protocol.cc:
        Fixed bug in TIME handling
        Added SQLSTATE on errors
        Removed net_send_error()
      sql/protocol.h:
        Removed net_send_error()
      sql/repl_failsafe.cc:
        Fixed arguments to close_connection()
      sql/sql_parse.cc:
        New 4.1 protocol
      a8184622
    • unknown's avatar
      --with-charset was not up to date · 54f47173
      unknown authored
      ctype_ucs2 and ctype_ujis were skipped in mistake
      
      54f47173
    • unknown's avatar
      Index.xml: · 8eecb5ab
      unknown authored
        cp1250_czech_ci was displayed even when not compiled-in in mistake.
      
      
      sql/share/charsets/Index.xml:
        cp1250_czech_ci was displayed even when not compiled-in in mistake.
      8eecb5ab
  8. 24 May, 2003 1 commit
    • unknown's avatar
      symlink.result: · 44ee73cf
      unknown authored
        Character set in this test results was displayed dispite the fact that the table has the same character set
      
      
      mysql-test/r/symlink.result:
        Character set in this test results was displayed dispite the fact that the table has the same character set
      44ee73cf
  9. 23 May, 2003 2 commits