1. 06 Apr, 2006 12 commits
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · b3dad934
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0
      
      
      b3dad934
    • unknown's avatar
      Fix for bug#14945 "Truncate table doesn't reset the auto_increment · ee3cf23b
      unknown authored
      counter".
      
      When TRUNCATE TABLE was called within an stored procedure the
      auto_increment counter was not reset to 0 even if straight
      TRUNCATE for this table did this.
      
      This fix makes TRUNCATE in stored procedures to be handled exactly
      in the same way as straight TRUNCATE. We achieve this by rolling
      back the fix for bug 8850, which is no longer needed since stored
      procedures don't require prelocked mode anymore (and TRUNCATE is
      not allowed in stored functions or triggers).
      
      
      mysql-test/r/sp.result:
        Test case for BUG#14945.
      mysql-test/t/sp.test:
        Test case for BUG#14945.
      sql/sql_delete.cc:
        Handle TRUNCATE in stored procedures exactly in the same way as straight
        TRUNCATE (i.e. without falling back to DELETE if possible). We achieve
        this by rolling back the fix for bug 8850, which is no longer relevant
        since stored procedures don't require prelocked mode anymore
        (and TRUNCATE is not allowed in stored functions or triggers).
      sql/sql_parse.cc:
        Handle TRUNCATE in stored procedures exactly in the same way as straight
        TRUNCATE (i.e. without falling back to DELETE if possible). We achieve
        this by rolling back the fix for bug 8850, which is no longer relevant
        since stored procedures don't require prelocked mode anymore
        (and TRUNCATE is not allowed in stored functions or triggers).
      ee3cf23b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9a1d80e9
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0
      
      
      9a1d80e9
    • unknown's avatar
      Moving mysql_get_server_version() from libmysql.c to client.c, · a0f7e755
      unknown authored
      as it is now required by mysql_set_character_set()
      
      
      libmysql/libmysql.c:
        Removing mysql_get_server_version()
      sql-common/client.c:
        Adding mysql_get_server_version()
      a0f7e755
    • unknown's avatar
      client.c: · f53c12c8
      unknown authored
        Bug#18830 incompatibility new libraries with old server
        Additional 5.0 fix:
        applying the same patch to client.c.
      
      
      sql-common/client.c:
        Bug#18830 incompatibility new libraries with old server
        Additional 5.0 fix:
        applying the same patch to client.c.
      f53c12c8
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · 4ec04797
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      libmysql/libmysql.c:
        Bug#18830 incompatibility new libraries with old server
        Mergeing from 4.1
      4ec04797
    • unknown's avatar
      libmysql.c: · 00cfd1a7
      unknown authored
        Bug#18830: incompatibility new libraries with old server
        Don't execute SET NAMES with pre-4.1 server.
      
      
      libmysql/libmysql.c:
        Bug#18830: incompatibility new libraries with old server
        Don't execute SET NAMES with pre-4.1 server.
      00cfd1a7
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · f1633f04
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      f1633f04
    • unknown's avatar
      This problem has already been fixed by one of the previous changes. · 5475703b
      unknown authored
      Adding test case to cover queries which worked incorrectly earlier:
      Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
      
      
      mysql-test/r/ctype_latin1.result:
        Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
      mysql-test/t/ctype_latin1.test:
        Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
      5475703b
    • unknown's avatar
      ctype-extra.c: · b17b89fb
      unknown authored
        Using local.
      
      
      strings/ctype-extra.c:
        Using local.
      b17b89fb
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · 8dbc6b1f
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      strings/conf_to_src.c:
        Auto merged
      8dbc6b1f
    • unknown's avatar
      conf_to_src.c: · fafa4c5a
      unknown authored
        Backporting a 5.0 change:
        MAX_BUF was too small for Index.xml
        Changeing MAX_BUF and adding assert to easier
        catch the same problem in the future.
      ctype-extra.c:
        Regenerating ctype-extra.c with the fixed conf_to_src.
      
      
      strings/ctype-extra.c:
        Regenerating ctype-extra.c with the fixed conf_to_src.
      strings/conf_to_src.c:
        Backporting a 5.0 change:
        MAX_BUF was too small for Index.xml
        Changeing MAX_BUF and adding assert to easier
        catch the same problem in the future.
      fafa4c5a
  2. 05 Apr, 2006 5 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · cabe2859
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      cabe2859
    • unknown's avatar
      conf_to_src.c: · 6ef757e4
      unknown authored
        Buffer was too small to load Index.xml.
        So some charsets were not gerenrated.
        Making the buffer bigger, and adding an DBUG_ASSERT,
        to easier catch the problem in the future.
      ctype-extra.c:
        Additional charsets were generated.
      
      
      strings/ctype-extra.c:
        Additional charsets were generated.
      strings/conf_to_src.c:
        Buffer was too small to load Index.xml.
        So some charsets were not gerenrated.
        Making the buffer bigger, and adding an DBUG_ASSERT,
        to easier catch the problem in the future.
      6ef757e4
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · af5e4098
      unknown authored
      into sunlight.local:/local_work/16281-bug-5.0-mysql
      
      
      sql/field.h:
        Auto merged
      af5e4098
    • unknown's avatar
      Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1 · 0f8c1175
      unknown authored
      Mutli-table uses temporary table to store new values for fields. With the
      new values the rowid of the record to be updated is stored in a Field_string
      field. Table to be updated is set as source table of the rowid field.
      But when the temporary table creates the tmp field for the rowid field it
      converts it to a varstring field because the table to be updated was created by
      the v4.1. Due to this the stored rowids were broken and no records for 
      update were found.
      
      The flag can_alter_field_type is added to Field_string class. When it is set to
      0 the field won't be converted to varstring. The Field_string::type() function 
      now always returns MYSQL_TYPE_STRING if can_alter_field_type is set to 0.
      The multi_update::initialize_tables() function now sets can_alter_field_type
      flag to 0 for the rowid fields denying conversion of the field to a varstring
      field.
      
      
      
      sql/field.h:
        Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
        The flag can_alter_field_type is added to Field_string class. When it is set to
        0 the field won't be converted to varstring.
        The Field_string::type() function now always returns MYSQL_TYPE_STRING if 
        can_alter_field_type is set to 0.
      sql/sql_update.cc:
        Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
        The multi_update::initialize_tables() function now sets can_alter_field_type
        flag to 0 for the rowid fields denying conversion of the field to a varstring
        field.
      0f8c1175
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0e97b724
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      0e97b724
  3. 04 Apr, 2006 10 commits
  4. 03 Apr, 2006 8 commits
  5. 02 Apr, 2006 1 commit
    • unknown's avatar
      Makefile.am: · 6de1d9d3
      unknown authored
        Install Perl mysql-test-run into test directory
      
      
      mysql-test/Makefile.am:
        Install Perl mysql-test-run into test directory
      6de1d9d3
  6. 01 Apr, 2006 4 commits
    • unknown's avatar
      Added a test case for bug #16504. · f0bfea2b
      unknown authored
      Results changed after the bug fix.
      
      
      f0bfea2b
    • unknown's avatar
      Fixed bug #16504. · 5ef6e903
      unknown authored
      Multiple equalities were not adjusted after reading constant tables.
      It resulted in neglecting good index based methods that could be
      used to access of other tables.
      
      
      mysql-test/r/having.result:
        Adjusted a test case results after fix for bug #16504.
      mysql-test/r/select.result:
        Added a test case for bug #16504.
      mysql-test/r/subselect.result:
        Adjusted a test case results after fix for bug #16504.
      mysql-test/r/varbinary.result:
        Adjusted a test case results after fix for bug #16504.
      mysql-test/t/select.test:
        Added a test case for bug #16504.
      sql/item.cc:
        Fixed bug #16504.
        An Item_equal object may contain only a constant member.
        It may happen after reading constant tables.
      sql/item_cmpfunc.cc:
        Fixed bug #16504.
        Added method Item_equal::check_const that check appearance of new 
        constant items in a multiple equality.
      sql/item_cmpfunc.h:
        Fixed bug #16504.
        Added method Item_equal::check_const that check appearance of new 
        constant items in a multiple equality.
      sql/sql_select.cc:
        Fixed bug #16504.
        Adjusted multiple equalities after reading constant tables.
        Fixed a few typo in comments.
      5ef6e903
    • unknown's avatar
      Merge · a6871e27
      unknown authored
      a6871e27
    • unknown's avatar
      Makefile.am: · 2a4e2e8d
      unknown authored
        Let "make install" install mysql-test-run.pl
      mysql.spec.sh:
        Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
      
      
      support-files/mysql.spec.sh:
        Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
      mysql-test/Makefile.am:
        Let "make install" install mysql-test-run.pl
      2a4e2e8d