1. 19 Oct, 2004 1 commit
    • unknown's avatar
      Review of all code pushed since last review · 4736d0fe
      unknown authored
      Simple optimzations and cleanups
      Removed compiler warnings and fixed portability issues
      Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
      Fixes for purify
      
      
      client/mysqlimport.c:
        Remove not used variable
      client/mysqltest.c:
        Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
        Simplified code
        Remove usage of sprintf("%llu") as this is not portable
      include/mysql.h:
        Added mysql_embedded() to be able to easily check if we are using the embedded server
      innobase/srv/srv0start.c:
        Don't use memcmp() when using purify (to avoid false warnings)
      libmysql/libmysql.c:
        Added mysql_embedded() to be able to easily check if we are using the embedded server
      libmysql/libmysql.def:
        Added mysql_embedded() to be able to easily check if we are using the embedded server
      myisam/myisam_ftdump.c:
        Remove compiler warning
      myisam/myisamchk.c:
        Remove compiler warning
      myisam/rt_test.c:
        #ifdef not used code
      mysys/hash.c:
        Remove compiler warning (from last push)
      mysys/my_gethwaddr.c:
        Remove compiler warning
      ndb/src/ndbapi/ndberror.c:
        #ifdef not used code
      regex/regcomp.c:
        Remove not used code
      regex/regcomp.ih:
        Remove not used code (to remove compiler warnings)
      sql-common/client.c:
        Remove compiler warnings
      sql/field.cc:
        Simple optimization
      sql/ha_innodb.cc:
        Rename mysql_embedded -> mysqld_embedded
      sql/item.cc:
        Fix comments
        Move variables first on block
        Remove else after return
        Simple optimizations
        (no logic changes)
      sql/item_cmpfunc.cc:
        Added comment
      sql/mysql_priv.h:
        Rename mysql_embedded -> mysqld_embedded
      sql/mysqld.cc:
        Rename mysql_embedded -> mysqld_embedded
      sql/sql_acl.cc:
        Added comments
        simple optimization
        Fixed 'very unlikely' bug when doing REVOKE ALL PRIVILEGES
      sql/sql_select.cc:
        More comments
        Simple optimization
      sql/sql_show.cc:
        Simple changes to make similar code similar
        More comments
      sql/sql_string.cc:
        Trivial optimization and better code layout
      strings/Makefile.am:
        Change xml.c to use bcmp to avoid warnings from purify
      strings/xml.c:
        Change xml.c to use bcmp to avoid warnings from purify
      tests/client_test.c:
        Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
      4736d0fe
  2. 14 Oct, 2004 11 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 46b10a30
      unknown authored
      into mishka.local:/home/my/mysql-4.1
      
      
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      46b10a30
    • unknown's avatar
      true,false -> TRUE, FALSE · 33073189
      unknown authored
      Simple fixes/optimization of things discovered during review of new pushed code
      
      
      include/my_sys.h:
        Ensure that clear_alloc_root() interacts correctly with alloc_root_inited()
      mysys/hash.c:
        More comments
        Simple optimization (merge identical code)
      mysys/my_bitmap.c:
        Change inline -> static inline
      sql/examples/ha_archive.cc:
        Fixed compiler warning
      sql/ha_ndbcluster.cc:
        true,false -> TRUE, FALSE
        Change if (false) -> #ifdef NOT_USED
      sql/ha_ndbcluster.h:
        true,false -> TRUE, FALSE
      sql/handler.cc:
        More comments
        Remove not needed initializations.
        #ifdef not used code
      sql/item_cmpfunc.h:
        true,false -> TRUE, FALSE
      sql/item_strfunc.cc:
        Move local variables to function beginning
        Remove wrong comments
      sql/log_event.h:
        true,false -> TRUE, FALSE
      sql/sql_base.cc:
        true,false -> TRUE, FALSE
        More comments
      sql/sql_help.cc:
        true,false -> TRUE, FALSE
      sql/sql_lex.cc:
        Simple optimization of new code
      sql/sql_parse.cc:
        true,false -> TRUE, FALSE
      sql/sql_prepare.cc:
        true,false -> TRUE, FALSE
      sql/sql_table.cc:
        true,false -> TRUE, FALSE
      sql/sql_yacc.yy:
        true,false -> TRUE, FALSE
      33073189
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 12e8c1fe
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
      
      
      12e8c1fe
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 73e2cbbf
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      73e2cbbf
    • unknown's avatar
      - added missing file strings/my_strtoll10.c to the libmysql.dsp and · 9689d956
      unknown authored
         mysqlclient.dsp project files
      
      
      VC++Files/client/mysqlclient.dsp:
         - added missing file strings/my_strtoll10.c to the mysqlclient.dsp project
           file
      VC++Files/libmysql/libmysql.dsp:
         - added missing file strings/my_strtoll10.c to the libmysql.dsp project
           file
      9689d956
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 559536c5
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
      
      
      559536c5
    • unknown's avatar
      ctype_utf8.test, ctype_utf8.result: · 3329f316
      unknown authored
        Wrong handler.
      
      
      mysql-test/r/ctype_utf8.result:
        Wrong handler.
      mysql-test/t/ctype_utf8.test:
        Wrong handler.
      3329f316
    • unknown's avatar
    • unknown's avatar
      ctype_utf8.test: · a5484c0c
      unknown authored
        Bug#6086 "ctype_utf8" test fails when MySQL does not include InnoDB support
      
      
      mysql-test/t/ctype_utf8.test:
        Bug#6086 "ctype_utf8" test fails when MySQL does not include InnoDB support
      a5484c0c
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · b7403e8b
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
      
      
      b7403e8b
    • unknown's avatar
  3. 13 Oct, 2004 10 commits
    • unknown's avatar
      761ae02c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 55c1b794
      unknown authored
      into mysql.com:/media/sda1/mysql/mysql-4.1-5985
      
      
      sql/sql_class.h:
        Auto merged
      55c1b794
    • unknown's avatar
      A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)" · 54b00f54
      unknown authored
      crashes server." The fix makes Item_func_rand prepared-statements
      aware plus it fixes the case when RAND is used in prepared
      statements and replication is on (as well as several similar issues).
      Until now we did not reset THD before every execution of a prepared
      statement, so if some execution had set thd->time_zone_used
      or thd->rand_used they would not be reset until next mysql_parse.
      Some of post-review fixes done.
      
      
      mysql-test/r/ps.result:
        A test case for Bug#5985: test results fixed.
      mysql-test/t/ps.test:
        A test case for Bug#5985 "prepare stmt from "select rand(?)" crashes
        server."
      sql/item_func.cc:
        Actual fix for Bug#5985: Item_func_rand rewritten to be 
        prepared statements aware.
      sql/item_func.h:
        Actual fix for Bug#5985: Item_func_rand rewritten to be 
        prepared statements aware.
      sql/mysql_priv.h:
        We need a separate call to reset THD state before every execute of
        a prepared statement. Otherwise things like THD->user_var_events
        are never cleaned up and bloat binary log (as the list of events
        grows from execution to execution).
      sql/sql_class.cc:
        Statement::end_statement -> THD::end_statement()
        (a leftover from some design change which is not to pushed now, but the
        leftover is to be pushed).
      sql/sql_class.h:
        Statement::end_statement -> THD::end_statement()
        (a leftover from some design change which is not to pushed now, but the
        leftover is to be pushed).
      sql/sql_lex.cc:
        Move the part responsible for initializing LEX from mysql_init_query
        to lex_start.
      sql/sql_lex.h:
        All lex-related initialization is now in lex_start.
        Move thd->select_number to lex->select_number to be able to use it
        easily in lex_start.
      sql/sql_parse.cc:
        Split mysql_init_query into two functions: mysql_reset_thd_for_next_query,
        which is used in PS and conventional execution, and lex_start, used only
        when we want to parse something.
        Fix init_connect to use initialized THD.
      sql/sql_prepare.cc:
        Deploy mysql_reset_thd_for_next_query to reset THD state before
        execution of a prepared statement.
        Normally this should have been added to just one place, but
        we have to reset thd before assigning placeholders from variables,
        thus we can't do that in execute_stmt (yuck).
      54b00f54
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · ee7518b5
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
      
      
      sql/item_subselect.cc:
        Auto merged
      ee7518b5
    • unknown's avatar
      srv0srv.c, log0log.c, srv0srv.h, ha_innodb.cc, ha_innodb.h: · 7b1f818d
      unknown authored
        Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
      
      
      sql/ha_innodb.h:
        Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
      sql/ha_innodb.cc:
        Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
      innobase/include/srv0srv.h:
        Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
      innobase/log/log0log.c:
        Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
      innobase/srv/srv0srv.c:
        Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
      7b1f818d
    • unknown's avatar
      Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8983293d
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1
      
      
      8983293d
    • unknown's avatar
      BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). · fd6009ac
      unknown authored
      BUG#4335 - one name can be handler open'ed many times.
      Fixed problems detected on Windows build by VC++.
      Removed unused variables.
      Applied a neccessary cast.
      
      
      fd6009ac
    • unknown's avatar
      tests/client_test.c: · ba48e6f9
      unknown authored
        Make checks (asserts) performed in client_test.c work in non-debug
        builds.
      
      
      tests/client_test.c:
        Make checks (asserts) performed in client_test.c work in non-debug
        builds: all asserts/DBUG_ASSERTs replaced with if (!(expr)) abort();
      ba48e6f9
    • unknown's avatar
      InnoDB: correct potential overflow in trx_purge() · 74c25418
      unknown authored
      
      innobase/trx/trx0purge.c:
        trx_purge(): avoid overflow in setting srv_dml_needed_delay
      74c25418
    • unknown's avatar
      fix for some build/test errors for 4.1.6 · beb3fddc
      unknown authored
      beb3fddc
  4. 12 Oct, 2004 6 commits
    • unknown's avatar
      Move Heikki's comment about thd->query comment to proper place · 63af3d3a
      unknown authored
      (bad merge from 4.0)
      
      
      sql/sql_class.h:
        Move a comment to proper place (bad merge from 4.0)
      63af3d3a
    • unknown's avatar
      post-commit: · 9b8586bf
      unknown authored
        Added catch for (example) WL#1234 into bk commit subjects
      
      
      BitKeeper/triggers/post-commit:
        Added catch for (example) WL#1234 into bk commit subjects
      9b8586bf
    • unknown's avatar
      ps.test, ps.result: a test case for Bug#6042 "constants · d007600b
      unknown authored
      propogation works only once (prepared statements)".
      
      
      mysql-test/r/ps.result:
        Test case for Bug#6042: test results fixed
      mysql-test/t/ps.test:
        A test case for Bug#6042 "constants propogation works only once
        (prepared statements).
      d007600b
    • unknown's avatar
      New tests for prepared statements: · 4855ff51
      unknown authored
      - 'ps_10nestset' uses a "nested set" approach for an employee 
        hierarchy, then does arithmetic on the "salary" field;
        (soon) to be extended by inserts / deletes which imply
        mass updates on the "l"/"r" fields showing the set inclusion,
      - 'ps_11bugs' will get (some of ?) those bug DB entries which
        refer to prepared statements, but whose number does not appear
        in a test file comment - so it will also be extended.
      
      
      4855ff51
    • unknown's avatar
      item.h: · 9ed05da4
      unknown authored
        A fix for Bug#6042 "constants propogation works olny once (prepared
        statements)": reset item->marker in Item::cleanup, as it's used
        in propogate_cond_constants. No test case as the only way I could
        come up with to show the problem is EXPLAIN, and EXPLAIN is painful
        to use in the test suite.
      
      
      sql/item.h:
        A fix for Bug#6042 "constants propogation works olny once (prepared
        statements)": reset item->marker in Item::cleanup, as it's used
        in propogate_cond_constants
      9ed05da4
    • unknown's avatar
      NDB compile fix sol9x86 · 64ac84fb
      unknown authored
      
      ndb/include/kernel/LogLevel.hpp:
        compile fix sol9x86
      ndb/include/util/version.h:
        compile fix sol9x86
      ndb/src/common/util/version.c:
        compile fix sol9x86
      ndb/src/mgmsrv/Services.cpp:
        compile fix sol9x86
      64ac84fb
  5. 11 Oct, 2004 5 commits
  6. 10 Oct, 2004 7 commits
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1073271b
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5382
      
      
      1073271b
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · da03d0a1
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      da03d0a1
    • unknown's avatar
      clean-up, indentation fixes. · 98bb6fd4
      unknown authored
      
      mysql-test/t/outfile.test:
        this 'drop...' not needed anymore
      sql/sql_yacc.yy:
        indentation fixes
      98bb6fd4
    • unknown's avatar
      cb81894a
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 12bef7a8
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      12bef7a8
    • unknown's avatar
      Fixes bug with tableImpl with blobs not being initialized properly w.r.t... · ed5b9e9a
      unknown authored
      Fixes bug with tableImpl with blobs not being initialized properly w.r.t pointer to blob tableImpl in column
          added blob to test to see that blob tables don't show up in show tables
          auto increment setting need not fetch blob tables (will otherwise generate error during table creation)
          moved addBlobTables out of fetchGlobalTableImpl to get_local_table_info
          changed addBlobTables to start from last column and break if all blobs added
          also addBlobTables will return -1 if failed (typically getTable)
          changed to using get_local_table_info with internal table name where applicable for efficiency
          added option to get_local_table_info wether to fetch blob tables or not
          getTable always fetches the blobtables
          moved addBlobTables to get_local_table_info to always be called, even if main table goes to cache only
      
      
      mysql-test/r/ndb_autodiscover.result:
        added blob to test to see that blob tables don't show up in show tables
      mysql-test/t/ndb_autodiscover.test:
        added blob to test to see that blob tables don't show up in show tables
      ndb/src/ndbapi/Ndb.cpp:
        auto increment setting need not fetch blob tables (will otherwise generate error during table creation)
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        moved addBlobTables out of fetchGlobalTableImpl to get_local_table_info
        changed addBlobTables to start from last column and break if all blobs added
        also addBlobTables will return -1 if failed (typically getTable)
        changed to using get_local_table_info with internal table name where applicable for efficiency
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        added option to get_local_table_info wether to fetch blob tables or not
        getTable always fetches the blobtables
        moved addBlobTables to get_local_table_info to always be called, even if main table goes to cache only
      ed5b9e9a
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5ddf724d
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.gconcat
      
      
      sql/item_sum.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      5ddf724d