1. 21 Apr, 2006 1 commit
    • unknown's avatar
      Bug #19083 ./mysql-test-run.pl starts NDB when it is not needed · 639c9dbc
      unknown authored
        Now NDB is only initialized and started when the tests that are
        being run will make use of it. The same thing is also done for the
        slave databases and the instance manager.
      
        After review from Magnus: Only take a snapshot of the data directories
        that are in use.
      
      
      mysql-test/mysql-test-run.pl:
        Only initialize (and start) NDB, the instance manager, and the slaves
        when we have tests that require them. Also, only snapshot the data
        directories that we are going to use.
      mysql-test/ndb/ndbcluster.sh:
        Fix text message that has always annoyed me
      639c9dbc
  2. 19 Apr, 2006 2 commits
  3. 18 Apr, 2006 1 commit
  4. 17 Apr, 2006 5 commits
  5. 16 Apr, 2006 1 commit
    • unknown's avatar
      Only expand the empty string to the letters "NULL" if the column · 1e2bde0d
      unknown authored
      does not have "NOT NULL" attribute set.  Also, calculate the padding
      characters more safely, so that a negative number doesn't cause it to 
      print MAXINT-n spaces.
      
      
      mysql-test/r/mysql.result:
        Add test result.
      mysql-test/t/mysql.test:
        Add test.
      1e2bde0d
  6. 15 Apr, 2006 1 commit
  7. 14 Apr, 2006 2 commits
  8. 13 Apr, 2006 19 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 8dc06e0f
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      
      sql/item_func.cc:
        Auto merged
      8dc06e0f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 70695997
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
      
      
      sql/sql_yacc.yy:
        Auto merged
      70695997
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 41c0a5a7
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      
      41c0a5a7
    • unknown's avatar
      The check for recursive view definitions added. (BUG#14308) · 8dbb5807
      unknown authored
      
      mysql-test/r/view.result:
        BUG#14308 test suite.
      mysql-test/t/view.test:
        BUG#14308 test suite.
      sql/share/errmsg.txt:
        New error message about a recursive view.
      sql/sql_view.cc:
        The check of view recursion.
      8dbb5807
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-5.0-root · 30bd4983
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
      
      
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/mysqld.cc:
        SCCS merged
      30bd4983
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 68f7928f
      unknown authored
      into  dl145j.mysql.com:/tmp/andrei/5.0-bug18715_drop_view_slave
      
      
      68f7928f
    • unknown's avatar
      postmerge fix: added tinfo support. · 72a803de
      unknown authored
      72a803de
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 7126fa29
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      
      7126fa29
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 1cc27df0
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      
      BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
        Auto merged
      configure.in:
        Auto merged
      mysql-test/r/func_op.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      1cc27df0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8077c693
      unknown authored
      into  mysql.com:/home/MySQL/5.0-Bug-17248a
      
      
      8077c693
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 93409ee7
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.0-csc9139
      
      
      93409ee7
    • unknown's avatar
      BUG#19021, Crash in ROR-index_merge optimizer: · c89555ed
      unknown authored
      get_best_covering_ror_intersect() was copying ror_scans starting from the 
      end of the array and not from its beginning.
      
      
      mysql-test/r/index_merge_innodb.result:
        Testcase for BUG#19021
      mysql-test/t/index_merge_innodb.test:
        Testcase for BUG#19021
      sql/opt_range.cc:
        BUG#19021: In get_best_covering_ror_intersect(), the array of pointers to
        scans to be used is [tree->ror_scans, ror_scan_mark), and not
        [ror_scan_mark, ...)
      c89555ed
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 · a875afd6
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
      
      
      a875afd6
    • unknown's avatar
      Fix a typo in the help message. · 403e6783
      unknown authored
      
      sql/mysqld.cc:
        Fix a typo.
      403e6783
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 · 970d28ef
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
      
      
      970d28ef
    • unknown's avatar
      BUG#17917 - SELECT from compressed MyISAM table crashes MySQL server · d316b8b1
      unknown authored
      Retrieving data from compressed MyISAM table which is bigger than 4G on 32-bit box
      with mmap() support results in server crash.
      
      mmap() accepts length of bytes to be mapped in second param, which is 32-bit
      size_t. But we pass data_file_length, which is 64-bit my_off_t. As a result only
      first data_file_length % 4G were mapped.
      
      This fix adds additional condition for mmap() usage, that is use mmap() for
      compressed table which size is no more than 4G on 32-bit platform.
      
      
      myisam/mi_packrec.c:
        Use mmap() for compressed table which size is no more than 4G on 32-bit platform.
      d316b8b1
    • unknown's avatar
      foo2 · 365f6f6f
      unknown authored
      
      sql/ha_innodb.cc:
        Import patch foo2
      sql/ha_innodb.h:
        Import patch foo2
      sql/handler.cc:
        Import patch foo2
      sql/handler.h:
        Import patch foo2
      sql/mysqld.cc:
        Import patch foo2
      sql/set_var.cc:
        Import patch foo2
      sql/sql_class.h:
        Import patch foo2
      sql/sql_repl.cc:
        Import patch foo2
      365f6f6f
    • unknown's avatar
      foo1 · ce335550
      unknown authored
      
      sql/ha_innodb.cc:
        Import patch foo1
      sql/ha_innodb.h:
        Import patch foo1
      sql/handler.cc:
        Import patch foo1
      sql/handler.h:
        Import patch foo1
      sql/mysqld.cc:
        Import patch foo1
      sql/set_var.cc:
        Import patch foo1
      sql/sql_class.h:
        Import patch foo1
      sql/sql_repl.cc:
        Import patch foo1
      ce335550
    • unknown's avatar
      Bug#18691: Converting number to UNICODE string returns invalid result. · 5c0c1dcc
      unknown authored
      Conversion from int and real numbers to UCS2 didn't work fine: 
      CONVERT(100, CHAR(50) UNICODE)
      CONVERT(103.9, CHAR(50) UNICODE)
      
      The problem appeared because numbers have binary charset, so,
      simple charset recast binary->ucs2 was performed
      instead of real conversion.
      
      Fixed to make numbers pretend to be non-binary.
      
      
      mysql-test/r/ctype_ucs.result:
        Adding test case
      mysql-test/t/ctype_ucs.test:
        Adding test case
      sql/item_timefunc.cc:
        Adding new member from_cs, to replace my_charset_bin
        to a non-binary charset when converting from numbers to UCS2
      sql/item_timefunc.h:
        Adding new member from_cs, to replace my_charset_bin
        to a non-binary charset when converting from numbers to UCS2
      5c0c1dcc
  9. 12 Apr, 2006 8 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · c16b9dfc
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      c16b9dfc
    • unknown's avatar
      Post-merge fixes. Add a new error message for max_prepared_stmt_count · c5ed5c4b
      unknown authored
      limit.
      
      
      mysql-test/r/ps.result:
        Post-merge fixes.
      mysql-test/t/ps.test:
        Post-merge fixes.
      sql/share/errmsg.txt:
        Add a new error message for max_prepared_stmt_count limit,
        we can do it in 5.0
      sql/sql_class.cc:
        Post-merge fixes.
      sql/sql_class.h:
        Post-merge fixes.
      sql/sql_prepare.cc:
        Post-merge fixes.
      c5ed5c4b
    • unknown's avatar
      Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 · aadfa648
      unknown authored
      into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15933
      
      
      aadfa648
    • unknown's avatar
      Bug#16461: connection_id() does not work properly inside trigger · 886a35bd
      unknown authored
      CONNECTION_ID() was implemented as a constant Item, i.e. an instance of
      Item_static_int_func class holding value computed at creation time.
      Since Items are created on parsing, and trigger statements are parsed
      on table open, the first connection to open a particular table would
      effectively set its own CONNECTION_ID() inside trigger statements for
      that table.
      
      Re-implement CONNECTION_ID() as a class derived from Item_int_func, and
      compute connection_id on every call to fix_fields().
      
      
      mysql-test/r/trigger.result:
        Add result for bug#16461.
      mysql-test/t/trigger.test:
        Add test case for bug#16461.
      sql/item.cc:
        Remove now unused class Item_static_int_func.
      sql/item.h:
        Remove now unused class Item_static_int_func.
      sql/item_create.cc:
        Use new implementation of CONNECTION_ID().
      sql/item_func.cc:
        Re-implement CONNECTION_ID() as Item_func_connection_id
        (was Item_static_int_func).  Set max_length to 10, as it was before.
        Compute connection_id dynamically on every call to fix_fields().
      sql/item_func.h:
        Re-implement CONNECTION_ID() as Item_func_connection_id
        (was Item_static_int_func).
      886a35bd
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-16365 · e46a193b
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-merge
      
      
      sql/set_var.cc:
        Auto merged
      mysql-test/r/ps.result:
        Manual merge.
      mysql-test/t/ps.test:
        Manual merge.
      sql/item_row.cc:
        Manual merge.
      sql/item_row.h:
        Manual merge.
      sql/mysql_priv.h:
        Manual merge.
      sql/mysqld.cc:
        Manual merge.
      sql/set_var.h:
        Manual merge.
      sql/sql_class.cc:
        Manual merge.
      sql/sql_class.h:
        Manual merge.
      sql/sql_prepare.cc:
        Manual merge.
      e46a193b
    • unknown's avatar
      Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 · 1dc282ae
      unknown authored
      into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15933
      
      
      1dc282ae
    • unknown's avatar
      In test for bug#15933 we have to wait for all disconnects to finish to avoid · 51a3d366
      unknown authored
      a race between updating and checking Max_used_connections.  This is done in
      a loop until either disconnect finished or timeout expired.  In a latter case
      the test will fail.
      
      
      mysql-test/r/status.result:
        Update result to match changes in test case.
      mysql-test/t/status.test:
        Close extra conections in previous test.
        In test for bug#15933 we have to wait for all disconnects to finish to avoid
        a race between updating and checking Max_used_connections.  This is done in
        a loop until either disconnect finished or timeout expired.  In a latter case
        the test will fail.
        Use con1, con2, con3 instead of con3, con4, con5.
      51a3d366
    • unknown's avatar
      #BUG18715 create view with replicate*ignore-table · 0e19aa9e
      unknown authored
      Fixed in parser. rpl_view gained no changes but rpl_view-slave.opt.
      
      
      sql/sql_yacc.yy:
        UPDATING option for create/alter view is added for tables_ok to finds the view's
        TABLE_LIST.updating as true. FIXME: Regarding to UPDATING option `create view' should not have
        any difference from `create table'.
      mysql-test/t/rpl_view-slave.opt:
        The option is needed to force slave executes tables_ok which must return OK in conditions of this tests (no table foo is used.
      0e19aa9e