1. 15 Aug, 2007 5 commits
    • unknown's avatar
      Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 936f6a47
      unknown authored
      into  four.local.lan:/WORK/merge/mysql-5.1-WL3982
      
      
      936f6a47
    • unknown's avatar
      This changeset is result of · a79b35d3
      unknown authored
           WL#3982 Test information_schema.processlist
      and replaces the corresponding tests pushed to
           mysql-test-extra-5.1/mysql-test/qa-suite/info_schema 
      
      
      mysql-test/suite/funcs_1/datadict/datadict_priv.inc:
        Auxiliary script
      mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
        Test of privileges
      mysql-test/suite/funcs_1/datadict/processlist_val.inc:
        Test of values
      mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result:
        Expected results
      mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result:
        Expected results
      mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result:
        Expected results
      mysql-test/suite/funcs_1/r/b_processlist_val_ps.result:
        Expected results
      mysql-test/suite/funcs_1/t/a_processlist_priv_no_prot.test:
        Test of privileges - variant without ps/sp/cursor/view-protocol
      mysql-test/suite/funcs_1/t/a_processlist_val_no_prot.test:
        Test of values - variant without ps/sp/cursor/view-protocol
      mysql-test/suite/funcs_1/t/b_processlist_priv_ps.test:
        Test of privileges - variant with ps-protocol
      mysql-test/suite/funcs_1/t/b_processlist_val_ps.test:
        Test of values - variant with ps-protocol
      a79b35d3
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 236c2ec7
      unknown authored
      into  trift2.:/MySQL/M51/merge-5.1
      
      
      BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
        Use local, this whole tool is obsolete.
      scripts/Makefile.am:
        No change in 5.1, this never had "make_win_src_distribution".
      236c2ec7
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 9165ce50
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      9165ce50
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 582b682a
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      582b682a
  2. 14 Aug, 2007 3 commits
  3. 13 Aug, 2007 6 commits
  4. 10 Aug, 2007 4 commits
  5. 09 Aug, 2007 1 commit
    • unknown's avatar
      Updated to result files for cluster tests for version 5.1.21 · 4cfe994e
      unknown authored
      Updared to 'views' test - forcing sort order
      Updateds included masked results as a result of bug 30322
      
      
      mysql-test/suite/funcs_1/include/ndb_tb2.inc:
        Correction to test file creating an ndb table
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Updated resut file - forcing order by
      mysql-test/suite/funcs_1/r/memory_views.result:
        Updated resut file - forcing order by
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Updated resut file - forcing order by
      mysql-test/suite/funcs_1/r/ndb_cursors.result:
        updated result file
      mysql-test/suite/funcs_1/r/ndb_func_view.result:
        updated result file
      mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
        updated result file
      mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
        updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
        updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_03.result:
        updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
        updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
        updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_08.result:
        updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_09.result:
        updated result file
      mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
        updated result file
      mysql-test/suite/funcs_1/r/ndb_views.result:
        updated result file
      mysql-test/suite/funcs_1/views/views_master.inc:
        updated test file - forcing sort order
      mysql-test/suite/funcs_2/r/ndb_charset.result:
        Updated result file
      4cfe994e
  6. 08 Aug, 2007 7 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M51/clone-5.1 · f93910cc
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      sql/log_event.cc:
        Auto merged
      f93910cc
    • unknown's avatar
      BUG#30274 (Debug server crashes because mutex isn't initialized): · 3f8a904f
      unknown authored
      Completion patch, since it is possible that Log_event::write_header()
      is called with no current thread.
      
      When starting the server, there is no thread available, but
      MYSQL_BIN_LOG::open() is called to initialize the binary log. The
      function writes a format description log event to the binary log,
      which means that Log_event::write_header() can be called with no
      current thread object available.
      
      
      sql/log_event.cc:
        Since Log_event::write_header() can be called from inside
        init_server_components(), it is possible that thd is NULL. In this
        case, we set the time of the event to the current time instead
        of the start time of the query.
      3f8a904f
    • unknown's avatar
      A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due to loaded system · 6930ac54
      unknown authored
      
      mysql-test/r/log_state.result:
        Update results (Bug#28830)
      mysql-test/t/log_state.test:
        A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due 
        to loaded system - make the test more deterministic.
      6930ac54
    • unknown's avatar
      Apply patch for Bug#27806 table comments not passed in to storage engine · dea279ac
      unknown authored
      during "CREATE ... LIKE ..."
      Only affects engine writers.
      No change in server behaviour.
      
      
      sql/table.cc:
        Apply patch for Bug#27806 table comments not passed in to storage engine 
        during "CREATE ... LIKE ..."
      dea279ac
    • unknown's avatar
      Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · e23d7a37
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      sql/item.cc:
        Auto merged
      tests/mysql_client_test.c:
        Manual merge.
      e23d7a37
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · b0301f7c
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      b0301f7c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e6701d74
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
      
      
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      sql/item.cc:
        Auto merged
      e6701d74
  7. 07 Aug, 2007 7 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M51/clone-5.1 · 62411d78
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      sql/log_event.cc:
        Auto merged
      62411d78
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel · fc0b499b
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      fc0b499b
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 81178164
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      81178164
    • unknown's avatar
    • unknown's avatar
      Removed a wrong call to my_time() before my_init() has been called. · ca0a8a39
      unknown authored
      Fix for Bug#30274 "Debug server crashes because mutex isn't initialized"
      
      
      ca0a8a39
    • unknown's avatar
      Merge trift2.:/MySQL/M51/push-5.1 · 2a467605
      unknown authored
      into  trift2.:/MySQL/M51/clone-5.1
      
      
      2a467605
    • unknown's avatar
      Updated funcs_1 test and result files (not including cluster) for 5.1.21 · 422173a8
      unknown authored
      
      mysql-test/suite/funcs_1/r/innodb__datadict.result:
        Updated result file
      mysql-test/suite/funcs_1/r/innodb_func_view.result:
        Updated result file
      mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
        Updated result file
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
        Updated result file
      mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
        Updated result file
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Updated result file
      mysql-test/suite/funcs_1/r/memory__datadict.result:
        Updated result file
      mysql-test/suite/funcs_1/r/memory_func_view.result:
        Updated result file
      mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
        Updated result file
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
        Updated result file
      mysql-test/suite/funcs_1/r/memory_trig_03e.result:
        Updated result file
      mysql-test/suite/funcs_1/r/memory_views.result:
        Updated result file
      mysql-test/suite/funcs_1/r/myisam__datadict.result:
        Updated result file
      mysql-test/suite/funcs_1/r/myisam_func_view.result:
        Updated result file
      mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
        Updated result file
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
        Updated result file
      mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
        Updated result file
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Updated result file
      mysql-test/suite/funcs_1/views/views_master.inc:
        updated test file
      422173a8
  8. 06 Aug, 2007 7 commits
    • unknown's avatar
      CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js: · 1337c429
      unknown authored
        Additional changes for bug#29903
        - Changed to do embedded build part as normal build, when
          WITH_EMBEDDED_SERVER is set.
        - Allow both normal and debug build with embedded.
        - Build static embedded library by pointing out all source and compile
          it all, i.e. not building libraries from libraries, not portable.
        - Let embedded use generated files from the "sql" directory, added
          dependencies to make sure built before embedded.
        - Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
          linked in when debug target is used.
        - Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
          others can't depend on it, not defined at configure time. Instead
          set the output file name.
        - Created work around for bug in CMake 2.4.6 and output names, to
          set the "mysqld<suffix>.pdb" name to the same base name.
        - Set the correct manifest "name" (patch by iggy)
      
      
      CMakeLists.txt:
        Changes for embedded and Windows
      libmysql/CMakeLists.txt:
        Changes for embedded and Windows
      libmysqld/CMakeLists.txt:
        Changes for embedded and Windows
      libmysqld/examples/CMakeLists.txt:
        Changes for embedded and Windows
      mysys/CMakeLists.txt:
        Changes for embedded and Windows
      regex/CMakeLists.txt:
        Changes for embedded and Windows
      server-tools/instance-manager/CMakeLists.txt:
        Changes for embedded and Windows
      sql/CMakeLists.txt:
        Changes for embedded and Windows
      storage/archive/CMakeLists.txt:
        Changes for embedded and Windows
      storage/blackhole/CMakeLists.txt:
        Changes for embedded and Windows
      storage/csv/CMakeLists.txt:
        Changes for embedded and Windows
      storage/example/CMakeLists.txt:
        Changes for embedded and Windows
      storage/federated/CMakeLists.txt:
        Changes for embedded and Windows
      storage/heap/CMakeLists.txt:
        Changes for embedded and Windows
      storage/innobase/CMakeLists.txt:
        Changes for embedded and Windows
      storage/myisam/CMakeLists.txt:
        Changes for embedded and Windows
      storage/myisammrg/CMakeLists.txt:
        Changes for embedded and Windows
      strings/CMakeLists.txt:
        Changes for embedded and Windows
      vio/CMakeLists.txt:
        Changes for embedded and Windows
      win/README:
        Changes for embedded and Windows
      win/configure.js:
        Changes for embedded and Windows
      win/mysql_manifest.cmake:
        Changes for embedded and Windows
      1337c429
    • unknown's avatar
      Fix one more warning. · 090cdfe2
      unknown authored
      090cdfe2
    • unknown's avatar
      Raise version number after cloning 5.1.21-beta · e8871552
      unknown authored
      e8871552
    • unknown's avatar
      6e2a2465
    • unknown's avatar
      Fix warnings. · ae3536fe
      unknown authored
      ae3536fe
    • unknown's avatar
      Fix failing ddl_i18n* tests in the team tree. · e10a4156
      unknown authored
      e10a4156
    • unknown's avatar
      730f7722