1. 14 Dec, 2006 1 commit
    • unknown's avatar
      Fix for bug #24117 "server crash on a FETCH with a cursor on a table which is... · 5b712814
      unknown authored
      Fix for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache"
      
      Problem:
      When creating a temporary field for a temporary table in create_tmp_field_from_field(), a resulting field is created as an exact copy of an original one (in Field::new_field()). However, Field_enum and Field_set contain a pointer (typelib) to memory allocated in the parent table's MEM_ROOT, which under some circumstances may be deallocated later by the time a temporary table is used.
      
      Solution:
      Override the new_field() method for Field_enum and Field_set and create a separate copy of the typelib structure in there.
      
      
      include/typelib.h:
        Added copy_typelib() declaration
      mysql-test/r/sp.result:
        Added a testcase for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache"
      mysql-test/t/sp.test:
        Added a testcase for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache"
      mysys/typelib.c:
        Added copy_typelib() definition
      sql/field.cc:
        Create a copy of the internal 'typelib' structure when copying Field_enum of Field_set objects.
      sql/field.h:
        Override new_field method in Field_enum (and Field_set) to copy the typelib structure.
      5b712814
  2. 24 Nov, 2006 2 commits
    • unknown's avatar
      Merge ymer.(none):/usr/local/mysql/tmp/mysql-4.1-maint · 66e49e37
      unknown authored
      into  ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca
      
      
      mysql-test/lib/mtr_io.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      66e49e37
    • unknown's avatar
      Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack · 4d2665f0
      unknown authored
      traces in Valgrind (broken libc6-dbg).
      Installing libc6-dbg on Debian will still provide proper bactraces, even
      without setting LD_LIBRARY_PATH explicitly.
      
      
      mysql-test/lib/mtr_io.pl:
        Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
        traces in Valgrind.
      mysql-test/mysql-test-run.pl:
        Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
        traces in Valgrind.
      4d2665f0
  3. 22 Nov, 2006 10 commits
  4. 21 Nov, 2006 9 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · e7065e06
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      client/mysqltest.c:
        Auto merged
      e7065e06
    • unknown's avatar
      Merge 192.168.0.4:mysql/mysql-4.1-maint · 92930c12
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      client/mysqltest.c:
        Auto merged
      92930c12
    • unknown's avatar
      Remove unused variable · a599cea1
      unknown authored
      a599cea1
    • unknown's avatar
      Add ALTER TABLE MODIFY statements in addition to the ALTER TABLE ADD for new · 67e943cd
      unknown authored
      columns to make sure they both exist and have the intended type 
      
      
      scripts/mysql_fix_privilege_tables.sql:
        Can't attempt to MODIFY columns of a table before they exists. The
        new column's Create_view_priv,Show_view_priv, Create_routine_priv,
        Alter_routine_priv and Create_user_priv might not exists when
        upgrading. Thus an ALTER TABLE MODIFY is added in addition to the
        ALTER TABLE ADD that would have added them if they didn't exist.
        In this way can be sure the columns both exist and are of the correct type
      67e943cd
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · a4c1ce7f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      a4c1ce7f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 01532e3f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      01532e3f
    • unknown's avatar
      Rename system_mysql_db_fix.test to system_mysql_db_fix30020 as it tests · c9eb0a63
      unknown authored
      mysql_fix_privilege_tables.s's ability to convert the system tables as of
      3.20 to current system table format
      Add similar test for 4.1.23 tables - but use "mysql < mysql_fix_privilege_tables.sql"
      so it can be run on any platform. 
      
      
      mysql-test/t/system_mysql_db_fix30020-master.opt:
        Rename: mysql-test/t/system_mysql_db_fix-master.opt -> mysql-test/t/system_mysql_db_fix30020-master.opt
      mysql-test/mysql-test-run.pl:
        Find mysql_fix_privilege_tables.sql and assign it's path and name to $MYSQL_FIX_PRIVILEGE_TABLES
      mysql-test/t/system_mysql_db_fix30020.test:
        Send output to var/log/system_mysql_db_fix30020.err
        Add some more comments
      mysql-test/t/system_mysql_db_fix40123-master.opt:
        New BitKeeper file ``mysql-test/t/system_mysql_db_fix40123-master.opt''
      mysql-test/t/system_mysql_db_fix40123.test:
        New BitKeeper file ``mysql-test/t/system_mysql_db_fix40123.test''
      c9eb0a63
    • unknown's avatar
      d4aadb06
    • unknown's avatar
      Add missing semicolon · fba971f5
      unknown authored
      fba971f5
  5. 20 Nov, 2006 6 commits
  6. 17 Nov, 2006 11 commits
  7. 16 Nov, 2006 1 commit