1. 07 Dec, 2006 4 commits
  2. 05 Dec, 2006 2 commits
  3. 02 Dec, 2006 2 commits
    • unknown's avatar
      mysql_install_db.sh: · 1172c8ae
      unknown authored
        If --srcdir and --windows is given, check if error message file
        is in source or build tree (bug#24557)
      Makefile.am:
        Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
      mysql_install_db.sh:
        Added --srcdir=DIR option, used from top Makefile.am in dist-hook
        target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
      Makefile.am:
        Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
        the source and build tree.
        Call "mysql_install_db" with new option --srcdir, to enable the script
        to find all that is needed, if source and build directory is not the same
        (bug#24557)
      
      
      scripts/mysql_install_db.sh:
        If --srcdir and --windows is given, check if error message file
        is in source or build tree (bug#24557)
      Makefile.am:
        Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
        the source and build tree.
        Call "mysql_install_db" with new option --srcdir, to enable the script
        to find all that is needed, if source and build directory is not the same
        (bug#24557)
      include/Makefile.am:
        Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
      1172c8ae
    • unknown's avatar
      Makefile.am: · ca35cae7
      unknown authored
        Added "mysql_client_test.def"
      mysql_client_test.def:
        BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
      
      
      netware/mysql_client_test.def:
        BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
      netware/Makefile.am:
        Added "mysql_client_test.def"
      ca35cae7
  4. 01 Dec, 2006 5 commits
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mysql-4.1-build · 9243f624
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0-build
      
      
      9243f624
    • unknown's avatar
      mysql_upgrade.def Makefile.am: · d2eabe30
      unknown authored
        Added new "mysql_upgrade.def" for Netware (bug#23504)
      *.def:
        Allocate 128K stack for all executables (bug#23504)
      
      
      netware/comp_err.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/isamchk.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/isamlog.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/libmysql.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/my_print_defaults.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisam_ftdump.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisamchk.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisamlog.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisampack.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_install_db.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_test_run.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_waitpid.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqladmin.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlbinlog.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlcheck.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqld.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqld_safe.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqldump.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlimport.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlshow.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqltest.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/pack_isam.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/perror.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/replace.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/resolve_stack_dump.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/resolveip.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_upgrade.def:
        BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_upgrade.def
      netware/Makefile.am:
        Added "mysql_upgrade.def"
      d2eabe30
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel · c06f995b
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
      
      
      client/mysqltest.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      c06f995b
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0184996b
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
      
      
      0184996b
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 114197b5
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
      
      
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      114197b5
  5. 30 Nov, 2006 11 commits
    • unknown's avatar
      late after-merge fix · 0bc42ce6
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        late after-merge fix: re-add MTR_BUILD_THREAD=auto
      0bc42ce6
    • unknown's avatar
      Fixed compiler warnings · 25226de9
      unknown authored
      Don't assert if my_thread_end() is called twice (common case)
      
      
      client/mysql.cc:
        Removed not used variables
      client/mysqldump.c:
        Fixed compiler warnings
      client/mysqltest.c:
        Fixed compiler warnings
      cmd-line-utils/readline/bind.c:
        Fixed compiler warnings
      cmd-line-utils/readline/histfile.c:
        Fixed compiler warnings
      extra/replace.c:
        Fixed compiler warning on windows
      extra/yassl/taocrypt/include/algebra.hpp:
        Fixed compiler warnings
      heap/hp_write.c:
        Fixed compiler warnings
      innobase/os/os0file.c:
        Fixed compiler warnings
      libmysql/libmysql.c:
        Call my_end()/my_thread_end last.
        my_end() calls free_charsets(), which allowed me to move the call
      myisam/myisampack.c:
        Fixed compiler warnings
      myisammrg/myrg_rkey.c:
        Fixed compiler warnings
      mysys/my_thr_init.c:
        More comments
        Don't assert if my_thread_end() is called twice (common case)
      ndb/src/mgmapi/mgmapi.cpp:
        Fixed compiler warnings
      ndb/src/ndbapi/Ndb.cpp:
        Fixed compiler warnings
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Fixed compiler warnings
      ndb/src/ndbapi/NdbTransaction.cpp:
        Fixed compiler warnings
      ndb/src/ndbapi/Ndblist.cpp:
        Fixed compiler warnings
      server-tools/instance-manager/guardian.cc:
        Removed not used variable
      server-tools/instance-manager/portability.h:
        Removed duplicated symbol
      sql/gen_lex_hash.cc:
        Fixed compiler warning
      sql/ha_archive.cc:
        Fixed compiler warnings
      sql/ha_ndbcluster.cc:
        Fixed compiler warnings
      sql/mysqld.cc:
        Fixed compiler warnings
      sql/sql_cache.cc:
        Fixed compiler warnings
        Fixed DBUG_PRINT strings to be consistent with 5.1
      sql/tztime.cc:
        Fixed compiler warnings
      sql/uniques.cc:
        Fixed compiler warnings
      25226de9
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-opt · a4342155
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/B11927-5.0-opt
      
      
      a4342155
    • unknown's avatar
      func_group.test, func_group.result, func_gconcat.result, func_gconcat.test: · 140c3ee9
      unknown authored
        merge fix : removed undeterministic warnings
      
      
      mysql-test/r/func_gconcat.result:
        merge fix : removed undeterministic warnings
      mysql-test/r/func_group.result:
        merge fix : removed undeterministic warnings
      mysql-test/t/func_gconcat.test:
        merge fix : removed undeterministic warnings
      mysql-test/t/func_group.test:
        merge fix : removed undeterministic warnings
      140c3ee9
    • unknown's avatar
      Fixed portability issue in my_thr_init.c (was added in my last push) · 7191e775
      unknown authored
      Fixed compiler warnings (detected by VC++):
      - Removed not used variables
      - Added casts
      - Fixed wrong assignments to bool
      - Fixed wrong calls with bool arguments
      - Added missing argument to store(longlong), which caused wrong store method to be called.
      
      
      
      client/mysqldump.c:
        Removed compiler warning
      heap/hp_clear.c:
        Removed compiler warning
      include/my_global.h:
        Removed compiler warning
      include/my_tree.h:
        Changed memory limits from int to ulong
        (Allowed me to get rid of some compiler warnings)
      myisam/mi_create.c:
        Removed compiler warning
      myisam/myisampack.c:
        Removed compiler warning
      mysys/base64.c:
        Removed compiler warning
      mysys/my_thr_init.c:
        Fixed portability issue (detected on windows)
        Added DBUG_ASSERT to detect if we call my_thread_end() too many times
        Don't wait if THR_thread_count == -1 (error condition)
      mysys/tree.c:
        Removed compiler warning
      sql/field.cc:
        Removed compiler warning
        Fixed wrong parameter to check_date()
        Added missing argument to store(longlong)
      sql/ha_archive.cc:
        Removed compiler warning
      sql/ha_federated.cc:
        Removed compiler warning
      sql/ha_innodb.cc:
        Removed not used variable
      sql/handler.cc:
        Removed not used variable
        Fixed wrong if (we didn't detect if rollback or commit failed). Not critical as value is not yet used
      sql/item.cc:
        Removed compiler warning
      sql/item_func.cc:
        Removed compiler warning
      sql/item_strfunc.cc:
        Removed compiler warning
      sql/item_timefunc.cc:
        Removed compiler warning
      sql/log.cc:
        Removed compiler warning
      sql/mysql_priv.h:
        Removed compiler warning
      sql/opt_range.cc:
        Removed compiler warning
      sql/password.c:
        Removed compiler warning
      sql/set_var.cc:
        Removed compiler warning
      sql/slave.cc:
        Removed compiler warning
      sql/sp.cc:
        Removed compiler warning
      sql/sp_cache.cc:
        Removed compiler warning
      sql/sp_head.cc:
        Removed compiler warning
        Adjusted argument to reserve() to not use up too much memory that we are probably not going to need
      sql/sql_acl.cc:
        Added missing argument to store(longlong)
      sql/sql_base.cc:
        Removed compiler warning
      sql/sql_db.cc:
        Removed compiler warning
      sql/sql_delete.cc:
        Removed compiler warning
      sql/sql_handler.cc:
        Removed not used variable
      sql/sql_lex.h:
        Removed not used variable
      sql/sql_prepare.cc:
        Removed not used variable
      sql/sql_rename.cc:
        Removed not used variable
      sql/sql_select.cc:
        Fixed that select_options are not 'cut'
        Removed some not used variables
        Removed compiler warnings by adding cast
      sql/sql_show.cc:
        Removed not used variables
        Added missing argument to store(longlong)
        Removed compiler warnings
      sql/sql_trigger.cc:
        Removed not used variables
        Added cast to remove compiler warnings
      sql/sql_update.cc:
        Fixed wrong set of bool variable
      sql/sql_view.cc:
        Removed not used variables
        Added cast to get rid of compiler warnings
      sql-common/client.c:
        Fixed compiler warning
      sql-common/my_time.c:
        Fixed wrong argument to check_date()
        Added casts to get rid of compiler warnings
      sql/sql_yacc.yy:
        Removed not used variable
      sql/uniques.cc:
        Changes memory size from uint to ulong
        Added casts to get rid of compiler warnings
      strings/ctype-simple.c:
        Fixed cast to get rid of compiler warnings
      7191e775
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 32f06501
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
      
      
      mysql-test/lib/mtr_process.pl:
        Auto merged
      32f06501
    • unknown's avatar
      minor fix to mtr_process.pl · 5af42c1b
      unknown authored
      
      mysql-test/lib/mtr_process.pl:
        print extra message _once_ every 60 seconds
      5af42c1b
    • unknown's avatar
      Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-opt · 45fc00ee
      unknown authored
      into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
      
      
      45fc00ee
    • unknown's avatar
      Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0 · 6e791795
      unknown authored
      into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      6e791795
    • unknown's avatar
      Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1 · 7c9c5409
      unknown authored
      into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-opt
      
      
      7c9c5409
    • unknown's avatar
      func_gconcat.result, func_gconcat.test: · ef42631b
      unknown authored
        disabled warnings because their order is undeterministic
      
      
      mysql-test/t/func_gconcat.test:
        disabled warnings because their order is undeterministic
      mysql-test/r/func_gconcat.result:
        disabled warnings because their order is undeterministic
      ef42631b
  6. 29 Nov, 2006 16 commits