1. 10 Dec, 2009 4 commits
  2. 09 Dec, 2009 2 commits
  3. 08 Dec, 2009 2 commits
  4. 07 Dec, 2009 11 commits
  5. 05 Dec, 2009 6 commits
  6. 04 Dec, 2009 1 commit
  7. 03 Dec, 2009 2 commits
  8. 02 Dec, 2009 4 commits
  9. 01 Dec, 2009 7 commits
    • Andrei Elkin's avatar
      Manual resolving for the following files · 92a09678
      Andrei Elkin authored
      Text conflict in mysql-test/collections/default.experimental
      Text conflict in mysql-test/r/show_check.result
      Text conflict in mysql-test/r/sp-code.result
      Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
      Text conflict in mysql-test/suite/rpl/t/disabled.def
      Text conflict in mysql-test/t/show_check.test
      Text conflict in mysys/my_delete.c
      Text conflict in sql/item.h
      Text conflict in sql/item_cmpfunc.h
      Text conflict in sql/log.cc
      Text conflict in sql/mysqld.cc
      Text conflict in sql/repl_failsafe.cc
      Text conflict in sql/slave.cc
      Text conflict in sql/sql_parse.cc
      Text conflict in sql/sql_table.cc
      Text conflict in sql/sql_yacc.yy
      Text conflict in storage/myisam/ha_myisam.cc
      
      Corrected results for
       stm_auto_increment_bug33029.reject      2009-12-01
      		20:01:49.000000000 +0300
             <andrei> @@ -42,9 +42,6 @@
             <andrei>  RETURN i;
             <andrei>  END//
             <andrei>  CALL p1();
             <andrei> -Warnings:
             <andrei> -Note   1592    Statement may not be safe to log in statement
      		format.
             <andrei> -Note   1592    Statement may not be safe to log in statement
      		format.
      
      There should be indeed no Note present because there is in fact autoincrement 
      top-level query in sp() that triggers inserting in yet another auto-inc table.
      (todo: alert DaoGang to improve the test).
      92a09678
    • Vladislav Vaintroub's avatar
      fix build errors · e5fc6cb7
      Vladislav Vaintroub authored
      e5fc6cb7
    • Alexander Nozdrin's avatar
      A patch for Bug#48915 (After having switched off the ipv6 support in OS, · d15ac975
      Alexander Nozdrin authored
      mysqld crashed in network_init()).
      
      The problem was that current_thd was not ready at that point in mysqld life,
      so ER() macro could not be used.
      
      The fix is to use ER_DEFAULT() macro, which is intented for such cases.
      d15ac975
    • Vladislav Vaintroub's avatar
      in RESTRICT_SYMBOL_EXPORTS,handle cases where COMPILE_FLAGS are not set · 18c0d0fc
      Vladislav Vaintroub authored
      (COMPILE_FLAGS-NOTFOUND)
      18c0d0fc
    • Vladislav Vaintroub's avatar
      fix make dist errors · c0961c65
      Vladislav Vaintroub authored
      c0961c65
    • Vladislav Vaintroub's avatar
      - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINE · 71d54af5
      Vladislav Vaintroub authored
      - Fix semisync library prefix (remove lib on Unixes)
      - restrict exported symbols from zlib and yassl (fvisibility=hidden)
      71d54af5
    • Marc Alff's avatar
      WL#2360 Performance schema · d7462fb7
      Marc Alff authored
      Part 1: Instrumentation interface
      d7462fb7
  10. 30 Nov, 2009 1 commit