1. 04 Jul, 2003 1 commit
    • unknown's avatar
      SCRUM · 14fd42e1
      unknown authored
      Including client code into embedded library
      
      Code trimming (fixes of comments etc)
      
      
      include/mysql_com.h:
        Comment fixed
      include/mysql_embed.h:
        comment fixed
      include/violite.h:
        comment fixed
      libmysql/libmysql.c:
        #undef should work anyway
      libmysqld/libmysqld.c:
        comment fixed
      sql-common/client.c:
        #undef should work anyway
      sql/net_serv.cc:
        #undef should work anyway
      14fd42e1
  2. 19 Jun, 2003 15 commits
  3. 18 Jun, 2003 9 commits
    • unknown's avatar
      - added sql-common subdirectory and sql_common.h to source distribution · 76a06a47
      unknown authored
      
      Makefile.am:
         - added sql-common directory to distribution
      configure.in:
         - minor fixes
         - added sql-common/Makefile to AC_OUTPUT
      include/Makefile.am:
         - added sql_common.h to distribution
      76a06a47
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 1875eedb
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      1875eedb
    • unknown's avatar
      INSTALL-WIN-SOURCE: · 621215cd
      unknown authored
        More edits to INSTALL-WIN-SOURCE.
      
      
      INSTALL-WIN-SOURCE:
        More edits to INSTALL-WIN-SOURCE.
      621215cd
    • unknown's avatar
      Merge · 4d1b1a32
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      4d1b1a32
    • unknown's avatar
      triggers magic · a33ccd9e
      unknown authored
      enforce REAL_EMAIL
      
      
      BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b:
        Delete: BitKeeper/triggers/post-incoming
      BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd:
        Delete: BitKeeper/triggers/post-outgoing
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      a33ccd9e
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 76ad2da5
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.2way
      
      
      76ad2da5
    • unknown's avatar
      SCRUM · 13e8bf67
      unknown authored
      including client code into embedded server
      code to guess what library to use added
      net_field_length moved to pack.c
      
      
      include/mysql.h:
        typedefinitions moved for suitability
        mysql_option.methods_to_use added
      include/mysql_com.h:
        net_store_length declaration
      libmysql/libmysql.c:
        net_store_length moved to sql-common/pack.c
      libmysqld/libmysqld.c:
        added code to guess whether to use remote or embedded connection
      sql-common/client.c:
        options checking added
      sql-common/pack.c:
        net_store_length implementation moved here
      sql/protocol.cc:
        net_store_length moved to sql-common/pack.c
      13e8bf67
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 254cf2d5
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      254cf2d5
    • unknown's avatar
      Last part of resolving conflicts after pull · 4c7431dc
      unknown authored
      Some intersections with Monty encountered
      
      
      libmysql/client_settings.h:
        We don't need the trick with macroses since Monty moved cli_mysql_use_result
        into sql-common/client.c
      libmysql/libmysql.c:
        mysql_use_result moved in sql-common/client.c
      sql-common/client.c:
        code simplified with the moving of mysql_use_result here
      sql/client_settings.h:
        we don't need this #define anymore
      sql/sql_client.cc:
        this function was moved to sql-common/pack.c by me
        i think the pack.c is the better place for it
      4c7431dc
  4. 17 Jun, 2003 6 commits
    • unknown's avatar
      INSTALL-WIN-SOURCE: · dbab4437
      unknown authored
        Initial cleanup edits.
      
      
      INSTALL-WIN-SOURCE:
        Initial cleanup edits.
      dbab4437
    • unknown's avatar
      Fix for --dirname and --suffix (missed ones) · be551c2c
      unknown authored
      
      scripts/make_win_src_distribution.sh:
        Fix for --dirname and --suffix (missed ones)
      be551c2c
    • unknown's avatar
      Added new HOWTO doc 'INSTALL-WIN-SOURCE' on building 'mysql clients and... · 74002400
      unknown authored
      Added new HOWTO doc 'INSTALL-WIN-SOURCE' on building 'mysql clients and server' on WINDOWS from BitKeeper as well as from distributed source archive
      
      
      scripts/make_win_src_distribution.sh:
        Fix for INSTALL-WIN-SOURCE
      74002400
    • unknown's avatar
      SCRUM · 46cb15cc
      unknown authored
      merged conflicts about my previous commit
      it seems there are some errors left - gonna check...
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysqltest.c:
        Auto merged
      include/mysql_com.h:
        Auto merged
      include/sql_common.h:
        Auto merged
      include/mysql.h:
        conflicts merged
      libmysql/client_settings.h:
        conflicts merged
      libmysql/libmysql.c:
        conflicts merged
      sql-common/client.c:
        conflicts merged
      sql/client_settings.h:
        conflicts merged
      sql/protocol.cc:
        conflict merged
      46cb15cc
    • unknown's avatar
      SCRUM · ef726bbf
      unknown authored
      client capabilities included into libmysqld
      some API methods became "virtual"
      lots of duplicated code removed
      
      IMHO all the above made library's code way more pleasant to look at, didn't it?
      
      
      BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220:
        Delete: libmysqld/lib_vio.c
      BitKeeper/etc/ignore:
        Added libmysqld/client.c libmysqld/client_settings.h libmysqld/libmysql.c libmysqld/pack.c to the ignore list
      client/mysqltest.c:
        we don't need this now
      include/mysql.h:
        MYSQL and related structures unified
        four methods made "virtual"
        relative wrappers added
      include/mysql_com.h:
        todo added
      include/mysql_embed.h:
        now we include implementations of Vio structure in libmysqld
      include/sql_common.h:
        declarations changed
      include/violite.h:
        implementation of Vio included in libmysqld
      libmysql/client_settings.h:
        changes to make this working with both client and embedded
      libmysql/libmysql.c:
        global variables and my_net_local_init moved to sql-common/pack.c
      libmysqld/Makefile.am:
        libmysql.c, client.c, pack.c symlinked and added to sources
        lib_vio.c removed
      libmysqld/examples/Makefile.am:
        now we need CLIENT_LIBS here
      libmysqld/lib_sql.cc:
        code duplications removed
        emb_advanced_command was made from simple_command
      libmysqld/libmysqld.c:
        duplicated code removed
      sql-common/client.c:
        code trimmed with new model of calling
      sql-common/pack.c:
        some code moved here from libmysql.c and protocol.cc
      sql/client_settings.h:
        we don't need mysql_use_result for mini_client
      sql/net_serv.cc:
        file included in embedded server
      sql/protocol.cc:
        code moved to sql-common/pack.c
      ef726bbf
    • unknown's avatar
  5. 16 Jun, 2003 1 commit
  6. 15 Jun, 2003 8 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · f45ff11f
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/sql_yacc.yy:
        Auto merged
      f45ff11f
    • unknown's avatar
      Add missing defines · 0e7bd442
      unknown authored
      0e7bd442
    • unknown's avatar
      bad merge fixed · 7a938aea
      unknown authored
      
      mysql-test/r/fulltext.result:
        test for CREATE FULLTEXT INDEX
      mysql-test/t/fulltext.test:
        test for CREATE FULLTEXT INDEX
      7a938aea
    • unknown's avatar
      merge · 19a4898c
      unknown authored
      
      sql-common/client.c:
        Auto merged
      scripts/mysql_install_db.sh:
        Use local version
      19a4898c
    • unknown's avatar
      Fix for compilation error. · 7ababc3b
      unknown authored
      Compiler can signal error when init_sigpipe_variables expands as empty place.
      Had to remove all semicolons after init_sigpipe_variables
      
      
      libmysql/client_settings.h:
        semicolon added
      sql-common/client.c:
        we don't need semicolons after init_sigpipe_variables
      7ababc3b
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · fc2ee2cc
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
      
      
      fc2ee2cc
    • unknown's avatar
      Fixes for make_win_src_distributions · ed1d28fd
      unknown authored
      Removed compiler warnings
      
      
      scripts/make_win_src_distribution.sh:
        Added option --dirname
        Also copy sql-common directory
        Create mysql data files even if mysqld is not installed
      scripts/mysql_create_system_tables.sh:
        Update for usage with make_win_src_distribution
      scripts/mysql_install_db.sh:
        Update for usage with make_win_src_distribution
      sql-common/client.c:
        Portability fix
      sql/item_cmpfunc.cc:
        Removed compiler warning
      sql/sql_acl.cc:
        Indentation cleanup
        Removed compiler warning
      sql/sql_parse.cc:
        Removed compiler warning
      sql/sql_select.cc:
        Removed compiler warning
      sql/sql_yacc.yy:
        Removed compiler warning
      strings/ctype-utf8.c:
        Removed compiler warning
      ed1d28fd
    • unknown's avatar
      LAST_INSERT_ID()}will now return 0 if the last INSERT didn't insert any rows. · fb2825e2
      unknown authored
      
      mysql-test/r/auto_increment.result:
        Update results after bug fix
      fb2825e2