1. 07 Jun, 2004 2 commits
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 8a2b50c4
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0-merge
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      8a2b50c4
    • unknown's avatar
      Post-merge fixes. · 5a83f0c8
      unknown authored
      
      mysql-test/r/index_merge.result:
        Post-merge update of results. (Ok according to Sanja)
      sql/opt_range.cc:
        Post-merge fix provided by Sergey Petrunia.
      sql/sql_select.cc:
        Post-merge fix provided by Sergey Petrunia.
      5a83f0c8
  2. 03 Jun, 2004 1 commit
    • unknown's avatar
      Post-merge fixes. · 17785f63
      unknown authored
      Not finished, will not be pushed until additional fixes have been made.
      
      
      client/mysqlbinlog.cc:
        Post-merge fixes.
      mysql-test/r/func_time.result:
        Post-merge fixes.
      sql/opt_range.cc:
        Post-merge fixes.
      sql/sql_select.cc:
        Post-merge fixes.
      17785f63
  3. 28 May, 2004 2 commits
    • unknown's avatar
      Fixed BUG#2460: Crash wih Stored Procedure and UNION. · b0921b1f
      unknown authored
      
      mysql-test/r/sp.result:
        Added test case for BUG#2460.
      mysql-test/t/sp.test:
        Added test case for BUG#2460.
      sql/sql_union.cc:
        When called from stored procedures, tabs might be reset already.
      b0921b1f
    • unknown's avatar
      Added test cases for the following bugs that have been fixed by recent changes: · 72139b18
      unknown authored
       BUG#1863: CREATE TABLE in Stored Procedure sometimes crashes on repeated calls.
       BUG#2656: select with join in stored procedure: erroneous result on 2nd call.
       BUG#3426: IF x IS NULL in stored procedure fails on second call within connection.
       BUG#3448: Stored Procedures with inner joins possible bug.
       BUG#3734: Stored procedure returns wrong rows with fulltext parameter.
       BUG#3863: Stored procedure crash when incrementing variable in a loop.
      
      (And corrected the row count output to the client after CALL)
      
      
      mysql-test/r/sp.result:
        New test case results for fixed bugs.
      mysql-test/t/sp.test:
        New test cases for fixed bugs.
      sql/sql_parse.cc:
        Corrected the row_count output to the client.
      72139b18
  4. 26 May, 2004 4 commits
    • unknown's avatar
      Merging 4.1 to 5.0. · f8866c16
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysqltest.c:
        Auto merged
      configure.in:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisamdef.h:
        Auto merged
      mysql-test/r/func_group.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/null.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/rpl_server_id2.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/rpl000015.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table.test:
        Auto merged
      mysql-test/t/rpl_log.test:
        Auto merged
      mysql-test/t/rpl_log_pos.test:
        Auto merged
      mysql-test/t/rpl_max_relay_size.test:
        Auto merged
      mysql-test/t/rpl_relayrotate.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/t/rpl_server_id2.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      netware/BUILD/compile-netware-all:
        Auto merged
      netware/BUILD/compile-netware-standard:
        Auto merged
      netware/BUILD/mwenv:
        Auto merged
      netware/Makefile.am:
        Auto merged
      netware/my_manage.c:
        Auto merged
      netware/my_manage.h:
        Auto merged
      netware/mysql_test_run.c:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_berkeley.h:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/protocol.h:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_string.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/client_test.c:
        Auto merged
      f8866c16
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 556b51e1
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-sp2_bak-5.0
      
      
      mysql-test/t/sp.test:
        Auto merged
      556b51e1
    • unknown's avatar
      cleunup items of instruction after every instruction execution · 82fd12f4
      unknown authored
      
      sql/sp_head.h:
        removed blanks at line end
        cleunup items of instruction after every instruction execution
      82fd12f4
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · efac33e3
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0-merge
      
      
      efac33e3
  5. 25 May, 2004 27 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3a675ff5
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      3a675ff5
    • unknown's avatar
      Bug#3882 · 39ace7f1
      unknown authored
      39ace7f1
    • unknown's avatar
      merge with 4.0 to get Netware patches and fixes for libmysqld.dll · a9b481d3
      unknown authored
      
      configure.in:
        Auto merged
      Build-tools/Do-compile:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqladmin.c:
        Auto merged
      client/mysqlcheck.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      client/mysqlshow.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/my_global.h:
        Auto merged
      include/thr_alarm.h:
        Auto merged
      innobase/include/trx0roll.h:
        Auto merged
      innobase/include/trx0trx.h:
        Auto merged
      innobase/que/que0que.c:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      innobase/trx/trx0purge.c:
        Auto merged
      innobase/trx/trx0roll.c:
        Auto merged
      innobase/trx/trx0trx.c:
        Auto merged
      innobase/usr/usr0sess.c:
        Auto merged
      isam/isamchk.c:
        Auto merged
      myisam/myisam_ftdump.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/my_getopt.c:
        Auto merged
      mysys/my_init.c:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      netware/Makefile.am:
        Auto merged
      netware/init_db.sql:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      tools/mysqlmanager.c:
        Auto merged
      VC++Files/dbug/dbug.dsp:
        Auto merged
      VC++Files/heap/heap.dsp:
        Auto merged
      VC++Files/isam/isam.dsp:
        Auto merged
      VC++Files/libmysql/libmysql.dsp:
        Auto merged
      VC++Files/myisam/myisam.dsp:
        Auto merged
      VC++Files/myisammrg/myisammrg.dsp:
        Auto merged
      VC++Files/mysys/mysys.dsp:
        Auto merged
      VC++Files/libmysqld/libmysqld.dsp:
        merge
      client/mysqlbinlog.cc:
        merge
      extra/perror.c:
        merge
      include/mysql_com.h:
        merge
      libmysqld/Makefile.am:
        merge
      netware/BUILD/mwenv:
        merge
      sql/mysqld.cc:
        merge
      a9b481d3
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · e7f108e0
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-sp2-5.0
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      e7f108e0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · a3d0ce6b
      unknown authored
      into mysql.com:/tmp/skr99/mysql-4.0
      
      
      a3d0ce6b
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 · 84fbc276
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.0
      
      
      84fbc276
    • unknown's avatar
      Proposed fix for bug #3818 (libmysqld.dll leads to program's crash) · 19a78cea
      unknown authored
      configurations added to build the libraries with USE_TLS flag to be
      used for libmysqld
      
      
      VC++Files/dbug/dbug.dsp:
        TLS_DEBUG configuration added
      VC++Files/heap/heap.dsp:
        TLS and TLS_DEBUG configurations added
      VC++Files/isam/isam.dsp:
        TLS and TLS_DEBUG configurations added
      VC++Files/libmysql/libmysql.dsp:
        MYSQL_CLIENT define enabled
      VC++Files/libmysqld/libmysqld.dsp:
        using of _tls libraries added
      VC++Files/myisam/myisam.dsp:
        TLS and TLS_DEBUG configurations added
      VC++Files/myisammrg/myisammrg.dsp:
        TLS and TLS_DEBUG configurations added
      VC++Files/mysys/mysys.dsp:
        TLS and TLS_DEBUG configurations added
      include/mysql_com.h:
        __declspec(dllimport) seems to be necessary when one uses .dll
        on Windows
      19a78cea
    • unknown's avatar
      Remove not needed sql_olap.cc from Makefile.am · de5edbf8
      unknown authored
      
      VC++Files/comp_err/comp_err.dsp:
        removed not needed library
      libmysqld/Makefile.am:
        Remove not needed sql_olap.cc
      de5edbf8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · b287ca53
      unknown authored
      into mysql.com:/tmp/skr99/mysql-4.0
      
      
      client/mysqltest.c:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      myisam/myisam_ftdump.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      b287ca53
    • unknown's avatar
      Added patches from Novell · b3851363
      unknown authored
      
      Build-tools/Do-compile:
        Fixed indentation
      configure.in:
        Added patches from Novell
        Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS
      extra/perror.c:
        Fixed error number reporting to not report 'Unknown error'
      include/my_global.h:
        Defines to make NETWARE patches cleaner
      include/thr_alarm.h:
        Fixed wrong macro
      netware/mysql_install_db.c:
        Indentation fix
      b3851363
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 095434e5
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0-merge
      
      
      095434e5
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · e1b406ba
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      
      e1b406ba
    • unknown's avatar
      8df3bffd
    • unknown's avatar
      InnoDB cleanup and possible bug-fix: Remove srv0que · b2882fd4
      unknown authored
      
      BitKeeper/deleted/.del-srv0que.c~d1feebb77b5a9b96:
        Delete: innobase/srv/srv0que.c
      innobase/srv/Makefile.am:
        Remove srv0que.c
      BitKeeper/deleted/.del-srv0que.h~f12ecb4b5afe203e:
        Delete: innobase/include/srv0que.h
      innobase/include/Makefile.am:
        Remove srv0que.c
      innobase/include/que0que.h:
        Remove unnecessary function que_fork_error_handle()
        que_thr_end_wait(): Remove output parameter next_thr; return it
      innobase/include/trx0roll.h:
        trx_rollback(), trx_finish_rollback_off_kernel():
        Remove output parameter next_thr; return it instead
      innobase/include/trx0trx.h:
        trx_sig_send(), trx_sig_reply(), trx_sig_start_handle():
        Remove output parameter next_thr; return it instead
      innobase/include/usr0sess.h:
        Remove sess->state and its literals SESS_ACTIVE and SESS_ERROR
      innobase/que/que0que.c:
        Remove unnecessary function que_fork_error_handle()
        que_thr_end_wait(): Remove output parameter next_thr; return it
        Remove references to srv0que.c
      innobase/srv/srv0srv.c:
        Remove unnecessary #include "srv0que.h"
      innobase/trx/trx0purge.c:
        Remove unneeded references to srv0que.c
      innobase/trx/trx0roll.c:
        Many functions: Remove output parameter next_thr; return it instead
        Remove references to srv0que.c
      innobase/trx/trx0trx.c:
        Many functions: Remove output parameter next_thr; return it instead
        Remove references to srv0que.c
        Remove references to SESS_ERROR
      innobase/usr/usr0sess.c:
        Remove sess->state
      b2882fd4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 7c5cc74e
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      7c5cc74e
    • unknown's avatar
    • unknown's avatar
      changed comment for LONG_DATA_COMMAND · cde39f5e
      unknown authored
      cde39f5e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0da2710c
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      0da2710c
    • unknown's avatar
      Merge with 4.0 to get fixes for project files · 5e0df34b
      unknown authored
      5e0df34b
    • unknown's avatar
      Fixed VC++ project files · 137af900
      unknown authored
      
      VC++Files/copy_mysql_files.bat:
        Added /Y to avoid questions
        Fixed wrong path for copying data files
      VC++Files/sql/mysqld.dsp:
        Added missing compiler option
      137af900
    • unknown's avatar
      Preparation for user-defined Unicode collations: · 8ee5b216
      unknown authored
      weights data now comes from a static variables
      but from the charset structure. 
      
      
      8ee5b216
    • unknown's avatar
      sql_string.h: · 6c09db27
      unknown authored
        Not used code.
        ,
      sql_string.cc:
        Not used code.
      
      
      sql/sql_string.cc:
        Not used code.
      sql/sql_string.h:
        Not used code.
        ,
      6c09db27
    • unknown's avatar
      1. Some optimization when conversion is not needed. · 9983aed8
      unknown authored
      2. One now must pass length argument into append(const char *str, uint length),
      length is not calculated internally anymore.
      
      
      9983aed8
    • unknown's avatar
      Removed references to BDB and InnoDB from 'classic' release · b7e8f418
      unknown authored
      
      VC++Files/mysqldemb/mysqldemb.dsp:
        Removed references to BDB and InnoDB from 'classic'
      VC++Files/sql/mysqld.dsp:
        Removed references to BDB and InnoDB from 'classic'
      b7e8f418
    • unknown's avatar
      fixed typos · 48e39bf2
      unknown authored
      48e39bf2
    • unknown's avatar
      Merge · f80e9e04
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      Build-tools/Do-compile:
        SCCS merged
      f80e9e04
    • unknown's avatar
      logging_ok: · 80060d1e
      unknown authored
        Logging to logging@openlogging.org accepted
      Do-compile:
        1. Option to ensure that logs are moved and then backed up on each host prior to a build
        2. Option to run build with flag "--without-ndbcluster"
      
      
      Build-tools/Do-compile:
        1. Option to ensure that logs are moved and then backed up on each host prior to a build
        2. Option to run build with flag "--without-ndbcluster"
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      80060d1e
  6. 24 May, 2004 4 commits
    • unknown's avatar
      Merge with 4.0 to get typo-fix · d6827703
      unknown authored
      
      VC++Files/client/mysql.dsp:
        Auto merged
      VC++Files/client/mysqladmin.dsp:
        Auto merged
      VC++Files/client/mysqldump.dsp:
        Auto merged
      VC++Files/client/mysqlimport.dsp:
        Auto merged
      VC++Files/client/mysqlshow.dsp:
        Auto merged
      VC++Files/isamchk/isamchk.dsp:
        Auto merged
      VC++Files/my_print_defaults/my_print_defaults.dsp:
        Auto merged
      VC++Files/myisamchk/myisamchk.dsp:
        Auto merged
      VC++Files/myisamlog/myisamlog.dsp:
        Auto merged
      VC++Files/myisampack/myisampack.dsp:
        Auto merged
      VC++Files/mysqlbinlog/mysqlbinlog.dsp:
        Auto merged
      VC++Files/mysqlcheck/mysqlcheck.dsp:
        Auto merged
      VC++Files/pack_isam/pack_isam.dsp:
        Auto merged
      VC++Files/perror/perror.dsp:
        Auto merged
      VC++Files/replace/replace.dsp:
        Auto merged
      VC++Files/sql/mysqld.dsp:
        Auto merged
      VC++Files/libmysqld/libmysqld.dsp:
        Merge
      d6827703
    • unknown's avatar
      Fixed typo · 8a1a9930
      unknown authored
      8a1a9930
    • unknown's avatar
      Merge with 4.0 to get fixes for Windows project files · 656e6e55
      unknown authored
      
      VC++Files/client/mysql.dsp:
        Auto merged
      VC++Files/client/mysqladmin.dsp:
        Auto merged
      VC++Files/client/mysqldump.dsp:
        Auto merged
      VC++Files/mysql.dsw:
        Auto merged
      VC++Files/client/mysqlimport.dsp:
        Auto merged
      VC++Files/client/mysqlshow.dsp:
        Auto merged
      VC++Files/isamchk/isamchk.dsp:
        Auto merged
      VC++Files/libmysql/libmysql.dsp:
        Auto merged
      VC++Files/my_print_defaults/my_print_defaults.dsp:
        Auto merged
      VC++Files/myisamchk/myisamchk.dsp:
        Auto merged
      VC++Files/myisamlog/myisamlog.dsp:
        Auto merged
      VC++Files/myisampack/myisampack.dsp:
        Auto merged
      VC++Files/mysqlbinlog/mysqlbinlog.dsp:
        Auto merged
      VC++Files/mysqlcheck/mysqlcheck.dsp:
        Auto merged
      VC++Files/mysqlmanager/mysqlmanager.dsp:
        Auto merged
      VC++Files/mysys/mysys.dsp:
        Auto merged
      VC++Files/pack_isam/pack_isam.dsp:
        Auto merged
      VC++Files/perror/perror.dsp:
        Auto merged
      VC++Files/replace/replace.dsp:
        Auto merged
      include/my_global.h:
        Auto merged
      include/mysql_version.h.in:
        Auto merged
      innobase/eval/eval0eval.c:
        Auto merged
      innobase/sync/sync0arr.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql-bench/crash-me.sh:
        Auto merged
      sql-bench/limits/mysql-4.0.cfg:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      656e6e55
    • unknown's avatar
      New MYSQL_SERVER_SUFFIX usage (for easier compilation) · da1623dd
      unknown authored
      Update of VC++ project files.
      
      
      VC++Files/mysqlmanager/childfrm.cpp:
        Rename: VC++Files/mysqlmanager/CHILDFRM.CPP -> VC++Files/mysqlmanager/childfrm.cpp
      VC++Files/mysqlmanager/childfrm.h:
        Rename: VC++Files/mysqlmanager/CHILDFRM.H -> VC++Files/mysqlmanager/childfrm.h
      VC++Files/mysqlmanager/mainfrm.cpp:
        Rename: VC++Files/mysqlmanager/MAINFRM.CPP -> VC++Files/mysqlmanager/mainfrm.cpp
      VC++Files/mysqlmanager/mainfrm.h:
        Rename: VC++Files/mysqlmanager/MAINFRM.H -> VC++Files/mysqlmanager/mainfrm.h
      VC++Files/mysqlmanager/mysqlmanager.dsp:
        Rename: VC++Files/mysqlmanager/MySqlManager.dsp -> VC++Files/mysqlmanager/mysqlmanager.dsp
      VC++Files/mysqlmanager/mysqlmanager.mak:
        Rename: VC++Files/mysqlmanager/MySqlManager.mak -> VC++Files/mysqlmanager/mysqlmanager.mak
      VC++Files/mysqlmanager/resource.h:
        Rename: VC++Files/mysqlmanager/RESOURCE.H -> VC++Files/mysqlmanager/resource.h
      VC++Files/mysqlmanager/stdafx.cpp:
        Rename: VC++Files/mysqlmanager/STDAFX.CPP -> VC++Files/mysqlmanager/stdafx.cpp
      VC++Files/mysqlmanager/stdafx.h:
        Rename: VC++Files/mysqlmanager/STDAFX.H -> VC++Files/mysqlmanager/stdafx.h
      VC++Files/mysqlmanager/toolsql.cpp:
        Rename: VC++Files/mysqlmanager/TOOLSQL.CPP -> VC++Files/mysqlmanager/toolsql.cpp
      VC++Files/mysqlmanager/toolsql.h:
        Rename: VC++Files/mysqlmanager/TOOLSQL.H -> VC++Files/mysqlmanager/toolsql.h
      VC++Files/mysqlmanager/RES/bitmap1.bmp:
        Rename: VC++Files/mysqlmanager/RES/BITMAP1.BMP -> VC++Files/mysqlmanager/RES/bitmap1.bmp
      VC++Files/mysqlmanager/RES/bitmap3.bmp:
        Rename: VC++Files/mysqlmanager/RES/BITMAP3.BMP -> VC++Files/mysqlmanager/RES/bitmap3.bmp
      VC++Files/mysqlmanager/RES/bmp00001.bmp:
        Rename: VC++Files/mysqlmanager/RES/BMP00001.BMP -> VC++Files/mysqlmanager/RES/bmp00001.bmp
      VC++Files/mysqlmanager/RES/bmp00002.bmp:
        Rename: VC++Files/mysqlmanager/RES/BMP00002.BMP -> VC++Files/mysqlmanager/RES/bmp00002.bmp
      VC++Files/mysqlmanager/RES/database.bmp:
        Rename: VC++Files/mysqlmanager/RES/DATABASE.BMP -> VC++Files/mysqlmanager/RES/database.bmp
      VC++Files/mysqlmanager/RES/fontd.bmp:
        Rename: VC++Files/mysqlmanager/RES/FONTD.BMP -> VC++Files/mysqlmanager/RES/fontd.bmp
      VC++Files/mysqlmanager/RES/fontu.bmp:
        Rename: VC++Files/mysqlmanager/RES/FONTU.BMP -> VC++Files/mysqlmanager/RES/fontu.bmp
      VC++Files/mysqlmanager/RES/query_ex.bmp:
        Rename: VC++Files/mysqlmanager/RES/QUERY_EX.BMP -> VC++Files/mysqlmanager/RES/query_ex.bmp
      VC++Files/mysqlmanager/RES/toolbar.bmp:
        Rename: VC++Files/mysqlmanager/RES/TOOLBAR.BMP -> VC++Files/mysqlmanager/RES/toolbar.bmp
      BUILD/compile-pentium-valgrind-max:
        Use MYSQL_SERVER_SUFFIX
      VC++Files/bdb/bdb.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/client/mysql.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/client/mysqladmin.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/client/mysqldump.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/client/mysqlimport.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/client/mysqlshow.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/copy_mysql_files.bat:
        Assume we are in correct directory
      VC++Files/innobase/innobase.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
        Remove old files
      VC++Files/isamchk/isamchk.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/libmysqld/libmysqld.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/my_print_defaults/my_print_defaults.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/myisamchk/myisamchk.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/myisamlog/myisamlog.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/myisampack/myisampack.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/mysql.dsw:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/mysqlbinlog/mysqlbinlog.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/mysqlcheck/mysqlcheck.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/mysys/mysys.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/pack_isam/pack_isam.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/perror/perror.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/replace/replace.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      VC++Files/sql/mysqld.dsp:
        Use new version of MYSQL_SERVER_SUFFIX
      include/my_global.h:
        Added QUOTE and STRINGIFY
      include/mysql_version.h.in:
        New MYSQL_SERVER_SUFFIX handling
      innobase/eval/eval0eval.c:
        Fixed compiler warning
      libmysql/libmysql.c:
        Use STRINGIFY()
      sql/mysqld.cc:
        New MYSQL_SERVER_SUFFIX handling
      sql/mysqld_suffix.h:
        New MYSQL_SERVER_SUFFIX handling
      sql/set_var.cc:
        Use STRINGIFY()
      zlib/contrib/asm386/zlibvc.dsp:
        Updated for 4.0
      da1623dd