1. 05 Apr, 2007 4 commits
    • unknown's avatar
      zlib.m4: · 60289fba
      unknown authored
        Only require the more recent zlibCompileFlags() when
        building the server, client zlib don't need it.
      Makefile.am:
        Always build the bundled zlib static only
      configure.in:
        Look for dlopen() even if --with-mysqld-ldflags constains "-static",
        as this is not the same as the flag to "ld", it just informs
        "libtool" to link static with libraries created part of the build,
        even if there exists shared versions.
      make_binary_distribution.sh:
        Real "mysqlmanager" executable might be in ".libs"
      
      
      configure.in:
        Look for dlopen() even if --with-mysqld-ldflags constains "-static",
        as this is not the same as the flag to "ld", it just informs
        "libtool" to link static with libraries created part of the build,
        even if there exists shared versions.
      config/ac-macros/zlib.m4:
        Only require the more recent zlibCompileFlags() when
        building the server, client zlib don't need it.
      scripts/make_binary_distribution.sh:
        Real "mysqlmanager" executable might be in ".libs"
      zlib/Makefile.am:
        Always build the bundled zlib static only
      60289fba
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/sotest/mysql-4.1-build · bbc6ed24
      unknown authored
      into  mysql.com:/home/kent/bk/sotest/mysql-5.0-build
      
      
      bbc6ed24
    • unknown's avatar
      Deleted reject files accidently checked in · f76ab0c4
      unknown authored
        configure.in.rej
        include/my_global.h.rej
        BUILD/SETUP.sh.rej
        mysys/thr_alarm.c.rej
        include/my_pthread.h.rej
      
      
      BitKeeper/deleted/.del-SETUP.sh.rej:
        Delete: BUILD/SETUP.sh.rej
      BitKeeper/deleted/.del-configure.in.rej:
        Delete: configure.in.rej
      BitKeeper/deleted/.del-my_global.h.rej:
        Delete: include/my_global.h.rej
      BitKeeper/deleted/.del-my_pthread.h.rej:
        Delete: include/my_pthread.h.rej
      BitKeeper/deleted/.del-thr_alarm.c.rej:
        Delete: mysys/thr_alarm.c.rej
      f76ab0c4
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5e00af7e
      unknown authored
      into  mysql.com:/home/kent/bk/sotest/mysql-5.0-build
      
      
      5e00af7e
  2. 03 Apr, 2007 3 commits
  3. 02 Apr, 2007 3 commits
  4. 31 Mar, 2007 6 commits
  5. 30 Mar, 2007 7 commits
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · f47c2328
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      f47c2328
    • unknown's avatar
      BUG#26624, pushbuild fixes: Merge to 5.0 · 2016b21c
      unknown authored
      
      mysql-test/r/range.result:
        Auto merged
      mysql-test/t/range.test:
        Auto merged
      2016b21c
    • unknown's avatar
      BUG#26624: high mem usage (crash) in range optimizer · 080c0c7a
      unknown authored
      Pushbuild fixes: 
       - Make MAX_SEL_ARGS smaller (even 16K records_in_range() calls is 
         more than it makes sense to do in typical cases)
       - Don't call sel_arg->test_use_count() if we've already allocated 
         more than MAX_SEL_ARGs elements. The test will succeed but will take
         too much time for the test suite (and not provide much value).
      
      
      mysql-test/r/range.result:
        BUG#26624: high mem usage (crash) in range optimizer
        Pushbuild fixes: make the test go faster
      mysql-test/t/range.test:
        BUG#26624: high mem usage (crash) in range optimizer
        Pushbuild fixes: make the test go faster
      080c0c7a
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · ade8bbf4
      unknown authored
      into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
      
      
      ade8bbf4
    • unknown's avatar
      Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the · 86a0ffdd
      unknown authored
      NO_AUTO_VALUE_ON_ZERO mode.
      
      In the NO_AUTO_VALUE_ON_ZERO mode the table->auto_increment_field_not_null
      variable is used to indicate that a non-NULL value was specified by the user
      for an auto_increment column. When an INSERT .. ON DUPLICATE updates the
      auto_increment field this variable is set to true and stays unchanged for the
      next insert operation. This makes the next inserted row sometimes wrongly have
      0 as the value of the auto_increment field.
      
      Now the fill_record() function resets the table->auto_increment_field_not_null
      variable before filling the record.
      The table->auto_increment_field_not_null variable is also reset by the
      open_table() function for a case if we missed some auto_increment_field_not_null
      handling bug.
      Now the table->auto_increment_field_not_null is reset at the end of the
      mysql_load() function.
      
      Reset the table->auto_increment_field_not_null variable after each
      write_row() call in the copy_data_between_tables() function.
      
      
      
      
      sql/field_conv.cc:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
        NO_AUTO_VALUE_ON_ZERO mode.
        A comment is corrected.
      sql/handler.cc:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
        NO_AUTO_VALUE_ON_ZERO mode.
        Now the handler::update_auto_increment() function doesn't reset the
        table->auto_increment_field_not_null variable as it is done in the
        fill_record() function.
      sql/sql_base.cc:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
        NO_AUTO_VALUE_ON_ZERO mode.
        Now the fill_record() function resets the table->auto_increment_field_not_null
        variable before filling the record.
        The table->auto_increment_field_not_null variable is also reset by the
        open_table() function for a case if we missed some auto_increment_field_not_null
        handling bug.
      sql/sql_insert.cc:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the
        NO_AUTO_VALUE_ON_ZERO mode.
        Now the the table->auto_increment_field_not_null is reset at the end of the
        mysql_insert() an in the select_insert class destructor.
      sql/sql_load.cc:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
        NO_AUTO_VALUE_ON_ZERO mode.
        Now the table->auto_increment_field_not_null is reset at the end of the
        mysql_load() function.
      sql/sql_table.cc:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the
        NO_AUTO_VALUE_ON_ZERO mode.
        Reset the table->auto_increment_field_not_null variable after each
        write_row() call in the copy_data_between_tables() function.
      sql/table.h:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the
        NO_AUTO_VALUE_ON_ZERO mode.
        A comment added.
      mysql-test/r/insert_update.result:
        Added the test case for the bug#23233: 0 as LAST_INSERT_ID() after
        INSERT .. ON DUPLICATE in the NO_AUTO_VALUE_ON_ZERO mode.
      mysql-test/t/insert_update.test:
        Added the test case for the bug#23233: 0 as LAST_INSERT_ID() after
        INSERT .. ON DUPLICATE in the NO_AUTO_VALUE_ON_ZERO mode.
      86a0ffdd
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · fe8c67ef
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      fe8c67ef
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 905bc913
      unknown authored
      into  mysql.com:/home/bar/mysql-5.0.b22638
      
      
      905bc913
  6. 29 Mar, 2007 15 commits
  7. 28 Mar, 2007 2 commits
    • unknown's avatar
      configure.in: · 406fd12a
      unknown authored
        Don't install ndb man pages if no ndb configured
      config-win.h, CMakeLists.txt, README, configure.js:
        Removed Cybozu patches
      
      
      configure.in:
        Don't install ndb man pages if no ndb configured
      CMakeLists.txt:
        Removed Cybozu patches
      include/config-win.h:
        Removed Cybozu patches
      win/README:
        Removed Cybozu patches
      win/configure.js:
        Removed Cybozu patches
      406fd12a
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 57d465b4
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
      
      
      57d465b4