1. 08 Aug, 2006 2 commits
    • unknown's avatar
      BUG#21173: SHOW TABLE STATUS crashes mysqld · 8ed7e148
      unknown authored
      Review fixes
      
      
      mysql-test/r/partition.result:
        New test cases
      mysql-test/t/partition.test:
        New test cases
      sql/ha_partition.cc:
        Added comments after review
        + removed erroneus setting
      8ed7e148
    • unknown's avatar
      BUG#21173: SHOW TABLE STATUS crashes on InnoDB tables · 9cfcc214
      unknown authored
      Don't use get_auto_increment on tables without auto_increment fields
      
      
      mysql-test/r/partition.result:
        new test case
      mysql-test/t/partition.test:
        new test case
      sql/ha_partition.cc:
        Don't use get_auto_increment on tables without auto_increment fields
      9cfcc214
  2. 03 Aug, 2006 13 commits
  3. 02 Aug, 2006 4 commits
  4. 01 Aug, 2006 17 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 30e11b06
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      
      mysql-test/r/innodb.result:
        Auto merged
      30e11b06
    • unknown's avatar
      sql_view.cc: · 84b16f0e
      unknown authored
        After merge fix
      
      
      sql/sql_view.cc:
        After merge fix
      84b16f0e
    • unknown's avatar
      Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql · 8ce7848a
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      sql/sql_view.cc:
        SCCS merged
      8ce7848a
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 10b90c06
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      
      10b90c06
    • unknown's avatar
      Makefile.am: · b3708b7c
      unknown authored
        After merge fix
      
      
      storage/ndb/test/ndbapi/Makefile.am:
        After merge fix
      b3708b7c
    • unknown's avatar
      func_str.result: · a03006eb
      unknown authored
        After merge fix
      
      
      mysql-test/r/func_str.result:
        After merge fix
      a03006eb
    • unknown's avatar
      serg's MacOSX-intel portability diff · e80a76d7
      unknown authored
      e80a76d7
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 759027d1
      unknown authored
      into  rakia.(none):/home/kgeorge/mysql/autopush/B20103-5.0-opt
      
      
      759027d1
    • unknown's avatar
      Bug #20103: Escaping with backslash does not work · ec95bf78
      unknown authored
       - make the client to respect the server-side 
         no_backslash_escapes option and disable the 
         special meaning of backslash also at client side.
      
      
      mysql-test/r/mysql_client.result:
        Bug #20103: Escaping with backslash does not work
         - test case
      mysql-test/t/mysql_client.test:
        Bug #20103: Escaping with backslash does not work
         - test case
      ec95bf78
    • unknown's avatar
      Bug#20439 mysqltest: remove unused options · 97712780
      unknown authored
       -Remove leftovers of server_stop and server_start commands 
      
      
      client/mysqltest.c:
        Remove leftovers  of "server_start" and "server_stop" commands
      97712780
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug19535 · 63076970
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      63076970
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · deee3a30
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      
      mysql-test/r/auto_increment.result:
        Auto merged
      mysql-test/r/binlog_row_blackhole.result:
        Auto merged
      mysql-test/r/binlog_stm_blackhole.result:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/func_compress.result:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/r/func_group.result:
        Auto merged
      mysql-test/r/func_math.result:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/func_system.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/group_by.result:
        Auto merged
      mysql-test/r/group_min_max.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/r/partition_pruning.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/rpl_get_lock.result:
        Auto merged
      mysql-test/r/rpl_master_pos_wait.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/type_blob.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/group_min_max.test:
        Auto merged
      mysql-test/t/partition_pruning.test:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.h:
        Auto merged
      deee3a30
    • unknown's avatar
      After merge fix · f75e79e0
      unknown authored
      f75e79e0
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 0c0f49bc
      unknown authored
      into  rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
      
      
      0c0f49bc
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b91f3bac
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
      
      
      b91f3bac
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · 9cb377f9
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
      
      
      extra/yassl/src/ssl.cpp:
        Auto merged
      mysql-test/t/rpl_openssl.test:
        Auto merged
      9cb377f9
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · f3099ba3
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      f3099ba3
  5. 31 Jul, 2006 4 commits