1. 26 Jun, 2006 4 commits
  2. 24 Jun, 2006 2 commits
    • unknown's avatar
      Merge knielsen@10.100.52.19:/usr/local/mysql/tmp-5.0 · 9d7799e7
      unknown authored
      into  mysql.com:/data0/knielsen/tmp-5.0
      
      
      9d7799e7
    • unknown's avatar
      Fix race condition in test case wait_timeout. · 4a9a0b9a
      unknown authored
      Sometimes the helper connection (that is watching for the main connection
      to time out) would itself time out first, causing the test to fail.
      
      
      mysql-test/t/wait_timeout.test:
        Increase connection timeout in connection wait_con so we will not loose
        the connection that is watching for the real wait_timeout to trigger.
      4a9a0b9a
  3. 23 Jun, 2006 6 commits
    • unknown's avatar
      key.result: · 907acc78
      unknown authored
        After merge fix
      
      
      mysql-test/r/key.result:
        After merge fix
      907acc78
    • unknown's avatar
      Bug#15276: MySQL ignores collation-server · d3ff1c2f
      unknown authored
          Problem:
          mysqld --collation-server=xxx --character-set-server=yyy
          didn't work as expected: collation_server was set not to xxx,
          but to the default collation of character set "yyy".
          
          With different argument order it worked as expected:
          mysqld --character-set-server=yyy --collation-server=yyy 
          
          Fix:
          initializate default_collation_name to 0
          when processing --character-set-server
          only if --collation-server has not been specified
          in command line.
      
      
      
      mysql-test/r/ctype_ucs2_def.result:
        Adding test case
      mysql-test/t/ctype_ucs2_def-master.opt:
        Specifying variables in reverse order, to cover the bug.
      mysql-test/t/ctype_ucs2_def.test:
        Adding test case
      sql/mysqld.cc:
        Don't clear default_collation_name when processing 
            --character-set-server if collation has already
            been specified using --collation-server
      d3ff1c2f
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · cbc5f34c
      unknown authored
      into moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      sql/sql_parse.cc:
        Auto merged
      cbc5f34c
    • unknown's avatar
      Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql · 27cc0204
      unknown authored
      into moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      mysql-test/r/key.result:
        Auto merged
      mysql-test/t/key.test:
        Auto merged
      sql/table.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      27cc0204
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-kt · 446f03bd
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0-kt.b20392
      
      
      446f03bd
    • unknown's avatar
      Bug#11228: DESC shows arbitrary column as "PRI" · 89e41595
      unknown authored
        An UNIQUE KEY consisting of NOT NULL columns
        was displayed as PRIMARY KEY in "DESC t1".
        According to the code, that was intentional
        behaviour for some reasons unknown to me.
        This code was written before bitkeeper time,
        so I cannot check who and why made this.
        After discussing on dev-public, a decision
        was made to remove this code
      
      
      mysql-test/r/key.result:
        Adding test case.
      mysql-test/t/key.test:
        Adding test case.
      sql/table.cc:
        Removing old wrong code
      89e41595
  4. 22 Jun, 2006 12 commits
    • unknown's avatar
      mysql.spec.sh: · 92ad3d5b
      unknown authored
        Disable the simplistic auto dependency scan for test/bench (bug#20078)
      
      
      support-files/mysql.spec.sh:
        Disable the simplistic auto dependency scan for test/bench (bug#20078)
      92ad3d5b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0f0e518e
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-runtime
      
      
      0f0e518e
    • unknown's avatar
      Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50 · 1c288073
      unknown authored
      into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug18781
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      1c288073
    • unknown's avatar
      Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 · dca36865
      unknown authored
      into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15811
      
      
      dca36865
    • unknown's avatar
      bug #10166 (Signed byte values cause data to be padded) · 9a4b76ed
      unknown authored
      The AsBinary function returns VARCHAR data type with binary collation.
      It can cause problem for clients that treat that kind of data as
      different from BLOB type.
      So now AsBinary returns BLOB.
      
      
      mysql-test/r/gis.result:
        result fixed
      mysql-test/t/gis.test:
        test case added
      sql/item_geofunc.h:
        Now we return MYSQL_TYPE_BLOB for asBinary function
      9a4b76ed
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-5.0-root · 8eb00d0a
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-runtime
      
      
      8eb00d0a
    • unknown's avatar
      Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 · a887fa9e
      unknown authored
      into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15811
      
      
      a887fa9e
    • unknown's avatar
      A fix and a test case for Bug#15217 "Using a SP cursor on a table created · 67fd3c4a
      unknown authored
       with PREPARE fails with weird error".
      More generally, re-executing a stored procedure with a complex SP cursor query
      could lead to a crash.
      
      The cause of the problem was that SP cursor queries were not optimized 
      properly at first execution: their parse tree belongs to sp_instr_cpush,
      not sp_instr_copen, and thus the tree was tagged "EXECUTED" when the
      cursor was declared, not when it was opened. This led to loss of optimization
      transformations performed at first execution, as sp_instr_copen saw that the
      query is already "EXECUTED" and therefore either not ran first-execution 
      related blocks or wrongly rolled back the transformations caused by 
      first-execution code.
      The fix is to update the state of the parsed tree only when the tree is
      executed, as opposed to when the instruction containing the tree is executed.
      Assignment if i->state is moved to reset_lex_and_exec_core.
      
      
      mysql-test/r/sp.result:
        Test results fixed (Bug#15217)
      mysql-test/t/sp.test:
        Add a test case for Bug#15217
      sql/sp_head.cc:
        Move assignment of stmt_arena->state to reset_lex_and_exec_core
      67fd3c4a
    • unknown's avatar
      Bug#15811: extremely long time for mysql client to execute long INSERT · 15ac6406
      unknown authored
      The problem was in redundant calls to strlen() in string functions,
      where we may then return after checking only the small number of characters.
      
      No test case is provided since it's a performance fix.
      
      
      strings/ctype-mb.c:
        Do not use strlen() where arbitrary horizon of at least
        CHARSET_INFO::mbmaxlen character is sufficient.
      15ac6406
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6e8cb4d6
      unknown authored
      into moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      6e8cb4d6
    • unknown's avatar
      Additional test for Bugs#20392: INSERT_ID session variable has weird value · 9040e4a9
      unknown authored
      sys_var_insert_id returned LAST_INSERT_ID instead of INSERT_ID,
      as Guilhem suggested.
      
      
      mysql-test/r/variables.result:
        Additional test
      mysql-test/t/variables.test:
        Additional test
      9040e4a9
    • unknown's avatar
      Bugs#20392: INSERT_ID session variable has weird value · 4af5e597
      unknown authored
      sys_var_insert_id returned LAST_INSERT_ID instead of INSERT_ID.
      
      
      mysql-test/r/variables.result:
        Adding test case
      mysql-test/t/variables.test:
        Adding test case
      sql/set_var.cc:
        Fixed that sys_var_insert_id returned last_indert_id instead of insert_id.
      4af5e597
  5. 21 Jun, 2006 16 commits