1. 27 Mar, 2011 1 commit
    • Vladislav Vaintroub's avatar
      CMake fixes for buildbot/MSI package building and signing: · 22a8654a
      Vladislav Vaintroub authored
      - FIND_PROGRAM (signtool) will now get a hint about location of signtool.exe (Windows SDK)
      - Targets "package" or "msi" will now fail, l if signing is requested but does not work
        (e.g invalid certificate)
      - During install, do not re-sign binaries, if they are already signed.
      - Preserve mysqld_error.h timestamp whenever possible. This helps avoiding situations 
      where the whole server is rebuilt, whenever comp_err.exe changes (for example after code 
      signing, or also after a minor fix in mysys)
      - Fix Wix error in UpgradeVersion, if patch part of the version is 0.
      22a8654a
  2. 23 Mar, 2011 2 commits
    • Michael Widenius's avatar
      Merge with base 5.2 · eaed2605
      Michael Widenius authored
      eaed2605
    • Michael Widenius's avatar
      Added --log-basename to mysqld to allow one to set the prefix for all logs with one command · 7de98f2f
      Michael Widenius authored
      Changed test suite to use --log-basename (to get the code tested)
      Added --sync-sys=1 to test suite to speed it up.
      Better error messages if something goes wrong with mysql_install_db
      
      
      mysql-test/Makefile.am:
        Removed not existing directory
      mysql-test/lib/My/ConfigFactory.pm:
        Use log-basename
        We had to also set 'log_error' as some test was explicitely using the old name
        Added 'sync-sys=1' to speed up test suite
      mysql-test/r/variables-notembedded.result:
        Updated test results (variable relay_log is now set)
      mysql-test/suite/binlog/t/binlog_delete_and_flush_index-master.opt:
        Force specific names for some log files.
      mysql-test/suite/binlog/t/binlog_index-master.opt:
        Force specific names for some log files.
      mysql-test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt:
        Force specific names for some log files.
      mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test:
        Better error message if something goes wrong
      mysql-test/suite/rpl/r/rpl_flushlog_loop.result:
        Updated results
      mysql-test/suite/rpl/rpl_1slave_base.cnf:
        Use --log-basename
      scripts/mysql_install_db.sh:
        More information to --help
        Write url to knowledge base if something goes wrong
        Fail at once if we can't create a database directory (no reason to continue and write a screenful of not related text)
      scripts/mysqld_safe.sh:
        Also allow one to use --data for --datadir (common shortening)
        Added support for --log-basename
        Fail at once if we can't create a log directory
        Fixed bug where we used a pid file name without '.pid' extension
      sql/log.cc:
        Create a log file name trough my_once_alloc()  (To get it automaticly freed at exit)
      sql/mysql_priv.h:
        Added new prototype
      sql/mysqld.cc:
        Added support for --log-basename
        Better help for a lot of log-filename related variables.
      sql/rpl_rli.cc:
        Write information that one can use --log-basename
      sql/set_var.cc:
        Add log_basename as a readonly variable
      7de98f2f
  3. 18 Mar, 2011 1 commit
    • Michael Widenius's avatar
      Ensure that all clients reads the appropriate 'client', client-mariadb and... · 0fae0335
      Michael Widenius authored
      Ensure that all clients reads the appropriate 'client', client-mariadb and 'mariadb' sections from my.cnf
      The mysqld server and all clients now reads the new client-server section
      Fixed that mysqldumpslow supports new slow log formats and new mysqld --slow- options
      
      
      client/mysql.cc:
        Read also client-server and client-mariadb sections.
      client/mysql_upgrade.c:
        Read also client-server and client-mariadb sections.
      client/mysqladmin.cc:
        Read also client-server and client-mariadb sections.
      client/mysqlbinlog.cc:
        Read also client-server and client-mariadb sections.
      client/mysqlcheck.c:
        Read also client-server and client-mariadb sections.
      client/mysqldump.c:
        Read also client-server and client-mariadb sections.
      client/mysqlimport.c:
        Read also client-server and client-mariadb sections.
      client/mysqlshow.c:
        Read also client-server and client-mariadb sections.
      client/mysqltest.cc:
        Read also client-server and client-mariadb sections.
      extra/my_print_defaults.c:
        Updated help text
      scripts/mysql_fix_privilege_tables.sh:
        Read also sections client client-server client-mariadb
      scripts/mysql_install_db.pl.in:
        Also allow --data=* option
        Read also groups mariadb, server and client-server.
      scripts/mysql_install_db.sh:
        Also allow --data=* option
        Read also groups mariadb, server and client-server.
        Added --lose-skip-pbxt to bootstrap
      scripts/mysql_secure_installation.sh:
        Read also groups client-server and client-mariadb
      scripts/mysqld_multi.sh:
        Read also group mariadb
      scripts/mysqld_safe.sh:
        Read also groups mariadb server and client-server
      scripts/mysqldumpslow.sh:
        Fixed to support new slow log formats
        Added sorting on -ae (aggregated number of retreived rows) and e (retrieved rows)
        Read also group 'mariadb'
        If there is many instances of same option, use last one.
        Get slow log file from options log-slow-queries=filename or query-log-file=filename
        Added support for future --log-basename option
      sql-common/client.c:
        Read also groups 'client-server' and 'client-mariadb'
      tests/mysql_client_test.c:
        Read also groups 'client-server' and 'client-mariadb'
      tests/thread_test.c:
        Read also groups 'client-server' and 'client-mariadb'
      0fae0335
  4. 11 Mar, 2011 5 commits
  5. 10 Mar, 2011 1 commit
  6. 09 Mar, 2011 1 commit
  7. 08 Mar, 2011 2 commits
  8. 07 Mar, 2011 1 commit
  9. 04 Mar, 2011 3 commits
  10. 01 Mar, 2011 9 commits
  11. 28 Feb, 2011 7 commits
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Fixes to mysql-test-run and tests · 7a79fe52
      Michael Widenius authored
      - Added ORDER BY to get consistent results to federated_server
      - Sort slow tests first
      
      mysql-test/lib/My/ConfigFactory.pm:
        Remove usage of port as the test suite is not using that anymore and it causes some probelms in buildbot
      mysql-test/lib/mtr_cases.pm:
        Sort slow tests first
        If a test is marked as 'big_test' also mark it as 'long_test'
      mysql-test/suite/federated/federated_server.result:
        Added ORDER BY to get consistent results
      mysql-test/suite/federated/federated_server.test:
        Added ORDER BY to get consistent results
      7a79fe52
    • Michael Widenius's avatar
      Get rid of compiler warnings · 8fa14ba6
      Michael Widenius authored
      mysql-test/suite/parts/t/partition_alter4_innodb.test:
        Removed duplicated big_test marker
      sql-common/my_time.c:
        Get rid of compiler warning about uninitialized members
      8fa14ba6
    • Michael Widenius's avatar
      Increase version number · 5df39c48
      Michael Widenius authored
      Taged a couple of tests with --big-test
      
      configure.in:
        Upgrade version number
      mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test:
        Removed duplicate big_test tag
      mysql-test/suite/parts/t/partition_alter1_2_innodb.test:
        Removed duplicate big_test tag
      mysql-test/suite/parts/t/partition_decimal_innodb.test:
        Added big_test tag as this takes forever with valgrind
      mysql-test/suite/parts/t/partition_decimal_myisam.test:
        Removed duplicate big_test tag
      5df39c48
    • Michael Widenius's avatar
      3358cdd5
    • Michael Widenius's avatar
      Merge with alias as String · 869f5d0e
      Michael Widenius authored
      869f5d0e
    • Michael Widenius's avatar
      Change TABLE->alias to String for less memory reallocation · ff3da0f9
      Michael Widenius authored
      Changed some String.ptr() -> String.c_ptr() for String that are not guaranteed to end with \0
      Removed some c_ptr() usage from parameters to functions that takes ptr & length
      Use preallocate buffers to avoid calling malloc() for most operations. 
      
      
      sql/event_db_repository.cc:
        alias is now a String
      sql/event_scheduler.cc:
        c_ptr -> c_ptr_safe() to avoid warnings from valgrind.
      sql/events.cc:
        c_ptr -> c_ptr_safe() to avoid warnings from valgrind.
        c_ptr -> ptr() as function takes ptr & length
      sql/field.cc:
        alias is now a String
      sql/field.h:
        alias is now a String
      sql/ha_partition.cc:
        alias is now a String
      sql/handler.cc:
        alias is now a String
        ptr() -> c_ptr() as string is not guaranteed to be \0 terminated
      sql/item.cc:
        Store error parameter in separarte buffer to ensure correct error message
      sql/item_func.cc:
        ptr() -> c_ptr_safe() as string is not guaranteed to be \0 terminated
      sql/item_sum.h:
        Use my_strtod() instead of my_atof() to not have to make string \0 terminated
      sql/lock.cc:
        alias is now a String
      sql/log.cc:
        c_ptr() -> ptr() as function takes ptr & length
      sql/log_event.cc:
        c_ptr_quick() -> ptr() as we only want to get the pointer to String buffer
      sql/opt_range.cc:
        ptr() -> c_ptr() as string is not guaranteed to be \0 terminated
      sql/opt_table_elimination.cc:
        alias is now a String
      sql/set_var.cc:
        ptr() -> c_ptr() as string is not guaranteed to be \0 terminated
        c_ptr() -> c_ptr_safe() to avoid warnings from valgrind.
        c_ptr() -> ptr() as function takes ptr & length
        Simplify some code.
      sql/sp.cc:
        c_ptr() -> ptr() as function takes ptr & length
      sql/sp_rcontext.cc:
        alias is now a String
      sql/sql_base.cc:
        alias is now a String.
        Here we win a realloc() for most alias usage.
      sql/sql_class.cc:
        Use size descriptor for printf() to avoid accessing bytes outside of buffer
      sql/sql_insert.cc:
        Change allocation of TABLE as it's now contains a String
        _ptr() -> ptr() as function takes ptr & length
      sql/sql_load.cc:
        Use preallocate buffers to avoid calling malloc() for most operations.
      sql/sql_parse.cc:
        Use c_ptr_safe() to ensure string is \0 terminated.
      sql/sql_plugin.cc:
        c_ptr_quick() -> ptr() as function takes ptr & length
      sql/sql_select.cc:
        alias is now a String
      sql/sql_show.cc:
        alias is now a String
      sql/sql_string.h:
        Added move() function to change who owns the string (owner does the free)
      sql/sql_table.cc:
        alias is now a String
        c_ptr() -> c_ptr_safe() to avoid warnings from valgrind.
      sql/sql_test.cc:
        c_ptr() -> c_ptr_safe() to avoid warnings from valgrind.
        alias is now a String
      sql/sql_trigger.cc:
        c_ptr() -> c_ptr_safe() to avoid warnings from valgrind.
        Use field->init() to setup pointers to alias.
      sql/sql_update.cc:
        alias is now a String
      sql/sql_view.cc:
        ptr() -> c_ptr_safe() as string is not guaranteed to be \0 terminated
      sql/sql_yacc.yy:
        r() -> c_ptr() as string is not guaranteed to be \0 terminated
      sql/table.cc:
        alias is now a String
      sql/table.h:
        alias is now a String
      storage/federatedx/ha_federatedx.cc:
        Remove extra 1 byte alloc that is automaticly done by strmake()
        Ensure that error message ends with \0
      storage/maria/ha_maria.cc:
        alias is now a String
      storage/myisam/ha_myisam.cc:
        alias is now a String
      ff3da0f9
  12. 27 Feb, 2011 1 commit
    • Vladislav Vaintroub's avatar
      Disable variables-big with debug binaries. · f83e5942
      Vladislav Vaintroub authored
      When compiled with SAFEMALLOC or with Windows
      Debug CRT, it allocates and initializes 5GB of memory.
      The effect is 20 minutes of paging and swapping on
      a 4GB VM.
      
      Still allow the test to run with optimized binaries.
      Memory is not initialized in this case,  malloc() 
      of 5GB  size will not bring the whole buffer into 
      physical memory.
      f83e5942
  13. 26 Feb, 2011 2 commits
  14. 25 Feb, 2011 4 commits
    • Michael Widenius's avatar
      Automatic merge with 5.1-merge to get in Merge with MySQL 5.1.55 · 1fa5900f
      Michael Widenius authored
      
      mysql-test/suite/parts/t/partition_debug_sync_innodb.test:
        Fixed failure on windows partition file is with small '#p#'
      1fa5900f
    • Michael Widenius's avatar
      Fixed compiler warnings · 9fe6801a
      Michael Widenius authored
      
      cmd-line-utils/readline/complete.c:
        Don't ignore value from fwrite()
      cmd-line-utils/readline/terminal.c:
        Don't ignore value from fwrite()
      extra/yassl/taocrypt/include/file.hpp:
        Changed prototype to be able to return value from fwrite()
      extra/yassl/taocrypt/src/file.cpp:
        Return value from fwrite for put()
      storage/xtradb/ut/ut0ut.c:
        Added casts to remove warnings for not critical usage of fwrite()
      9fe6801a
    • Vladislav Vaintroub's avatar
      MBUG#688404 : Fix pbxt crashes on Windows 64 in debug build · d4c9ff95
      Vladislav Vaintroub authored
      The reason for the crash is misalignment on SSE instruciton
      in setjmp(). The root cause is PBXT debug malloc(),  which
      unlike  OS malloc  does not guarantee 16 bytes alignment.
      
      So the fix for now is disable PBXT debug malloc on Windows.
      It was obsolete anyway, as  it does not provide additional
      benefits to C runtime debug routines (always used in debug 
      compilation) or to pageheap, available at runtime.
      d4c9ff95
    • Michael Widenius's avatar
      Fixed compiler and build error: · d46aee70
      Michael Widenius authored
      - Fixed main.mysqlcheck error on windows
      - Fixed 'can't drop database pbxt' failure when running pbxt.mysqlslap
      
      
      sql/table.cc:
        When using not legal file names for checking a non existing table, one got a warning in the log file which caused mysql.mysqlcheck to fail
      storage/innodb_plugin/row/row0upd.c:
        Fixed compiler warning
      storage/pbxt/src/table_xt.cc:
        Remove table that is dropped from 'repair-pending'.
        Fixed 'can't drop database pbxt' failure when running pbxt.mysqlslap
      d46aee70