1. 29 Sep, 2003 4 commits
    • unknown's avatar
      SCRUM · 15779a96
      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
      15779a96
    • unknown's avatar
      SCRUM · 9a942c85
      unknown authored
      WL604 Privilegies in embedded library
      another bug fixed
      
      
      sql/sql_parse.cc:
        flag selection fixed
      9a942c85
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 65ad60db
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.stmt
      
      
      sql/sql_db.cc:
        Auto merged
      65ad60db
    • unknown's avatar
      SCRUM · e1c1aa7a
      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
      e1c1aa7a
  2. 26 Sep, 2003 9 commits
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 8094305c
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      8094305c
    • unknown's avatar
      - better test for a string to avoid "test: integer expression expected" · 223716f3
      unknown authored
         if a variable is not defined (empty).
      
      
      223716f3
    • unknown's avatar
      - added missing zlib subdirectory to the source distribution · f0cb432f
      unknown authored
         (crc32.c is included by mysys/my_crc32.c)
      
      
      f0cb432f
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · a4f7ed56
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      
      a4f7ed56
    • unknown's avatar
      A fix of the fix for BUG#1209 (was: SELECT DATABASE() still shows dropped database). · 44f65c24
      unknown authored
      Don't free the client's selected db (thd->db) when it has been DROPped,
      if this is a slave thread; the x_free() was causing a lot
      of various bugs in rpl_loaddata_rule_m (garbage characters, segfault, hangs in
      other threads).
      A small post-merge fix (rli->inside_transaction exists in 4.0 only).
      
      
      sql/log_event.cc:
        Post-merge fix (rli->inside_transaction existed in 4.0 only)
      sql/sql_db.cc:
        Don't free the client's selected db (thd->db) when it has been DROPped,
        if this is a slave thread; the x_free() was causing a lot
        of various bugs in rpl_loaddata_rule_m which does a DROP DATABASE 
        (garbage characters, segfault, hangs in other threads).
      44f65c24
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · f755cb36
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-rplunt
      
      
      f755cb36
    • unknown's avatar
      Fixed spurios failures of rpl_until test. · 4a3bb678
      unknown authored
      
      mysql-test/r/rpl_until.result:
        Fixed race then sometimes io slave thread stopped without managing to get any data from master and sometimes not.
      mysql-test/t/rpl_until.test:
        Fixed race then sometimes io slave thread stopped without managing to get any data from master and sometimes not.
      4a3bb678
    • unknown's avatar
      Merge · dbb95967
      unknown authored
      
      include/mysql.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_derived.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      libmysqld/lib_sql.cc:
        SCCS merged
      libmysqld/libmysqld.c:
        SCCS merged
      sql/sql_parse.cc:
        SCCS merged
      dbb95967
    • unknown's avatar
      SCRUM: · 17053698
      unknown authored
      WL#604 Privileges in embedded library
      code added to check privileges in embedded library
      NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
      access-checking parts. Actually we now can exclude these parts from
      standalone server as well. Do we need it?
      Access checks are disabled in embedded server by default. One should
      edit libmysqld/Makefile manually to get this working.
      We definitely need the separate configure for embedded server
      
      
      include/mysql.h:
        options added so user of embedded library can set the client host
        it will work as if the usual client connects from this host
      libmysqld/Makefile.am:
        Usually one doesn't need access checking in embedded library
        we definitely should separate configure for embedded server
      libmysqld/lib_sql.cc:
        necessary code for getting passwords and access checks added
      libmysqld/libmysqld.c:
        code #ifdef-ed - we use this only when we check permissions
      sql-common/client.c:
        one mysql_close left now
      sql/item_strfunc.cc:
        #ifndef-s added
      sql/log.cc:
        #ifndef-s added
      sql/mysql_priv.h:
        #ifndef-s added
        also i removed default parameters from check_access and check_table_access
        definitions to set definitions working
      sql/mysqld.cc:
        #ifndef-s added
        localhost renamed to my_localhost
      sql/repl_failsafe.cc:
        parameters added
      sql/set_var.cc:
        #ifndef-s added
      sql/sql_acl.cc:
        #ifndef-s added
      sql/sql_acl.h:
        #ifndef-s added
      sql/sql_base.cc:
        #ifndef-s added
      sql/sql_cache.cc:
        #ifndef-s added
      sql/sql_class.cc:
        #ifndef-s added
      sql/sql_db.cc:
        #ifndef-s added
      sql/sql_derived.cc:
        #ifndef-s added
      sql/sql_insert.cc:
        #ifndef-s added
      sql/sql_parse.cc:
        a horde of #ifndef-s added
      sql/sql_prepare.cc:
        #ifndef-s added
      sql/sql_repl.cc:
        parameters added
      sql/sql_show.cc:
        #ifndef-s added
      sql/sql_update.cc:
        #ifndef-s added
      17053698
  3. 25 Sep, 2003 4 commits
  4. 24 Sep, 2003 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · a582bf83
      unknown authored
      into mishka.mysql.fi:/home/my/mysql-4.1
      
      
      a582bf83
    • unknown's avatar
      regexp worked only with the default character set. · e9299e6d
      unknown authored
      Now it can work with any character set.
      
      
      e9299e6d
    • unknown's avatar
      merge · 74e3399a
      unknown authored
      
      sql/item_strfunc.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      sql/net_serv.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      74e3399a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 4e09f14b
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      sql/sql_parse.cc:
        Auto merged
      4e09f14b
    • unknown's avatar
      - Code cleanup: replaced C++-style comments with the proper syntax for · 07001f78
      unknown authored
         .c files (the IBM Visual Age C compiler aborts with a syntax error
         on these)
      
      
      libmysql/dll.c:
         - replaced C++-style comment with the proper syntax for .c files
           (the IBM Visual Age C compiler aborts with a syntax error on these)
      libmysql/libmysql.c:
         - replaced C++-style comment with the proper syntax for .c files
           (the IBM Visual Age C compiler aborts with a syntax error on these)
      mysys/my_getopt.c:
         - replaced C++-style comment with the proper syntax for .c files
           (the IBM Visual Age C compiler aborts with a syntax error on these)
      sql/net_serv.cc:
         - replaced C++-style comment with the proper syntax for .c files
           (the IBM Visual Age C compiler aborts with a syntax error on these)
      strings/ctype-bin.c:
         - replaced C++-style comment with the proper syntax for .c files
           (the IBM Visual Age C compiler aborts with a syntax error on these)
      tests/client_test.c:
         - replaced C++-style comment with the proper syntax for .c files
           (the IBM Visual Age C compiler aborts with a syntax error on these)
      07001f78
  5. 23 Sep, 2003 6 commits
  6. 22 Sep, 2003 8 commits
  7. 20 Sep, 2003 1 commit
  8. 19 Sep, 2003 3 commits