1. 02 Mar, 2006 8 commits
  2. 01 Mar, 2006 18 commits
  3. 28 Feb, 2006 14 commits
    • unknown's avatar
      Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 · ebcf6ec6
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
      
      
      mysql-test/t/mysqltest.test:
        Auto merged
      ebcf6ec6
    • unknown's avatar
      mysqltest.test: · bf912125
      unknown authored
        Add real_sleep tests.
      
      
      mysql-test/t/mysqltest.test:
        Add real_sleep tests.
      bf912125
    • unknown's avatar
      mysqltest.c: · 618bd0a5
      unknown authored
        expand tab
      
      
      client/mysqltest.c:
        expand tab
      618bd0a5
    • unknown's avatar
      Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 · 74ee3a12
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      74ee3a12
    • unknown's avatar
      mysql-test-run.sh: · 8d5f0fcd
      unknown authored
        Fix URLs.
      README:
        Fix URL.
      mysqltest.result:
        Update test result for real_sleep error message.
      mysqltest.c:
        Fix do_sleep() to print correct command name for real_sleep.
      
      
      client/mysqltest.c:
        Fix do_sleep() to print correct command name for real_sleep.
      mysql-test/r/mysqltest.result:
        Update test result for real_sleep error message.
      mysql-test/README:
        Fix URL.
      mysql-test/mysql-test-run.sh:
        Fix URLs.
      8d5f0fcd
    • unknown's avatar
      mysqltest.c: · 046530d5
      unknown authored
        Fix reference to incorrect (non-existent) options in comment.
      
      
      client/mysqltest.c:
        Fix reference to incorrect (non-existent) options in comment.
      046530d5
    • unknown's avatar
      Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 · df0cab0b
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      df0cab0b
    • unknown's avatar
      mysqltest.c: · 9099fb2d
      unknown authored
        Correct/clarify comments.
      
      
      client/mysqltest.c:
        Correct/clarify comments.
      9099fb2d
    • unknown's avatar
      mysqltest.c: · 773c1e04
      unknown authored
        Fix typos.
      
      
      client/mysqltest.c:
        Fix typos.
      773c1e04
    • unknown's avatar
      Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 · 71dd6057
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
      
      
      client/mysqltest.c:
        y
        manual merge
      71dd6057
    • unknown's avatar
      mysqltest.c: · 46c82ab1
      unknown authored
        Fix typos.
      
      
      client/mysqltest.c:
        Fix typos.
      46c82ab1
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8a061aa6
      unknown authored
      into sunlight.local:/work_local/14169-bug-5.0-mysql
      
      
      tests/mysql_client_test.c:
        Auto merged
      8a061aa6
    • unknown's avatar
      Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was · ddbf62ca
      unknown authored
      used
      
      In a simple queries a result of the GROUP_CONCAT() function was always of 
      varchar type.
      But if length of GROUP_CONCAT() result is greater than 512 chars and temporary
      table is used during select then the result is converted to blob, due to
      policy to not to store fields longer than 512 chars in tmp table as varchar
      fields.
      
      In order to provide consistent behaviour, result of GROUP_CONCAT() now
      will always be converted to blob if it is longer than 512 chars.
      Item_func_group_concat::field_type() is modified accordingly.
      
      
      sql/item_sum.h:
        Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was 
        used
        The Item_func_group_concat::field_type() now returns FIELD_TYPE_BLOB if the result is longer than 512 chars.
      tests/mysql_client_test.c:
        Added test case for bug#14169: type of group_concat() result changed to blob if tmp_table was used
      ddbf62ca
    • unknown's avatar
      Merge neptunus:/home/msvensson/mysql/bug16795/my50-bug16795 · 742549c5
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0
      
      
      742549c5