1. 07 Dec, 2009 2 commits
  2. 05 Dec, 2009 5 commits
  3. 04 Dec, 2009 1 commit
  4. 03 Dec, 2009 1 commit
  5. 02 Dec, 2009 4 commits
  6. 01 Dec, 2009 7 commits
    • Andrei Elkin's avatar
      Manual resolving for the following files · 0eda4846
      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).
      0eda4846
    • Vladislav Vaintroub's avatar
      fix build errors · 1407b6f1
      Vladislav Vaintroub authored
      1407b6f1
    • Alexander Nozdrin's avatar
      A patch for Bug#48915 (After having switched off the ipv6 support in OS, · 273454b9
      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.
      273454b9
    • Vladislav Vaintroub's avatar
      in RESTRICT_SYMBOL_EXPORTS,handle cases where COMPILE_FLAGS are not set · 8b90176a
      Vladislav Vaintroub authored
      (COMPILE_FLAGS-NOTFOUND)
      8b90176a
    • Vladislav Vaintroub's avatar
      fix make dist errors · 60a3d300
      Vladislav Vaintroub authored
      60a3d300
    • Vladislav Vaintroub's avatar
      - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINE · d2139f31
      Vladislav Vaintroub authored
      - Fix semisync library prefix (remove lib on Unixes)
      - restrict exported symbols from zlib and yassl (fvisibility=hidden)
      d2139f31
    • Marc Alff's avatar
      WL#2360 Performance schema · f2d67abb
      Marc Alff authored
      Part 1: Instrumentation interface
      f2d67abb
  7. 30 Nov, 2009 4 commits
  8. 28 Nov, 2009 1 commit
  9. 27 Nov, 2009 4 commits
  10. 26 Nov, 2009 4 commits
  11. 25 Nov, 2009 7 commits
    • Vladislav Vaintroub's avatar
    • Vladislav Vaintroub's avatar
      merge · ac0b2048
      Vladislav Vaintroub authored
      ac0b2048
    • Vladislav Vaintroub's avatar
      merge · 68cfabcc
      Vladislav Vaintroub authored
      68cfabcc
    • Alexander Nozdrin's avatar
      Update result files. · 1792de0a
      Alexander Nozdrin authored
      1792de0a
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · 3c11750e
      Alexander Nozdrin authored
      3c11750e
    • Alik's avatar
      Fix typo (s/_WIN_/__WIN__). · d19168a9
      Alik authored
      d19168a9
    • Alexander Nozdrin's avatar
      Backport of WL#798 (MySQL IPv6 support) from 6.0. · 7eb84da8
      Alexander Nozdrin authored
      The following 6.0 revisions were analyzed:
        - sp1r-brian@zim.(none)-20071228102738-21894
        - sp1r-brian@zim.(none)-20071228121841-56447
        - sp1r-brian@zim.(none)-20071228205403-56423
        - sp1r-brian@zim.(none)-20071228221139-55341
        - sp1r-brian@zim.(none)-20071228233443-55352
        - sp1r-brian@zim.(none)-20071229094527-61763
        - sp1r-brian@zim.(none)-20071230203739-61746
        - sp1r-brian@zim.(none)-20080102213805-61741
        - sp1r-brian@zim.(none)-20080103201041-61746
        - sp1r-brian@zim.(none)-20080104234927-59875
        - sp1r-brian@zim.(none)-20080105005827-59874
        - sp1r-brian@zim.(none)-20080105012020-59865
        - sp1r-brian@zim.(none)-20080106003858-59857
        - sp1r-brian@zim.(none)-20080123195552-31680
        - sp1r-brian@zim.(none)-20080124201848-29999
        - sp1r-brian@zim.(none)-20080129075144-36991
        - sp1r-cbell/Chuck@mysql_cab_desk.-20080215041806-21954
        - sp1r-vvaintroub@wva.-20080212124547-06272
        - sp1r-dfischer/mysqldev@mysql.com/production.mysql.com-20071223184258-15140
        - sp1r-brian@zim.(none)-20080206122216-35774
        - sp1r-baker@bk-internal.mysql.com-20080209005622-35947
        - sp1r-baker@bk-internal.mysql.com-20080224215608-24613
        - sp1r-baker@bk-internal.mysql.com-20080307170710-63543
        - sp1r-baker@bk-internal.mysql.com-20080312233205-13069
        - sp1r-Reggie@core.-20080402175211-28643
        - kpettersson@mysql.com-20080901101150-4ne74r8v0492vv42
        - alik@sun.com-20090805173811-9fzt0ymcp9tsvn7k
        - alik@sun.com-20090805173937-fcv1fdveodq5x9gb
        - alik@sun.com-20090805175009-g1od16i3t1xkw2qr
        - kostja@sun.com-20090805200643-j9i4fy7ii8ijho5c
        - alik@sun.com-20090807195303-j4fb5m4l1dgdahwo
        - alik@sun.com-20090808114848-3rkzr9kifrijzaqy
        - alik@sun.com-20090810041739-ugmx34h34uid8mox
        - alik@sun.com-20090810105306-rf43rfyzzblsy5e7
        - alik@sun.com-20090810123113-ccdjwai68b5woqdm
        - alik@sun.com-20090811080423-gb7pibec1znaydzy
        - alik@sun.com-20090811082130-5uckar1vx3kdsw7g
        - alik@sun.com-20090812202051-uqkfwwxxcjvo5ean
      
      The following bugfixes are also backported within this patch:
        - Bug#34292: netdb.h missing in hostname.cc
        - Bug#39153: Failing to lookup a host name can lead to crash
          in current IPv6 implementation
        - Bug#38247: Server does not resolve connecting ip's
        - Bug#43006: main.skip_name_resolve fails on Windows in PB2
        - Bug#45606: ACL requires IPv4-mapped addresses to be used
        - Bug#45584: Host name cache does not work as a cache
      7eb84da8