1. 13 Apr, 2006 1 commit
    • 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
  2. 12 Apr, 2006 4 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:/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 bk-internal:/home/bk/mysql-5.0 · 10633fd8
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      10633fd8
  3. 11 Apr, 2006 12 commits
  4. 10 Apr, 2006 20 commits
  5. 09 Apr, 2006 3 commits