1. 06 Mar, 2006 17 commits
  2. 05 Mar, 2006 1 commit
  3. 04 Mar, 2006 8 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 74bbf416
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      libmysql/libmysql.c:
        Manual merge: use local.
      tests/mysql_client_test.c:
        Manual merge: use local.
      74bbf416
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6bbc1cd4
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      mysql-test/t/heap.test:
        Auto merged
      mysql-test/r/heap.result:
        SCCS merged
      6bbc1cd4
    • unknown's avatar
      Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error": · 4391f938
      unknown authored
      it breaks binary compatibility. The patch will be left intact
      in 5.1.
      
      
      libmysql/libmysql.c:
        Revert the changeset for Bug#16144: it breaks binary compatibility.
      tests/mysql_client_test.c:
        Revert the changeset for Bug#16144: it breaks binary compatibility.
      4391f938
    • unknown's avatar
      Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2 · fc969bbc
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-merges
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      fc969bbc
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2fe80956
      unknown authored
      into  mysql.com:/opt/local/work/mysql-4.1-root
      
      
      mysql-test/r/heap.result:
        Auto merged
      mysql-test/t/heap.test:
        Auto merged
      2fe80956
    • unknown's avatar
      Fix for bug #17866 "Problem with renaming table with triggers with fully · 350475fa
      unknown authored
      qualified subject table" which was introduced during work on bug #13525
      "Rename table does not keep info of triggers".
      
      The bug was caused by the fact that during reconstruction of CREATE TRIGGER
      statement stored in .TRG file which happened during RENAME TABLE we damaged
      trigger definition in case when it contained fully qualified name of subject
      table (see comment for sql_yacc.yy for more info).
      
      
      mysql-test/r/trigger.result:
        Added test for bug #17866 "Problem with renaming table with triggers with fully
        qualified subject table".
      mysql-test/t/trigger.test:
        Added test for bug #17866 "Problem with renaming table with triggers with fully
        qualified subject table".
      sql/sql_trigger.cc:
        Table_triggers_list::change_table_name_in_triggers():
          Instead of trying to use pointer to the end of subject table identifier
          we use pointer to the beginning of FOR lexeme now, so during reconstruction
          of CREATE TRIGGER statement in this function we need to add extra space
          before part which begins with FOR to get nice trigger definition.
      sql/sql_yacc.yy:
        trigger_tail:
          In this rule we can't rely on using remember_end token after table_ident token,
          since value returned depends on whether table name is fully qualified or not.
          So instead of trying to get pointer to the end of table identifier we use
          pointer to the beginning of FOR lexeme.
      350475fa
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 93b7fe4d
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-bug11527
      
      
      93b7fe4d
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · f8862a05
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-bug11527
      
      
      f8862a05
  4. 03 Mar, 2006 14 commits
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 40f38a2d
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
      
      
      40f38a2d
    • unknown's avatar
      Bug#16859 involves truncating column data at NUL characters. Instead, the · 21d6e172
      unknown authored
      client will now substitute spaces for NULs, so that the grid isn't messed up
      due to silently consumed NULs and that the full field is shown.
      
      
      client/mysql.cc:
        For non-numbers, print each character at a time, instead of using the 
        fprintf() facility, which interprets an array of chars as a C string, which 
        is necessarily NUL terminated.  We mustn't terminate on NULs, and since we 
        know the length of the data, we needn't.
      mysql-test/r/mysql.result:
        Add a test.
      mysql-test/t/mysql.test:
        Add a test.
      21d6e172
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4a793fb6
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
      
      
      4a793fb6
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 82840877
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
      
      
      82840877
    • unknown's avatar
      Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-clone · 91b3447c
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
      
      
      client/mysqltest.c:
        Auto merged
      91b3447c
    • unknown's avatar
      mysqltest.c: · d8af174a
      unknown authored
        Typos.
      
      
      client/mysqltest.c:
        Typos.
      d8af174a
    • unknown's avatar
      mysqltest.c: · 3d997647
      unknown authored
        Better fix for do_sleep().
      
      
      client/mysqltest.c:
        Better fix for do_sleep().
      3d997647
    • unknown's avatar
      mysql.spec.sh: · 0dcd0258
      unknown authored
        Use installed libz.a to avoid hard to solve static linking problems
      
      
      support-files/mysql.spec.sh:
        Use installed libz.a to avoid hard to solve static linking problems
      0dcd0258
    • unknown's avatar
      Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime · 942ba22e
      unknown authored
      into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0
      
      
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/sp.result:
        Manual merge.
      mysql-test/t/sp.test:
        Manual merge.
      942ba22e
    • unknown's avatar
      mysql-stress-test.pl, README.stress: · f31783cc
      unknown authored
        Revise stress-test README
      
      
      mysql-test/README.stress:
        Revise stress-test README
      mysql-test/mysql-stress-test.pl:
        Revise stress-test README
      f31783cc
    • unknown's avatar
      Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime · 12e04a4c
      unknown authored
      into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-release
      
      
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/sp.result:
        SCCS merged
      mysql-test/t/sp.test:
        SCCS merged
      12e04a4c
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · 6dcecacf
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-bug11527
      
      
      6dcecacf
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · e6b31ace
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      e6b31ace
    • unknown's avatar
      Windows fixes · bb60631b
      unknown authored
       - Use pipes "|"
       - Improved system command, create a temporary .sh faile that is executed  with cygwins sh(bash)
         This makes the Windows version behave exactly as the Lunix version(well almost...) 
       - Give unix path to DBUG, trace files is no produced if running ./mysql-test-run.pl --debug"
      
      
      client/mysqltest.c:
        Add new function "my_system" that run the <command> a she script using cygwin bash on windows.
      mysql-test/lib/mtr_misc.pl:
        Return all paths to executables in windows format "c:\src\.." when run on windows.
        This makes it possible to use the pipes "|" to pipöe the output form exeample "mysqlbinlog" into "mysql"
      mysql-test/mysql-test-run.pl:
        DBUG want's a unix format strings for where it should put the tracefile(don't ask me why but it works)
        Just chop of the first "c:" from the "c:/src/.." string and DBUG will be happy
      bb60631b