1. 23 Aug, 2007 1 commit
    • unknown's avatar
      Fixed bug #30287. · 380cc93c
      unknown authored
      Recommit to 5.1.22.
      The server created temporary tables for filesort in the working directory
      instead of the specified tmpdir directory.
      
      
      sql/item.cc:
        Fixed bug #30287.
        Recommit to 5.1.22.
        The Item_field::set_field method has been modified to reset the any_privileges
        flag to false in case of system temporary table. This modification prevents the
        server from unnecessary checking of user privileges to access system temporary
        tables.
      sql/sql_select.cc:
        Fixed bug #30287.
        Recommit to 5.1.22.
        Bugfix for #29015 has been removed: TABLE_SHARE::table_name of system
        temporary tables contains full path to table file basename again.
      sql/sql_view.cc:
        Fixed bug #30287.
        Recommit to 5.1.22.
        Commentary has been added.
      380cc93c
  2. 22 Aug, 2007 3 commits
    • unknown's avatar
      Bug#30359 · fc766e51
      unknown authored
        "Test federated_bug_25714 issues non-existing shell command"
        Problem caused by missing '$' symbol in eval statement causing it
        to always attempt to run test even if the test was not compiled.
      
      
      mysql-test/include/have_bug25714.inc:
        bug30359
          missing '$' in eval statement
      fc766e51
    • unknown's avatar
      Fix the version number. · 7c5aa8a6
      unknown authored
      
      configure.in:
        Version is 5.1.22 !
      7c5aa8a6
    • unknown's avatar
      Merge trift2.:/MySQL/M51/clone-5.1 · b07fc544
      unknown authored
      into  trift2.:/MySQL/M51/target-5.1.22
      
      
      b07fc544
  3. 21 Aug, 2007 1 commit
    • unknown's avatar
      ndb_dd_dump.test, ndb_dd_dump.result: · 833afa54
      unknown authored
        uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas
      
      
      mysql-test/suite/ndb/t/ndb_dd_dump.test:
        uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas
      mysql-test/suite/ndb/r/ndb_dd_dump.result:
        uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas
      833afa54
  4. 20 Aug, 2007 1 commit
  5. 16 Aug, 2007 4 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-marvel · 02f1b317
      unknown authored
      into  mysql.com:/data0/mysqldev/my/build-200708161639-5.1.21-beta/mysql-5.1-release
      
      
      sql/log_event.cc:
        Auto merged
      02f1b317
    • unknown's avatar
      Set back version number after pulling bugfix · c319ade1
      unknown authored
      c319ade1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel · 6b10f518
      unknown authored
      into  mysql.com:/data0/mysqldev/my/mysql-5.1-30367
      
      
      sql/sql_show.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/log_event.cc:
        Manual merge, later version of the fix takes precedence.
      6b10f518
    • unknown's avatar
      Fixed errors found by pushbuild: · 10ef77fc
      unknown authored
      Fixed failing func_misc test for embedded server
      Added casts to avoid compiler warnings
      Removed Table_locks_immediate as it's depending on log file cacheing
      Changed type of get_time() to avoid warnings
      Removed testing if purger master logs succeded as this is not deterministic
      
      
      libmysqld/lib_sql.cc:
        Fixed failing func_misc test for embedded server
      mysql-test/mysql-test-run.pl:
        Shut first down slaves, then masters.
        This should avoid some errors in the log file about not being able to connect to master during shutdown
      mysql-test/r/func_misc.result:
        Move DROP TABLE's first
      mysql-test/r/status.result:
        Removed Table_locks_immediate as it's depending on log file cacheing
      mysql-test/suite/ndb/r/ndb_binlog_basic.result:
        Removed testing if purger master logs succeded as this is not deterministic
      mysql-test/suite/ndb/t/ndb_binlog_basic.test:
        Removed testing if purger master logs succeded as this is not deterministic
      mysql-test/t/func_misc.test:
        Move DROP TABLE's first
      mysql-test/t/status.test:
        Removed Table_locks_immediate as it's depending on log file cacheing
      sql/log_event.cc:
        Added cast to avoid warnings
      sql/log_event.h:
        Changed type of get_time() to avoid warnings
      10ef77fc
  6. 14 Aug, 2007 3 commits
  7. 13 Aug, 2007 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · c5f0611f
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      configure.in:
        Auto merged
      client/mysql.cc:
        Auto merged
      include/m_ctype.h:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      storage/myisam/mi_rkey.c:
        Auto merged
      client/mysqldump.c:
        Manual merge (trivial)
      scripts/mysql_install_db.sh:
        Complex merge (parital rewrite of new code)
      sql/sql_show.cc:
        Manual merge
      tests/mysql_client_test.c:
        then
          if ! test -x "$print_defaults"
          then
            missing_in_basedir my_print_defaults
            exit 1
          fi
        else
      c5f0611f
    • unknown's avatar
      Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris · 09a53f28
      unknown authored
      Faster thr_alarm()
      Added 'Opened_files' status variable to track calls to my_open()
      Don't give warnings when running mysql_install_db
      Added option --source-install to mysql_install_db
      
      I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
      index_read()      -> index_read_map()
      index_read_idx()  -> index_read_idx_map()
      index_read_last() -> index_read_last_map()
      
      
      BUILD/compile-solaris-sparc-forte:
        Updated script to current Solaris installations
        Now we compile by default for 64 bits
      client/mysql.cc:
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
      client/mysql_upgrade.c:
        Fixed compiler warning (on Forte)
      client/mysqladmin.cc:
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
      client/mysqlcheck.c:
        Fixed compiler warning (on Forte)
      client/mysqldump.c:
        Fixed compiler warning (on Forte)
      client/mysqlslap.c:
        Fixed compiler warning (on Forte)
      client/mysqltest.c:
        Fixed compiler warning (on Forte)
      client/sql_string.cc:
        Avoid compiler warnings when using C function pointers in C++
      configure.in:
        Added detection of mtmalloc and ieeefp.h
      extra/replace.c:
        Fixed compiler warning (on Forte)
      include/m_ctype.h:
        Added some typedef's to make it easy to use C function pointers in C++
      include/my_sys.h:
        Added my_file_total_opened (counter for calls to my_open())
      include/myisam.h:
        Fixed compiler warning (on Forte)
      libmysql/libmysql.c:
        Fixed compiler warning (on Forte) by adding casts and change types
      libmysql/manager.c:
        Fixed compiler warning (on Forte) by adding casts and change types
      mysql-test/r/ctype_cp932_binlog_stm.result:
        Updated positions
        (Needed because we didn't before correctly restore collation_database after running stored procedure
      mysys/my_fopen.c:
        Count number of opened files
      mysys/my_open.c:
        Count number of opened files
      mysys/my_static.c:
        Count number of opened files
      mysys/thr_alarm.c:
        Optimization to do less alarm() and pthread_sigmask() calls.
        Idea is to remember time for next pending alarm and not reschedule a new alarm if it's after the current one.
        Before we only did this if there was other pending alarms.
        We don't have to use pthread_sigmask() in case of 'USE_ONE_SIGNAL_HAND' as the alarm()
        signal will be blocked for the calling thread anyway and no other thread will have the alarm() signal enabled to call process_alarm()
      regex/regcomp.c:
        Fixed compiler warning (on Forte) by adding casts and change types
      scripts/mysql_install_db.sh:
        Added option --source-install to allow one to create a mysql database from the source tree without installing MySQL
        Don't give (unnecessary) warnings
      server-tools/instance-manager/angel.cc:
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
      server-tools/instance-manager/thread_registry.cc:
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
      sql/event_db_repository.cc:
        index_read() -> index_read_map()
      sql/event_queue.cc:
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
      sql/field.cc:
        Fixed compiler warnings about hidden fields
      sql/ha_partition.cc:
        Fixed compiler warnings about hidden fields
        index_read() -> index_read_map()
      sql/ha_partition.h:
        index_read() -> index_read_map()
      sql/handler.cc:
        Added PAGE option to row types (to prepare for future)
        index_read() -> index_read_map()
      sql/handler.h:
        Added ROW_TYPE_PAGE (for future)
        Added flag to signal if table was to be created transactionally
        I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
        index_read()      -> index_read_map()
        index_read_idx()  -> index_read_idx_map()
        index_read_last() -> index_read_last_map()
      sql/item.cc:
        Fixed indentation
        Renamed local variable to avoid hiding class variable
      sql/item_cmpfunc.cc:
        Renamed local variable to avoid hiding class variable
      sql/item_cmpfunc.h:
        Removed not used variable
      sql/item_func.cc:
        Renamed local variable to avoid hiding class variable
      sql/item_strfunc.cc:
        Moved functions from Item_strfunc.cc
      sql/item_strfunc.h:
        Move functions to item_strfunc.cc
        Use C function pointer type to avoid compiler warnings (with Forte)
      sql/item_subselect.cc:
        index_read() -> index_read_map()
      sql/item_xmlfunc.cc:
        Renamed local variable to avoid hiding class variable
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
      sql/key.cc:
        Fixed indentation
      sql/log.cc:
        Renamed local variable to avoid hiding class variable
      sql/log_event.cc:
        Removed call to my_time() when creating class instance of Log_event() as this may have static instances.
        (One can't call my_time() before my_init())
        index_read() -> index_read_map()
        Renamed local variable to avoid hiding class variable
      sql/log_event_old.cc:
        Renamed local variable to avoid hiding class variable
      sql/mysql_priv.h:
        Made all create_backup_ctx() declarations identical.
        This lifted up a bug where wrong create_backup_ctx() was called in some cases.
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
      sql/mysqld.cc:
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
        Fixed indentation
        Don't call end_thr_alarm() when calling unireg_abort() as unireg_abort() already calls end_thr_alarm()
        Added variable 'Opened_files' (number of calls to my_open() or my_fopen())
        Don't print 'loose' warnings when using --bootstrap (to avoid warnings when running mysql_install_db)
        Fixed compiler warnings
      sql/opt_range.cc:
        index_read() -> index_read_map()
      sql/opt_sum.cc:
        index_read() -> index_read_map()
      sql/partition_info.cc:
        Renamed local variable to avoid hiding class variable
      sql/rpl_filter.cc:
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
      sql/set_var.cc:
        Renamed local variable to avoid hiding class variable
        Added 'process_key_cache_t' type to avoid compiler warning (on Forte)
      sql/set_var.h:
        Added 'process_key_cache_t' type to avoid compiler warning (on Forte)
      sql/sp.cc:
        More debugging
        index_read() -> index_read_map()
      sql/sp_cache.cc:
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
      sql/sp_head.cc:
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
        Moved 'saved_creation_ctx' higher up to be able to free objects allocated by create_backup_ctx()
      sql/sql_acl.cc:
        index_read() -> index_read_map()
      sql/sql_class.cc:
        Renamed local variable to avoid hiding class variable
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
      sql/sql_class.h:
        Renamed local variable to avoid hiding class variable
      sql/sql_db.cc:
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
      sql/sql_delete.cc:
        Renamed local variable to avoid hiding class variable
      sql/sql_handler.cc:
        index_read() -> index_read_map()
      sql/sql_help.cc:
        index_read() -> index_read_map()
      sql/sql_insert.cc:
        index_read() -> index_read_map()
        Renamed local variable to avoid hiding class variable
      sql/sql_lex.cc:
        Renamed local variable to avoid hiding class variable
      sql/sql_plugin.cc:
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
        index_read() -> index_read_map()
        Don't give warnings about not used plugins if we are using --warnings=0
      sql/sql_select.cc:
        index_read() -> index_read_map()
      sql-common/client.c:
        Fixed compiler warning (on Forte)
      sql-common/my_time.c:
        Removed never accessed code
        Fixed compiler warning (on Forte)
      sql/sql_servers.cc:
        index_read() -> index_read_map()
      sql/sql_show.cc:
        Added TRANSACTIONAL to SHOW CREATE
        Fixed ROW_TYPE_PAGE
      sql/sql_string.cc:
        Avoid compiler warnings when using C function pointers in C++
      sql/sql_table.cc:
        Set create_info->transactional if we used TRANSACTIONAL=1
      sql/sql_udf.cc:
        index_read() -> index_read_map()
      sql/sql_yacc.yy:
        Added TRANSACTIONAL=0|1 to CREATE (for future)
        Added row type PAGE (was only partionally handled before)
      sql/strfunc.cc:
        Avoid compiler warnings when using C function pointers in C++
      sql/table.cc:
        More DBUG statements
        Declare all create_backup_ctx() functions identically
        Remember if table was created with TRANSACTIONAL flag or not (future safe)
        Renamed local variable to avoid hiding class variable
      sql/table.h:
        Remember if table was created with TRANSACTIONAL=1
      sql/tztime.cc:
        index_read() -> index_read_map()
      sql-common/pack.c:
        Fixed compiler warning (on Forte)
      storage/archive/archive_reader.c:
        Fixed compiler warning (on Forte)
      storage/archive/azio.c:
        Fixed compiler warning (on Forte)
      storage/blackhole/ha_blackhole.cc:
        index_read() -> index_read_map()
      storage/blackhole/ha_blackhole.h:
        index_read() -> index_read_map()
      storage/csv/ha_tina.cc:
        Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
      storage/example/ha_example.cc:
        index_read() -> index_read_map()
      storage/example/ha_example.h:
        index_read() -> index_read_map()
      storage/heap/ha_heap.cc:
        index_read() -> index_read_map()
      storage/heap/ha_heap.h:
        index_read() -> index_read_map()
      storage/heap/hp_test1.c:
        Fixed compiler warning (on Forte)
      storage/heap/hp_test2.c:
        Fixed compiler warning (on Forte)
      storage/myisam/ft_boolean_search.c:
        Fixed compiler warning (on Forte)
      storage/myisam/ft_nlq_search.c:
        Fixed compiler warning (on Forte)
      storage/myisam/ft_parser.c:
        Fixed compiler warning (on Forte)
      storage/myisam/ft_stopwords.c:
        Fixed compiler warning (on Forte)
      storage/myisam/ha_myisam.cc:
        index_read() -> index_read_map()
      storage/myisam/ha_myisam.h:
        index_read() -> index_read_map()
      storage/myisam/mi_check.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_delete.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_dynrec.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_extra.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_key.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_keycache.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_locking.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_log.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_open.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_packrec.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_page.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_rkey.c:
        Added comment
      storage/myisam/mi_search.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_statrec.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_test1.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_test2.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_test3.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_update.c:
        Fixed compiler warning (on Forte)
      storage/myisam/mi_write.c:
        Fixed compiler warning (on Forte)
      storage/myisam/myisamdef.h:
        Fixed that file_read/file_write returns type size_t
        Changed some functions to use uchar * as argument/return value instead of char*
        This fixed some compiler warnings on Forte
      storage/myisam/myisamlog.c:
        Fixed compiler warning (on Forte)
      storage/myisam/myisampack.c:
        Fixed compiler warning (on Forte)
      storage/myisam/rt_test.c:
        Fixed compiler warning (on Forte)
      storage/myisam/sort.c:
        Fixed compiler warning (on Forte) by adding casts or changing variables to uchar*
      storage/myisam/sp_test.c:
        Fixed compiler warning (on Forte) by adding casts or changing variables to uchar*
      storage/myisammrg/ha_myisammrg.cc:
        index_read() -> index_read_map()
      storage/myisammrg/ha_myisammrg.h:
        index_read() -> index_read_map()
      storage/myisammrg/myrg_create.c:
        Fixed compiler warning (on Forte) by adding casts or changing variable types
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Tdummy -> align  (as in other part of cluster code)
      storage/ndb/src/kernel/vm/DynArr256.cpp:
        Removed not used variable
      storage/ndb/src/ndbapi/Ndb.cpp:
        Removed not used variable
      strings/strtod.c:
        Include ieeefp.h to avoid compiler warning
      tests/bug25714.c:
        Fixed compiler warning
      tests/mysql_client_test.c:
        Remove not used variable
        Fixed indentation
        Removed never reached code
        Fixed compiler warning (on Forte) by adding casts or changing variable types
      vio/viosocket.c:
        Fixed compiler warning (on Forte) by adding casts or changing variable types
      09a53f28
  8. 11 Aug, 2007 1 commit
    • unknown's avatar
      A fix for Bug#29049 lock_multi fails in rare case. · a3877a11
      unknown authored
      The patch changes the test case only.
      The fix is to replace all 'sleep's with wait_condition. This makes
      the test deterministic and also ~300 times faster.
      
      
      mysql-test/r/lock_multi.result:
        Update result.
      mysql-test/t/lock_multi.test:
        A fix for Bug#29049 lock_multi fails in rare case.
        Replace all 'sleep's with wait_condition. This makes
        the test deterministic and also ~300 times faster.
      a3877a11
  9. 10 Aug, 2007 1 commit
  10. 09 Aug, 2007 5 commits
  11. 08 Aug, 2007 7 commits
    • 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
      BUG#30274 (Debug server crashes because mutex isn't initialized): · 6c9e77ae
      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.
      6c9e77ae
    • 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
  12. 07 Aug, 2007 4 commits
    • 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
  13. 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
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · b78131c4
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
      
      
      b78131c4