1. 22 Aug, 2007 1 commit
    • unknown's avatar
      Cleanup in the "netware" subdirectory: · 870958d2
      unknown authored
      1) We do not provide the "isam" table handler in 5.0 and up (different from "myisam" !),
         so we do not need the ".def" files for the "isam"-specific tools.
      
      2) Use "basename" to get the base name of a file, not a harder-to-read sed expression.
      
      
      BitKeeper/deleted/.del-isamchk.def:
        Delete: netware/isamchk.def
      BitKeeper/deleted/.del-isamlog.def:
        Delete: netware/isamlog.def
      BitKeeper/deleted/.del-pack_isam.def:
        Delete: netware/pack_isam.def
      netware/Makefile.am:
        Use a plain "basename" showing the purpose, not a sed command which is harder to read.
      870958d2
  2. 30 Jul, 2007 6 commits
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 46d5ebb1
      unknown authored
      into  mysql.com:/home/kent/bk/config_h/mysql-5.0-build
      
      
      46d5ebb1
    • unknown's avatar
      Generate "config.h" directly into the "include" directory, later copied · 16ff419b
      unknown authored
      to "my_config.h". Not to pollute the top directory, and to get more control
      over what is included. Made the include path for "libedit" pick up its own
      "config.h" first.
      
      
      config/ac-macros/misc.m4:
        aclocal in automake 1.8 can't handle AC_REQUIRE on
        a user macro defined in the same included file.
      cmd-line-utils/libedit/Makefile.am:
        Changed include path so that current directory is taken first, as there
        is a "config.h" there with the same name as the one in top "include".
      configure.in:
        Generate "config.h" directly into "include", don't pollute top directory
      include/Makefile.am:
        Copy "config.h" from current directory to "my_config.h", added note in
        the make file why there are two identical files with different name.
      scripts/make_binary_distribution.sh:
        Removed copy of "config.h" from top directory, it is in "include" in a
        source tree.
      16ff419b
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/config_h/mysql-4.1-build · c7e8135d
      unknown authored
      into  mysql.com:/home/kent/bk/config_h/mysql-5.0-build
      
      
      mysys/my_pthread.c:
        Auto merged
      c7e8135d
    • unknown's avatar
      my_pthread.c: · 8d0526a8
      unknown authored
        Backport of correction for Mac OS X build problem, global variable not
        initiated is "common" and can't be used in shared libraries, unless
        special flags are used (bug#26218)
      
      
      mysys/my_pthread.c:
        Backport of correction for Mac OS X build problem, global variable not
        initiated is "common" and can't be used in shared libraries, unless
        special flags are used (bug#26218)
      8d0526a8
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 06d4636b
      unknown authored
      into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
      
      
      06d4636b
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 113229b3
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      113229b3
  3. 27 Jul, 2007 6 commits
    • unknown's avatar
      Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 6bd095a6
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0
      
      
      6bd095a6
    • unknown's avatar
      Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 53c3bbd3
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0
      
      
      53c3bbd3
    • unknown's avatar
      SSL/Makefile.am mysql-test/Makefile.am: · 987ef940
      unknown authored
        Moved CERT files to where they are used, avoids conflict
        between two make files trying to install the same CERTs
      SSL/*.pem, 
        Move: SSL/*.pem -> mysql-test/std_data/
      
      
      mysql-test/std_data/cacert.pem:
        Rename: SSL/cacert.pem -> mysql-test/std_data/cacert.pem
      mysql-test/std_data/client-cert.pem:
        Rename: SSL/client-cert.pem -> mysql-test/std_data/client-cert.pem
      mysql-test/std_data/client-key.pem:
        Rename: SSL/client-key.pem -> mysql-test/std_data/client-key.pem
      mysql-test/std_data/server-cert.pem:
        Rename: SSL/server-cert.pem -> mysql-test/std_data/server-cert.pem
      mysql-test/std_data/server-key.pem:
        Rename: SSL/server-key.pem -> mysql-test/std_data/server-key.pem
      SSL/Makefile.am:
        Moved CERT files to where they are used, avoids conflict
        between two make files trying to install the same CERTs
      987ef940
    • unknown's avatar
      More fixes and cleanups for bug#28585: · aad42dc7
      unknown authored
        - make the 'dist-hook' from top-level Makefile work again.
        - we can find my_print_defaults from --basedir by parsing command
          line arguments prior to running my_print_defaults.
        - take advantage of additional command line parsing and allow the
          --no-defaults etc arguments to work anywhere rather than having
          to be the first argument.
        - find SQL files either from binary archive or source install.
        - consolidate and tidy code and error messages.
      
      
      scripts/mysql_install_db.sh:
        Consolidate error messages.
      aad42dc7
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 766725c5
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.0-engines
      
      
      766725c5
    • unknown's avatar
      BUG#29957 - alter_table.test fails · e92ce5d5
      unknown authored
      INSERT/DELETE/UPDATE followed by ALTER TABLE within LOCK TABLES
      may cause table corruption on Windows.
      
      That happens because ALTER TABLE writes outdated shared state
      info into index file.
      
      Fixed by removing obsolete workaround.
      
      Affects MyISAM tables on Windows only.
      
      
      myisam/mi_extra.c:
        On windows when mi_extra(HA_EXTRA_PREPARE_FOR_DELETE) is called,
        we release external lock and close index file. If we're in LOCK
        TABLES, MyISAM state info doesn't get updated until UNLOCK TABLES.
        
        That means when we release external lock and we're in LOCK TABLES,
        we may write outdated state info.
        
        As SQL layer closes all table instances, we do not need this
        workaround anymore.
      mysql-test/r/alter_table.result:
        A test case for BUG#29957.
      mysql-test/t/alter_table.test:
        A test case for BUG#29957.
      e92ce5d5
  4. 26 Jul, 2007 13 commits
    • unknown's avatar
      Merge debian.(none):/M50/rowlock-5.0 · e1feaa84
      unknown authored
      into  debian.(none):/M50/push-5.0
      
      
      e1feaa84
    • unknown's avatar
      Remove the "row_lock" suite from the sources. · d8c8c343
      unknown authored
      For more information, see WL#3866 and the bugs numbered 28685 and 20390.
      
      
      BitKeeper/deleted/.del-readme.txt:
        Delete: mysql-test/suite/row_lock/readme.txt
      BitKeeper/deleted/.del-summary_of_sel_test.txt:
        Delete: mysql-test/suite/row_lock/summary_of_sel_test.txt
      BitKeeper/deleted/.del-innodb_row_lock_1.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_1.result
      BitKeeper/deleted/.del-innodb_row_lock_2.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_2.result
      BitKeeper/deleted/.del-innodb_row_lock_3.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_3.result
      BitKeeper/deleted/.del-innodb_row_lock_4.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_4.result
      BitKeeper/deleted/.del-innodb_row_lock_5.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_5.result
      BitKeeper/deleted/.del-innodb_row_lock_big_tab.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result
      BitKeeper/deleted/.del-innodb_row_lock_big_tab_1.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result
      BitKeeper/deleted/.del-innodb_row_lock_big_tab_2.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result
      BitKeeper/deleted/.del-innodb_row_lock_trig_1.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result
      BitKeeper/deleted/.del-innodb_row_lock_trig_2.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result
      BitKeeper/deleted/.del-innodb_row_lock_view_1.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result
      BitKeeper/deleted/.del-row_lock.inc:
        Delete: mysql-test/suite/row_lock/include/row_lock.inc
      BitKeeper/deleted/.del-row_lock_big_tab.inc:
        Delete: mysql-test/suite/row_lock/include/row_lock_big_tab.inc
      BitKeeper/deleted/.del-row_lock_big_tab_1.inc:
        Delete: mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc
      BitKeeper/deleted/.del-row_lock_big_tab_2.inc:
        Delete: mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc
      BitKeeper/deleted/.del-row_lock_trig.inc:
        Delete: mysql-test/suite/row_lock/include/row_lock_trig.inc
      BitKeeper/deleted/.del-row_lock_view.inc:
        Delete: mysql-test/suite/row_lock/include/row_lock_view.inc
      BitKeeper/deleted/.del-row_lock_view_mix.inc:
        Delete: mysql-test/suite/row_lock/include/row_lock_view_mix.inc
      BitKeeper/deleted/.del-row_lock_view_storedp.inc:
        Delete: mysql-test/suite/row_lock/include/row_lock_view_storedp.inc
      BitKeeper/deleted/.del-row_lock_view_trig.inc:
        Delete: mysql-test/suite/row_lock/include/row_lock_view_trig.inc
      BitKeeper/deleted/.del-innodb_row_lock_view_2.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result
      BitKeeper/deleted/.del-innodb_row_lock_view_mix_1.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result
      BitKeeper/deleted/.del-innodb_row_lock_view_mix_2.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result
      BitKeeper/deleted/.del-innodb_row_lock_view_storedp_1.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result
      BitKeeper/deleted/.del-innodb_row_lock_view_storedp_2.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result
      BitKeeper/deleted/.del-innodb_row_lock_view_trig_1.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result
      BitKeeper/deleted/.del-innodb_row_lock_view_trig_2.result:
        Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result
      BitKeeper/deleted/.del-ndb_row_lock_1.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_1.result
      BitKeeper/deleted/.del-ndb_row_lock_2.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_2.result
      BitKeeper/deleted/.del-ndb_row_lock_3.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_3.result
      BitKeeper/deleted/.del-ndb_row_lock_4.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_4.result
      BitKeeper/deleted/.del-ndb_row_lock_5.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_5.result
      BitKeeper/deleted/.del-ndb_row_lock_big_tab.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result
      BitKeeper/deleted/.del-ndb_row_lock_big_tab_1.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result
      BitKeeper/deleted/.del-ndb_row_lock_big_tab_2.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result
      BitKeeper/deleted/.del-ndb_row_lock_trig_1.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result
      BitKeeper/deleted/.del-ndb_row_lock_trig_2.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result
      BitKeeper/deleted/.del-ndb_row_lock_view_1.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result
      BitKeeper/deleted/.del-ndb_row_lock_view_2.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result
      BitKeeper/deleted/.del-innodb_row_lock_1.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_1.test
      BitKeeper/deleted/.del-innodb_row_lock_2.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_2.test
      BitKeeper/deleted/.del-innodb_row_lock_3.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_3.test
      BitKeeper/deleted/.del-innodb_row_lock_4.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_4.test
      BitKeeper/deleted/.del-innodb_row_lock_5.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_5.test
      BitKeeper/deleted/.del-innodb_row_lock_big_tab.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test
      BitKeeper/deleted/.del-innodb_row_lock_big_tab_1.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test
      BitKeeper/deleted/.del-innodb_row_lock_big_tab_2.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test
      BitKeeper/deleted/.del-innodb_row_lock_trig_1.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test
      BitKeeper/deleted/.del-innodb_row_lock_trig_2.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test
      BitKeeper/deleted/.del-innodb_row_lock_view_1.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test
      BitKeeper/deleted/.del-innodb_row_lock_view_2.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test
      BitKeeper/deleted/.del-innodb_row_lock_view_mix_1.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test
      BitKeeper/deleted/.del-ndb_row_lock_view_mix_1.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result
      BitKeeper/deleted/.del-ndb_row_lock_view_mix_2.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result
      BitKeeper/deleted/.del-ndb_row_lock_view_storedp_1.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result
      BitKeeper/deleted/.del-ndb_row_lock_view_storedp_2.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result
      BitKeeper/deleted/.del-ndb_row_lock_view_trig_1.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result
      BitKeeper/deleted/.del-ndb_row_lock_view_trig_2.result:
        Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result
      BitKeeper/deleted/.del-innodb_row_lock_view_mix_2.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test
      BitKeeper/deleted/.del-innodb_row_lock_view_storedp_1.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test
      BitKeeper/deleted/.del-innodb_row_lock_view_storedp_2.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test
      BitKeeper/deleted/.del-innodb_row_lock_view_trig_1.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test
      BitKeeper/deleted/.del-innodb_row_lock_view_trig_2.test:
        Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test
      BitKeeper/deleted/.del-ndb_row_lock_1.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_1.test
      BitKeeper/deleted/.del-ndb_row_lock_2.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_2.test
      BitKeeper/deleted/.del-ndb_row_lock_3.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_3.test
      BitKeeper/deleted/.del-ndb_row_lock_4.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_4.test
      BitKeeper/deleted/.del-ndb_row_lock_5.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_5.test
      BitKeeper/deleted/.del-ndb_row_lock_big_tab.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test
      BitKeeper/deleted/.del-ndb_row_lock_big_tab_1.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test
      BitKeeper/deleted/.del-ndb_row_lock_big_tab_2.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test
      BitKeeper/deleted/.del-ndb_row_lock_trig_1.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test
      BitKeeper/deleted/.del-ndb_row_lock_trig_2.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test
      BitKeeper/deleted/.del-ndb_row_lock_view_1.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test
      BitKeeper/deleted/.del-ndb_row_lock_view_2.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test
      BitKeeper/deleted/.del-ndb_row_lock_view_mix_1.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test
      BitKeeper/deleted/.del-ndb_row_lock_view_mix_2.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test
      BitKeeper/deleted/.del-ndb_row_lock_view_storedp_1.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test
      BitKeeper/deleted/.del-ndb_row_lock_view_storedp_2.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test
      BitKeeper/deleted/.del-ndb_row_lock_view_trig_1.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test
      BitKeeper/deleted/.del-ndb_row_lock_view_trig_2.test:
        Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.test
      Makefile.am:
        Remove the "row_lock" suite from the "test-bt" target.
        
        Also, a formatting change: empty line for better readability.
      d8c8c343
    • unknown's avatar
      Merge xiphis.org:/anubis/antony/work/mysql-5.0-engines · b7eca8bc
      unknown authored
      into  xiphis.org:/anubis/antony/work/mysql-5.0-engines.merge
      
      
      b7eca8bc
    • unknown's avatar
      Merge debian.(none):/M41/push-4.1 · bd0b7c1c
      unknown authored
      into  debian.(none):/M50/push-5.0
      
      
      bd0b7c1c
    • unknown's avatar
      Merge debian.(none):/M50/bug16635-5.0 · 734ebd28
      unknown authored
      into  debian.(none):/M50/push-5.0
      
      
      734ebd28
    • unknown's avatar
      Merge debian.(none):/M50/mysql-5.0 · 690f0df5
      unknown authored
      into  debian.(none):/M50/push-5.0
      
      
      690f0df5
    • unknown's avatar
      Merge debian.(none):/M41/bug16635-4.1 · 947e42af
      unknown authored
      into  debian.(none):/M41/push-4.1
      
      
      947e42af
    • unknown's avatar
      Merge debian.(none):/M41/bug16635-4.1 · cc93da0a
      unknown authored
      into  debian.(none):/M50/bug16635-5.0
      
      
      BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
        Auto merged
      cc93da0a
    • unknown's avatar
      mysql_install_db.sh: · 8f5b0254
      unknown authored
        Fix error in previous change, correct --language argument.
      
      
      scripts/mysql_install_db.sh:
        Fix error in previous change, correct --language argument.
      8f5b0254
    • unknown's avatar
      Apply a few more cleanups to improve the robustness of mysql_install_db · 82bbaaf6
      unknown authored
      
      scripts/mysql_install_db.sh:
        Put back variable initialisation for those which could be passed
        in via the environment and confuse the script.
      82bbaaf6
    • unknown's avatar
      Clean up the mysql_install_db script to ensure that a sane environment is · 17136906
      unknown authored
      available and reduce the chance of failure.  This should fix bug#28585
      which is caused by the script being quite random in how it finds files it
      requires and not giving very good feedback to the user about what went
      wrong.
      
      Also update make_binary_distribution so that it provides the correct path
      to the required SQL scripts when generating mysql_install_db.  The script
      only previously worked because of the permissive behaviour which looked
      around the current working directory before the "correct" location.  This
      could lead to severe problems if the user happened to run the script from
      a location which contained older or even broken copies of the SQL scripts.
      
      We now require either a complete binary release (and the mysql_install_db
      script ran from inside the extracted archive), or an installed compiled
      tree, as this is the only way we can be sure everything that we need is
      available and ready to run.
      
      While working on this fix, also clean up the mysql_install_db script a lot
      to make it simpler, easier to read, and hopefully less prone to bugs in
      the future.
      
      
      scripts/make_binary_distribution.sh:
        SQL files live in ./share not ./support-files in binary distribution.
      scripts/mysql_install_db.sh:
        Use a consistent shell indentation style.
      17136906
    • unknown's avatar
      Raise the 64 character limit for path names in the error messages · 00d694a9
      unknown authored
      to 150 or 107 characters for those messages which are generated
      by the embedded server during release builds.
      
      This fixes bug#16635:
         Error messages wrong: absolute path names, "%s" format code
      
      See the bug report or the changelog for "sql/share/english/errmsg.txt"
      for instructions how to do that with other languages, 
      even at the customer site, and for the restrictions to keep.
      
      
      sql/share/english/errmsg.txt:
        The embedded server uses absolute path names in its error messages,
        in the release build environment these exceed the 64 character limit
        which the format strings for the error messages impose (bug#16635).
        
        But when the messages are output, the server does the "printf()" 
        internally in a 256 character buffer; the constant text and the
        expanded variables (strings, error number) must fit into this.
        
        (If the buffer would overflow, a format specification will not be
        expanded but just copied with its code, and the message output
        will just contain '%s' or '%d' where a value is expected.)
        
        So the string lengths are increased to 150 characters in those messages
        which are issued by the embedded server during release tests
        and contain 1 (one) path name,
        but only to 107 in the "rename" message which contains 2 (two).
        
        This solves bug#16635 for the release builds.
        
        For other languages used by OEM customers, similar fixes may be needed,
        but we cannot test them.
        
        These fixes can be done even in a binary installation at the customer site
        by following these steps:
           cd <<install-root>>/share
           $EDITOR <<lang>>/errmsg.txt
           ../../bin/comp_err -C./charsets/ <<lang>>/errmsg.txt <<lang>>/errmsg.sys
        and then restarting the server.
      00d694a9
    • unknown's avatar
      fix pushbuild failures · 85af6ba9
      unknown authored
      
      sql/ha_federated.cc:
        remote_error_number is set to -1 when an error was already reported
        with my_error(). ER(-1) will also cause a crash on 64bit arch and only
        worked on 32bit arch by luck
      85af6ba9
  5. 25 Jul, 2007 4 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · 2df3b7b0
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      mysql-test/t/create.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/create.result:
        Merge with 5.0 (main).
      2df3b7b0
    • unknown's avatar
      Bug#25679 · b42247bc
      unknown authored
        "Federated Denial of Service"
        Federated storage engine used to attempt to open connections within
        the ::create() and ::open() methods which are invoked while LOCK_open
        mutex is being held by mysqld. As a result, no other client sessions
        can open tables while Federated is attempting to open a connection.
        Long DNS lookup times would stall mysqld's operation and a rogue
        connection string which connects to a remote server which simply
        stalls during handshake can stall mysqld for a much longer period of
        time.
        This patch moves the opening of the connection much later, when the
        federated actually issues queries, by which time the LOCK_open mutex is
        no longer being held.
      
      
      mysql-test/r/federated.result:
        change of test/results due to patch for bug25679
      mysql-test/t/federated.test:
        change of test/results due to patch for bug25679
      sql/ha_federated.cc:
        bug25679
          remove function check_foreign_fata_source()
          ha_federated::open() no longer opens the federated connection.
          ha_federated::create() no longer opens and tests connection.
          ha_federated::real_connect() opens connection and tests presence of table.
          ha_federated::real_query() sends query, calling real_connect() if neccessary.
      sql/ha_federated.h:
        bug25679
          new methods real_query() and real_connect()
      b42247bc
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1-opt · 0784d924
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      0784d924
    • unknown's avatar
      Updated/fixed test and result files to 5.0.46 · 78207030
      unknown authored
      Note datadict files do not include wrong is_updatable wrong value 
           as a result of bug 30020.
      
      
      mysql-test/suite/funcs_1/datadict/datadict_master.inc:
        Updated test file
      mysql-test/suite/funcs_1/r/innodb__datadict.result:
        Updated test file
      mysql-test/suite/funcs_1/r/innodb_func_view.result:
        Updated test file
      mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
        Updated test file
      mysql-test/suite/funcs_1/r/innodb_trig_08.result:
        Updated test file
      mysql-test/suite/funcs_1/r/innodb_trig_09.result:
        Updated test file
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Updated test file
      mysql-test/suite/funcs_1/r/memory__datadict.result:
        Updated test file
      mysql-test/suite/funcs_1/r/memory_func_view.result:
        Updated test file
      mysql-test/suite/funcs_1/r/memory_trig_0102.result:
        Updated test file
      mysql-test/suite/funcs_1/r/memory_trig_08.result:
        Updated test file
      mysql-test/suite/funcs_1/r/memory_trig_09.result:
        Updated test file
      mysql-test/suite/funcs_1/r/memory_views.result:
        Updated test file
      mysql-test/suite/funcs_1/r/myisam__datadict.result:
        Updated test file
      mysql-test/suite/funcs_1/r/myisam_func_view.result:
        Updated test file
      mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
        Updated test file
      mysql-test/suite/funcs_1/r/myisam_trig_08.result:
        Updated test file
      mysql-test/suite/funcs_1/r/myisam_trig_09.result:
        Updated test file
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Updated test file
      mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
        Updated test file
      mysql-test/suite/funcs_1/views/func_view.inc:
        Updated test file
      78207030
  6. 24 Jul, 2007 6 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 607ab14c
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
      
      
      607ab14c
    • unknown's avatar
      fix compile on Windows for bug25714.c · 5415dcc3
      unknown authored
      ---
      fix compile on Windows for bug25714.c
      
      
      tests/bug25714.c:
        fix compile on Windows
      5415dcc3
    • unknown's avatar
      build bug25714 test app on Windows · 4ab0c0cf
      unknown authored
      4ab0c0cf
    • unknown's avatar
      Bug#15130: CREATE .. SELECT was denied to use advantages of the SQL_BIG_RESULT. · c4d53e31
      unknown authored
      When the SQL_BIG_RESULT flag is specified SELECT should store items from the
      select list in the filesort data and use them when sending to a client.
      The get_addon_fields function is responsible for creating necessary structures
      for that. But this function was allowed to do so only for SELECT and
      INSERT .. SELECT queries. This makes the SQL_BIG_RESULT useless for
      the CREATE .. SELECT queries.
      
      Now the get_addon_fields allows storing select list items in the filesort
      data for the CREATE .. SELECT queries.
      
      
      mysql-test/t/create.test:
        Added a test case for the bug#15130: CREATE .. SELECT was denied to use
        advantages of the SQL_BIG_RESULT.
      mysql-test/r/create.result:
        Added a test case for the bug#15130: CREATE .. SELECT was denied to use
        advantages of the SQL_BIG_RESULT.
      sql/filesort.cc:
        Bug#15130: CREATE .. SELECT was denied to use advantages of the SQL_BIG_RESULT.
        Now the get_addon_fields allows storing select list items in the filesort
        data for the CREATE .. SELECT queries.
      c4d53e31
    • unknown's avatar
      Merge xiphis.org:/anubis/antony/work/p2-bug25714.1 · 594d71a4
      unknown authored
      into  xiphis.org:/anubis/antony/work/p2-bug25714.1.merge-5.0
      
      
      594d71a4
    • unknown's avatar
      Bug#25714 · 0f85ae9f
      unknown authored
        "getGeneratedKeys() does not work with FEDERATED table"
        mysql_insert() expected the storage engine to update the row data
        during the write_row() operation with the value of the new auto-
        increment field. The field must be updated when only one row has
        been inserted as mysql_insert() would ignore the thd->last_insert.
        This patch implements HA_STATUS_AUTO support in ha_federated::info()
        and ensures that ha_federated::write_row() does update the row's
        auto-increment value.
        The test case was written in C as the protocol's 'id' value is
        accessible through libmysqlclient and not via SQL statements.
        mysql-test-run.pl was extended to enable running the test binary.
      
      
      mysql-test/mysql-test-run.pl:
        bug25714
          implement support to run C test for bug25714
      sql/ha_federated.cc:
        bug25714
          The storage engine instance property auto_increment_value was not
          being set.
          mysql_insert() requires that the storage engine updates the row with
          the auto-increment value, especially when only inserting one row.
          Implement support for ha_federated::info(HA_STATUS_AUTO)
      tests/Makefile.am:
        bug25714
          build C test for bug
      mysql-test/include/have_bug25714.inc:
        New BitKeeper file ``mysql-test/include/have_bug25714.inc''
      mysql-test/r/federated_bug_25714.result:
        New BitKeeper file ``mysql-test/r/federated_bug_25714.result''
      mysql-test/r/have_bug25714.require:
        New BitKeeper file ``mysql-test/r/have_bug25714.require''
      mysql-test/t/federated_bug_25714.test:
        New BitKeeper file ``mysql-test/t/federated_bug_25714.test''
      tests/bug25714.c:
        New BitKeeper file ``tests/bug25714.c''
      0f85ae9f
  7. 23 Jul, 2007 4 commits
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c29002a5
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B29644-5.0-opt
      
      
      sql/ha_innodb.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        5.0-opt merge
      mysql-test/t/innodb_mysql.test:
        5.0-opt merge
      c29002a5
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f76d006a
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.0-opt
      
      
      f76d006a
    • unknown's avatar
      table.cc, sql_select.cc: · c38fa3f3
      unknown authored
        Limit the fix for bug 28591 to InnoDB only
      
      
      sql/sql_select.cc:
        Limit the fix for bug 28591 to InnoDB only
      sql/table.cc:
        Limit the fix for bug 28591 to InnoDB only
      c38fa3f3
    • unknown's avatar
      Fixed bug #29611. · d50caace
      unknown authored
      If a primary key is defined over column c of enum type then 
      the EXPLAIN command for a look-up query of the form
        SELECT * FROM t WHERE c=0
      said that the query was with an impossible where condition though the
      query correctly returned non-empty result set when the table indeed 
      contained rows with error empty strings for column c. 
      
      This kind of misbehavior was due to a bug in the function 
      Field_enum::store(longlong,bool) that erroneously returned 1 if
      the the value to be stored was equal to 0. 
      Note that the method 
      Field_enum::store(const char *from,uint length,CHARSET_INFO *cs)
      correctly returned 0 if a value of the error empty string 
      was stored. 
      
      
      mysql-test/r/type_enum.result:
        Added a test case for bug #29661.
      mysql-test/t/type_enum.test:
        Added a test case for bug #29661.
      sql/field.cc:
        Fixed bug #29611.
        If a primary key was defined over column c of enum type then 
        the EXPLAIN command for a look-up query of the form
          SELECT * FROM t WHERE c=0
        said that the query was with an impossible where condition though the
        query correctly returned non-empty result set when the table indeed 
        contained rows with error empty strings for column c. 
        
        This kind of misbehavior was due to a bug in the function 
        Field_enum::store(longlong,bool) that erroneously returned 1 if
        the the value to be stored was equal to 0. 
        Note that the method 
        Field_enum::store(const char *from,uint length,CHARSET_INFO *cs)
        correctly returned 0 if a value of the error empty string 
        was stored.
      d50caace