1. 21 Sep, 2005 4 commits
    • unknown's avatar
      aftermerge fix · 4956432b
      unknown authored
      4956432b
    • unknown's avatar
      merged · aa7bc459
      unknown authored
      
      VC++Files/mysys/mysys.dsp:
        Auto merged
      VC++Files/mysys/mysys_ia64.dsp:
        Auto merged
      client/mysql.cc:
        Auto merged
      include/my_sys.h:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/rpl_multi_delete2.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/rpl_multi_delete2-slave.opt:
        Auto merged
      mysql-test/t/rpl_multi_delete2.test:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      aa7bc459
    • unknown's avatar
      merged · 56264f9a
      unknown authored
      56264f9a
    • unknown's avatar
      Don't add all args to mysqltest to MYSQL_TEST env var · 30681cf5
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Not all args to mysqltest should be added to the MYSQL_TEST environment variable. The MYSQL_TEST var is used when testing mysqltest and --record and result_file should not be set.
      30681cf5
  2. 20 Sep, 2005 5 commits
    • unknown's avatar
      Merge mysql.com:/home/psergey/bk-trees/mysql-4.1 · 458a4234
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
      
      
      sql/mysqld.cc:
        Auto merged
      458a4234
    • unknown's avatar
      BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index · a2a8216b
      unknown authored
      statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)
      
      
      include/myisam.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      myisam/mi_check.c:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      myisam/myisamchk.c:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      mysql-test/r/myisam.result:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      mysql-test/t/myisam.test:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/ha_myisam.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/handler.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/mysqld.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/set_var.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/sql_class.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      a2a8216b
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1818ff1c
      unknown authored
      into  selena.:H:/MYSQL/src/#12929-mysql-4.1
      
      
      include/my_sys.h:
        Auto merged
      1818ff1c
    • unknown's avatar
      ac604f71
    • unknown's avatar
  3. 19 Sep, 2005 14 commits
  4. 18 Sep, 2005 6 commits
  5. 17 Sep, 2005 1 commit
    • unknown's avatar
      Brian's "he is too lazy to commit this so Eric is going to have to do it"... · 0031af06
      unknown authored
      Brian's "he is too lazy to commit this so Eric is going to have to do it" environmental variable hack for prefix. This allows you to just set a prefix in your profile which will be used in all of your builds. AKA you can be even lazier(!) about calling BUILD scripts. Don't blame Eric, Brian borrowed his keyboard.
      
      
      BUILD/SETUP.sh:
        Added option to set environmental variable in case you are lazy about setting prefix (ala Brian)
      BUILD/autorun.sh:
        Change of syntax
      0031af06
  6. 16 Sep, 2005 10 commits