1. 06 Jan, 2005 9 commits
  2. 05 Jan, 2005 7 commits
    • unknown's avatar
      Merge · d9adebfa
      unknown authored
      
      include/my_pthread.h:
        fix merge conflict
      d9adebfa
    • unknown's avatar
      Allow DEFAULT_THREAD_STACK to be set via -DDEFAULT_THREAD_STACK=... so our · 3edb7774
      unknown authored
      official binary builds for Linux that are built against a static glibc with
      a 128k thread stack size limit can be compiled with a default that doesn't
      result in a harmless (but oft-misunderstood) warning message. (Bug #6226)
      
      
      include/my_pthread.h:
        Allow DEFAULT_THREAD_STACK to be set via -DDEFAULT_THREAD_STACK=...
      3edb7774
    • unknown's avatar
      my_sleep.c: · 6f2f0d5c
      unknown authored
        On Windows my_sleep() always gave a zero microsecond sleep
      
      
      mysys/my_sleep.c:
        On Windows my_sleep() always gave a zero microsecond sleep
      6f2f0d5c
    • unknown's avatar
      replace position names and testes · c99b4964
      unknown authored
      fixed bug
      
      
      c99b4964
    • unknown's avatar
      Merge · d889e399
      unknown authored
      
      mysql-test/mysql_test_run_new.c:
        SCCS merged
      d889e399
    • unknown's avatar
      WL#964 · 8a1e77e2
      unknown authored
      _stricmp was replaved on sting_compare_func
      added breakes for windows
      
      
      mysql-test/mysql_test_run_new.c:
        _stricmp was replaved on sting_compare_func
        added breakes for windows
      8a1e77e2
    • unknown's avatar
      Change mysqld_safe search for mysqld relative to the current working directory · 28478016
      unknown authored
      to only look for the mysqld binary (and english error strings) and assume the
      datadir from that. Then, if that datadir turns out to not exist, startup will
      fail. This avoids the behavior where mysqld_safe would go off and run a totally
      different binary because the data directory had been moved (even when --datadir
      was specified on the command line). (Bug #7249)
      
      
      scripts/mysqld_safe.sh:
        Don't actually verify that datadir exists when
        using relatively-located mysqld -- just assume
        that it does and either let it fail when it
        doesn't, or do the right thing when datadir
        is then set via the command line or my.cnf file.
      28478016
  3. 04 Jan, 2005 9 commits
    • unknown's avatar
      mysql_test_run_new.dsp: · b2dcf8f4
      unknown authored
        Link mysql_test_run_new as console application
      my_manage.c:
        The type intptr_t isn't defined for VC 6.0
        Changed return type for CreateProcess() to bool
      mysql_test_run_new.c:
        The type intptr_t isn't defined for VC 6.0
      mysqltest.dsp:
        Added regex to additional build types for mysqltest
      mysqldump.dsp:
        Added mysys.lib for linking mysqldump
      
      
      VC++Files/client/mysqldump.dsp:
        Added mysys.lib for linking mysqldump
      VC++Files/client/mysqltest.dsp:
        Added regex to additional build types for mysqltest
      mysql-test/mysql_test_run_new.c:
        The type intptr_t isn't defined for VC 6.0
      mysql-test/my_manage.c:
        The type intptr_t isn't defined for VC 6.0
        Changed return type for CreateProcess() to bool
      VC++Files/mysql-test/mysql_test_run_new.dsp:
        Link mysql_test_run_new as console application
      b2dcf8f4
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 54cbfead
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      
      54cbfead
    • unknown's avatar
      Merge mysql.com:/home/jwinstead2/mysql-4.1-5875 · 55ace5fd
      unknown authored
      into mysql.com:/home/jwinstead2/mysql-4.1-clean
      
      
      55ace5fd
    • unknown's avatar
      Merge mysql.com:/home/jwinstead2/mysql-4.1-5878 · e983f204
      unknown authored
      into mysql.com:/home/jwinstead2/mysql-4.1-clean
      
      
      e983f204
    • unknown's avatar
      Merge · 14e2c810
      unknown authored
      
      sql/set_var.cc:
        merge
      14e2c810
    • unknown's avatar
      client.c: · 54d86c87
      unknown authored
        Make multi-statements the preferred option name (to coincide
        with the renaming of the CLIENT_MULTI_RESULTS symbol to
        CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
        for backward compatibility.
      
      
      sql-common/client.c:
        Make multi-statements the preferred option name (to coincide
        with the renaming of the CLIENT_MULTI_RESULTS symbol to
        CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
        for backward compatibility.
      54d86c87
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · a2b18ed0
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      
      a2b18ed0
    • unknown's avatar
      Make query_cache_wlock_invalidate visible in SHOW VARIABLES (Bug #7594) · 8ffe8ab3
      unknown authored
      
      sql/set_var.cc:
        Make query_cache_wlock_invalidate visible in SHOW VARIABLES
      8ffe8ab3
    • unknown's avatar
      Use 'ps xaww' in mysqld_safe (on Linux) so whole command-line is searched · 33aa4e38
      unknown authored
      for port and/or pid-file parameters. (Bug #5878)
      
      
      scripts/mysqld_safe.sh:
        Change 'ps xa' to 'ps xaww' so whole command-line is examined
      33aa4e38
  4. 03 Jan, 2005 15 commits
    • unknown's avatar
      Fix typo in crash-me 'MATCHES' test (Bug # 5875) · b709bb0d
      unknown authored
      
      sql-bench/crash-me.sh:
        Fix typo
      b709bb0d
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.0 · a35b6537
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      Build-tools/Bootstrap:
        Auto merged
      a35b6537
    • unknown's avatar
      - Updated Bootstrap to include merge ChangeSets in the source distribution's · 7b7216e1
      unknown authored
        ChangeLog, too (to be more exact when tagging a release that's based on a
        merge ChangeSet)
      
      
      Build-tools/Bootstrap:
        - include merge ChangeSets into the ChangeLog, too (to be more exact when
          tagging a release that's based on a merge ChangeSet)
      7b7216e1
    • unknown's avatar
      Fixed a typo. · dcc3c7c3
      unknown authored
      dcc3c7c3
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 65c2ab11
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/include/ndb_global.h.in:
        Auto merged
      65c2ab11
    • unknown's avatar
      bug#7626 - post review version · 9ecd9ac6
      unknown authored
      
      ndb/include/ndb_global.h.in:
        move types into ndb_global.h.in
        Check sizeof of Uint8, Uint32 & Uint64
      ndb/include/ndb_types.h:
        move types into ndb_global.h.in
      9ecd9ac6
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 8a0bfa01
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      8a0bfa01
    • unknown's avatar
      bug#7626 - ndb UintPtr handling · e197fa45
      unknown authored
      
      ndb/include/ndb_types.h:
        redo UintPtr handling
      e197fa45
    • unknown's avatar
      mtr_process.pl: · c8cfe3d2
      unknown authored
        Added missing stop_reap_all() if returns early from function
      mysql-test-run.pl:
        Improved output from --script-debug
        Initial Cygwin support
        Improved mysqld process termination
      
      
      mysql-test/mysql-test-run.pl:
        Improved output from --script-debug
        Initial Cygwin support
        Improved mysqld process termination
      mysql-test/lib/mtr_process.pl:
        Added missing stop_reap_all() if returns early from function
      c8cfe3d2
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 07290e33
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      
      07290e33
    • unknown's avatar
      Merge mysql.com:/home/wax/mysql/mysql-4.1 · ed99f914
      unknown authored
      into mysql.com:/home/wax/mysql/mysql-4.1test2
      
      
      ed99f914
    • unknown's avatar
      WL#964 · 8bf7b342
      unknown authored
      added sort of file names for all OS
      
      
      BitKeeper/etc/ignore:
        Added mysql-test/mysql-test-run.log mysql-test/r/alter_table.err mysql-test/r/archive.err mysql-test/r/bdb-alter-table-1.err mysql-test/r/bdb-alter-table-2.err mysql-test/r/bdb-crash.err mysql-test/r/bdb-deadlock.err mysql-test/r/bdb.err mysql-test/r/bdb_cache.err mysql-test/r/client_test.err mysql-test/r/csv.err mysql-test/r/ctype_ucs.err mysql-test/r/derived.err mysql-test/r/exampledb.err mysql-test/r/func_encrypt.err mysql-test/r/isam.err mysql-test/r/lowercase_table2.err mysql-test/r/multi_update.err mysql-test/r/mysql_protocols.err mysql-test/r/mysqlbinlog.err mysql-test/r/mysqlbinlog2.err mysql-test/r/mysqldump.err mysql-test/r/mysqltest.err mysql-test/r/ndb_alter_table.err mysql-test/r/ndb_autodiscover.err mysql-test/r/ndb_autodiscover2.err mysql-test/r/ndb_basic.err mysql-test/r/ndb_blob.err mysql-test/r/ndb_cache.err mysql-test/r/ndb_charset.err mysql-test/r/ndb_index.err mysql-test/r/ndb_index_ordered.err mysql-test/r/ndb_index_unique.err mysql-test/r/ndb_insert.err mysql-test/r/ndb_limit.err m
      mysql-test/mysql_test_run_new.c:
        added sort of file names for all OS
      8bf7b342
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 1b2b19ad
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      
      1b2b19ad
    • unknown's avatar
      Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0 · 4696be1c
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      
      4696be1c
    • unknown's avatar
      Merge mysql.com:/home/wax/mysql/mysql-4.1 · 5ae33d6e
      unknown authored
      into mysql.com:/home/wax/mysql/mysql-4.1test2
      
      
      5ae33d6e