1. 27 Jun, 2008 2 commits
    • Timothy Smith's avatar
      Merge from upstream (my:5.0-bugteam) · fe87c0db
      Timothy Smith authored
      fe87c0db
    • Gleb Shchepa's avatar
      backport from 6.0 · b83b4697
      Gleb Shchepa authored
            
      Bug#35658 (An empty binary value leads to mysqld crash)
              
      Before this fix, the following token
        b''
      caused the parser to crash when reading the binary value from the empty string.
      The crash was caused by:
        ptr+= max_length - 1;
      because max_length is unsigned and was 0, causing an overflow.
              
      With this fix, an empty binary literal b'' is parsed as a binary value 0,
      in Item_bin_string.
      
      mysql-test/r/varbinary.result:
        Bug#35658 (An empty binary value leads to mysqld crash)
      mysql-test/t/varbinary.test:
        Bug#35658 (An empty binary value leads to mysqld crash)
      sql/item.cc:
        Bug#35658 (An empty binary value leads to mysqld crash)
      b83b4697
  2. 25 Jun, 2008 2 commits
    • Matthias Leich's avatar
      Fix for · 49417ad7
      Matthias Leich authored
      Bug#37492 timing bug in subselect.test
      + similar weaknesses found during testing
      + replace error numbers by error names
      49417ad7
    • Timothy Smith's avatar
      Bug #20748: Configuration files should not be read more than once · d5977e4c
      Timothy Smith authored
      Normalize directory names before adding them to default_directories.
      
      
      mysys/default.c:
        Normalize directory names with unpack_dirname() before adding them
        to default_directories.  This way, /etc/ and /etc will not count as
        duplicates.
        
        Because this entails allocating memory to store the normalized names,
        add error handling and ensure that it doesn't leak memory in case
        both my_print_defaults() and load_defaults() are called.
        
        Clean up the Windows code that finds the exe's parent directory, and
        pull it out into a separate function.
        
        Reorganize the code into a single init_default_directories() function,
        with internal #ifdefs, instead of init_default_directories_<system>()
        functions which were accessed via a function pointer.  This is more in
        line with normal MySQL coding style, and easier to read for some.
      d5977e4c
  3. 24 Jun, 2008 3 commits
  4. 18 Jun, 2008 1 commit
    • Matthias Leich mleich@mysql.com's avatar
      Fix for · 2356d4f5
      Matthias Leich mleich@mysql.com authored
           Bug#37167 funcs_1: Many tests fail if the embedded server is used.
           Bug#37164 funcs_1: Some tests fail if an optional character set is missing.
      + some cleanup within the testsuite related to the fixes above
      + some adjustments to open bugs on Mac OS X
      2356d4f5
  5. 17 Jun, 2008 3 commits
    • Georgi Kodinov's avatar
      auto merge · 07350a6c
      Georgi Kodinov authored
      07350a6c
    • Tatiana A. Nurnberg's avatar
      merge · 8342336f
      Tatiana A. Nurnberg authored
      configure.in:
        Raise version number after cloning 5.0.64
      mysql-test/r/federated_disabled.result:
        Bug#37069 (5.0): implement --skip-federated
      mysql-test/t/federated_disabled-master.opt:
        Bug#37069 (5.0): implement --skip-federated
      mysql-test/t/federated_disabled.test:
        Bug#37069 (5.0): implement --skip-federated
      mysys/errors.c:
        Fix for Bug#16902.
      sql/mysqld.cc:
        Bug#37069 (5.0): implement --skip-federated
      8342336f
    • Tatiana A. Nurnberg's avatar
      Bug#36492: make dist and make install fails · b1132821
      Tatiana A. Nurnberg authored
      Ignore BitKeeper SCCS folders in make-dist
      
      mysql-test/Makefile.am:
        Ignore BitKeeper SCCS folders in make-dist
        (copy only .txt files).
      b1132821
  6. 16 Jun, 2008 2 commits
    • Matthias Leich mleich@mysql.com's avatar
      Fix for · 28f97047
      Matthias Leich mleich@mysql.com authored
         Bug#37167 funcs_1: Many tests fail if the embedded server is used.
         Bug#37164 funcs_1: Some tests fail if an optional character set is missing.
      + some cleanup within the testsuite related to the fixes above
      + some adjustments to open bugs on Mac OS X
      
      Details:
      - Remove the initial loading of data from tests if these data
        are not somewhere retrieved
      - Remove any use of columns with attribute unicode
        (-> UCS2 is no more needed) from tests where unicode
        properties are not checked or somehow required
      - Create a separate branch of the Character maximum length test
        (CML). If UCS2 is available than this test gets applied to
        every available type of string column with attribute unicode
        This prevents any loss of coverage by the points above.
      - Disable the execution of is_tables_ndb which gives wrong
        results because of a bug. Correct the exepected results of
        this test.
      - In case of tests failing when applied to the embedded server
          1) Create a variant of this test for the embedded server
        or
          2) Skip the test in case of embedded server
        depending on purpose and complexity of test.
      - Skip the tests which could suffer from
        Bug 28309 First insert violates unique constraint - was "memory" table empty ?
        Bug 37380 Test funcs_1.is_columns_myisam_embedded fails on OS X
        (both bugs Mac OS X, embedded server, MySQL 5.0 only)
      - Minor improvements like remove typos
      28f97047
    • Hakan Kuecuekyilmaz's avatar
      Fix for Bug#16902. · f3a81ef4
      Hakan Kuecuekyilmaz authored
      mysys/errors.c:
        Fixed typo, Bug#16902.
      f3a81ef4
  7. 13 Jun, 2008 2 commits
  8. 12 Jun, 2008 1 commit
  9. 10 Jun, 2008 1 commit
  10. 03 Jun, 2008 1 commit
    • Georgi Kodinov's avatar
      Bug#37069 (5.0): implement --skip-federated · da4cfa6d
      Georgi Kodinov authored
      mysql-test/r/federated_disabled.result:
        Bug#37069 (5.0): test case
      mysql-test/t/federated_disabled-master.opt:
        Bug#37069 (5.0): test case
      mysql-test/t/federated_disabled.test:
        Bug#37069 (5.0): test case
      da4cfa6d
  11. 02 Jun, 2008 1 commit
    • Matthias Leich mleich@mysql.com's avatar
      Bug#36788 Multiple funcs_1 'trig' tests are failing on vanilla builds · 15440264
      Matthias Leich mleich@mysql.com authored
      Fix for this bug and additional improvements/fixes
      In detail:
      - Remove unicode attribute from several columns
        (unicode properties were nowhere needed/tested)
        of the table tb3
        -> The runnability of these tests depends no more on
           the availibility of some optional collations.
      - Use a table tb3 with the same layout for all
        engines to be tested and unify the engine name
        within the protocols.
        -> <engine>_trig_<abc>.result have the same content
      - Do not load data into tb3 if these rows have no
        impact on result sets
      - Add tests for NDB (they exist already in 5.1)
      - "--replace_result" at various places because
        NDB variants of tests failed with "random" row
        order in results
        This fixes a till now unknown weakness within the
        funcs_1 NDB tests existing in 5.1 and 6.0
      - Fix the expected result of ndb_trig_1011ext
        which suffered from Bug 32656
        + disable this test
      - funcs_1 could be executed with the mysql-test-run.pl
        option "--reorder", which saves some runtime by
        optimizing server restarts.
        Runtimes on tmpfs (one attempt only):
        with    reorder 132 seconds
        without reorder 183 seconds
      - Adjust two "check" statements within func_misc.test
        which were incorrect (We had one run with result set
        difference though the server worked good.)
      - minor fixes in comments
      15440264
  12. 29 May, 2008 1 commit
  13. 28 May, 2008 2 commits
  14. 27 May, 2008 1 commit
  15. 25 May, 2008 1 commit
  16. 23 May, 2008 1 commit
  17. 22 May, 2008 1 commit
  18. 21 May, 2008 1 commit
  19. 18 May, 2008 2 commits
    • unknown's avatar
      Merge host.loc:/work/bugs/5.0-bugteam-36676 · 8bc987ab
      unknown authored
      into  host.loc:/work/bk/5.0-bugteam
      
      
      8bc987ab
    • unknown's avatar
      Fixed bug#36676: multiupdate using LEFT JOIN updates only · 29e7fa25
      unknown authored
                       first row or fails with an error:
        ERROR 1022 (23000): Can't write; duplicate key in table ''
      
      The server uses intermediate temporary table to store updated
      row data.  The first column of this table contains rowid.
      Current server implementation doesn't reset NULL flag of that
      column even if the server fills a column with rowid.
      To keep each rowid unique, there is an unique index.
      An insertion into an unique index takes into account NULL
      flag of key value and ignores real data if NULL flag is set.
      So, insertion of actually different rowids may lead to two
      kind of problems.  Visible effect of each of these problems
      depends on an initial engine type of temporary table:
      
      1. If multiupdate initially creates temporary table as
      a MyISAM table (a table contains blob columns, and the
      create_tmp_table function assumes, that this table is
      large), it inserts only one single row and updates
      only rows with one corresponding rowid. Other rows are
      silently ignored. 
      
      2. If multiupdate initially creates MEMORY temporary
      table, fills it with data and reaches size limit for
      MEMORY tables (max_heap_table_size), multiupdate
      converts MEMORY table into MyISAM table and fails
      with an error:
        ERROR 1022 (23000): Can't write; duplicate key in table ''
      
      
      Multiupdate has been fixed to update the NULL flag of
      temporary table rowid columns.
      
      
      
      mysql-test/r/multi_update_tiny_hash.result:
        Added test case for bug#36676.
      mysql-test/t/multi_update_tiny_hash-master.opt:
        Added test case for bug#36676.
      mysql-test/t/multi_update_tiny_hash.test:
        Added test case for bug#36676.
      sql/sql_update.cc:
        Fixed bug#36676: multiupdate using LEFT JOIN updates only
                         first row or fails with an error:
          ERROR 1022 (23000): Can't write; duplicate key in table ''
        
        The multi_update::send_data method has been modified to reset null bits of
        fields containing rowids.
      29e7fa25
  20. 17 May, 2008 1 commit
  21. 16 May, 2008 9 commits
  22. 15 May, 2008 1 commit
    • unknown's avatar
      Bug#36570: Parse error of CREATE PROCEDURE stmt with comments on \ · 55012e42
      unknown authored
      	slave
      
      The stored-routine code took the contents of the (lowest) parser
      and copied it directly to the binlog, which causes problems if there
      is a special case of interpretation at the parser level -- which 
      there is, in the "/*!VER */" comments.  The trailing "*/" caused
      errors on the slave, naturally.
      
      Now, since by that point we have /properly/ created parse-tree (as 
      the rest of the server should do!) for the stored-routine CREATE, we
      can construct a perfect statement from that information, instead of
      writing uncertain information from an unknown parser state.  
      Fortunately, there's already a function nearby that does exactly 
      that.
      ---
      Update for Bug#36570.  Qualify routine names with db name when
      writing to the binlog ONLY if the source text is qualified.
      
      
      mysql-test/r/binlog_innodb.result:
        Offsets changed due to quoting.
        ---
        New offset to account for db-qualified names.
      mysql-test/r/ctype_cp932_binlog.result:
        Offsets changed due to quoting.
        ---
        Qualify routine names with DB.  Offsets change also.
      mysql-test/r/mysqlbinlog.result:
        Case changed in result due to interpretation of data instead of 
        literal recitation.
        ---
        Qualify procedure name with db.
      mysql-test/r/rpl_sp.result:
        Offsets changed due to quoting.  Added tests.
        ---
        Qualify routine names with DB if qualified in query.  Offsets change also.
      mysql-test/t/rpl_sp.test:
        Add version-limiting quotes to exercise bug#36570.  Test that 
        backtick-quoted identifiers and labels work also.
        ---
        Use different db to show qualification works.  Qualify routine names
        with DB if qualified in query.
      sql/sp.cc:
        In create_string, we may not have a sp_name parameter yet, so
        instead pass the char* and length of the only member we'd get out
        of it.
        
        Having done that, we can use the same function to write the 
        CREATE (FUNC|TRIG|PROC) statement to the binlog as we always used
        to display the statement to the user.
        ---
        Make the db name part of the CREATE string if it is specified.
        
        Specify it in part of writing to the binlog when creating a new
        routine.
      sql/sp_head.cc:
        Set the sp_head m_explicit_name member as the sp_name member is set.  
        We can not peek at this later, as the sp_name is gone by then.
      sql/sp_head.h:
        Add a member to track whether the name is qualified with the 
        database.
      55012e42