1. 10 Apr, 2006 2 commits
    • unknown's avatar
      Merge 192.168.0.20:mysql/bug15069/my50-bug15069 · c458f5ae
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      libmysql/Makefile.shared:
        Auto merged
      c458f5ae
    • unknown's avatar
      Bug#15069 [patch] my_print_defaults does'nt care --sysconfdir · f2ff24bd
      unknown authored
       - Grab the path from "configure --sysconfdir=<path>" and set it as
         the first place to look for my.cnf files
         Do this both in Makefiles for libmysql and mysys
       - Patch provided by Francesco Riosa. Thank you!
      
      
      libmysql/Makefile.shared:
        Grab the path from "--sysconfdir=<path>" into the defined variable DEFAULT_SYSYCONFDIR
      mysys/Makefile.am:
        Grab the path from "--sysconfdir=<path>" into the defined variable DEFAULT_SYSYCONFDIR
      mysys/default.c:
        Use DEFAULT_SYSCONFDIR as first place to look for my.cnf file if "--sysconfdir=<path>" been specified as argument to configure
      f2ff24bd
  2. 07 Apr, 2006 5 commits
  3. 06 Apr, 2006 16 commits
    • unknown's avatar
      Merge mysql.com:/home/greenman/workspace-mysql/mysql/mysql-5.0 · cc12c914
      unknown authored
      into  mysql.com:/home/greenman/workspace-mysql/mysql/bug-5.0-16240
      
      
      cc12c914
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8ec7190d
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.0-bug18237-review
      
      
      8ec7190d
    • unknown's avatar
      Remove redundant code in opt_sum_query() · 3daaa8d5
      unknown authored
      3daaa8d5
    • unknown's avatar
      Fix for Bug #16240 · caa16cbf
      unknown authored
      
      support-files/mysql.server.sh:
        Fixed so that if the datadir has been set via the command line,
        it won't be reset by specifing the basedir after.
      caa16cbf
    • 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
  4. 05 Apr, 2006 9 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
      Incorporate a patch to write a timestamp for every new line of the test that is executed. · 224b63e3
      unknown authored
      This makes it possible make a graph (with for example gnuplot) of a test run and spot where most time is consumed.
      Add the new code inside an "#if 0" until it's portable. 
      
      
      client/mysqltest.c:
        Incorporate a patch to write a timestamp for every new line of the test that is executed.
        This makes it possible make a graph (with for example gnuplot) of a test run and spot where most time is consumed.
      224b63e3
    • 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
    • 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
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 18fb4c50
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      18fb4c50
    • unknown's avatar
      Merge 192.168.0.12:mysql/mysql-5.0/ · 6c8fad9c
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      6c8fad9c
  5. 04 Apr, 2006 8 commits