1. 08 Apr, 2010 8 commits
    • Michael Widenius's avatar
      Merge with local tree · 6e294768
      Michael Widenius authored
      6e294768
    • Michael Widenius's avatar
      Merge with 5.1 · 664709e7
      Michael Widenius authored
      664709e7
    • Michael Widenius's avatar
      Fixed compiler warnings · 8ee9c636
      Michael Widenius authored
      Changed version string to beta
      
      client/mysql.cc:
        Fixed compiler warning
      configure.in:
        Changed version string to beta
      plugin/auth/dialog.c:
        Fixed compiler warning (gets() is a not recommended function)
      8ee9c636
    • Sergei Golubchik's avatar
      MWL#43 CREATE TABLE options (by Sanja) · e24e1668
      Sergei Golubchik authored
      Docs/sp-imp-spec.txt:
        New sql_mode added.
      include/my_base.h:
        Flag in frm of create options.
      libmysqld/CMakeLists.txt:
        New files added.
      libmysqld/Makefile.am:
        New files added.
      mysql-test/r/events_bugs.result:
        New sql_mode added.
      mysql-test/r/information_schema.result:
        New sql_mode added.
      mysql-test/r/sp.result:
        New sql_mode added.
      mysql-test/r/system_mysql_db.result:
        New sql_mode added.
      mysql-test/suite/funcs_1/r/is_columns_mysql.result:
        New sql_mode added.
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result:
        New sql_mode added.
      mysql-test/t/events_bugs.test:
        New sql_mode added.
      mysql-test/t/sp.test:
        New sql_mode added.
      scripts/mysql_system_tables.sql:
        New sql_mode added.
      scripts/mysql_system_tables_fix.sql:
        New sql_mode added.
      sql/CMakeLists.txt:
        New files added.
      sql/Makefile.am:
        New files added.
      sql/event_db_repository.cc:
        New sql_mode added.
      sql/field.cc:
        Create options support added.
      sql/field.h:
        Create options support added.
      sql/ha_partition.cc:
        Create options support added.
      sql/handler.cc:
        Create options support added.
      sql/handler.h:
        Create options support added.
      sql/log_event.h:
        New sql_mode added.
      sql/mysql_priv.h:
        New sql_mode added.
      sql/mysqld.cc:
        New sql_mode added.
      sql/share/errmsg.txt:
        New error messages added.
      sql/sp.cc:
        New sql_mode added.
      sql/sp_head.cc:
        Create options support added.
      sql/sql_class.cc:
        Create options support added.
        Debug added.
      sql/sql_class.h:
        Create options support added.
      sql/sql_insert.cc:
        my_safe_a* moved to mysqld_priv.h
      sql/sql_lex.h:
        Create options support added.
      sql/sql_parse.cc:
        Create options support added.
      sql/sql_show.cc:
        Create options support added.
      sql/sql_table.cc:
        Create options support added.
      sql/sql_view.cc:
        New sql_mode added.
      sql/sql_yacc.yy:
        Create options support added.
      sql/structs.h:
        Create options support added.
      sql/table.cc:
        Create options support added.
      sql/table.h:
        Create options support added.
      sql/unireg.cc:
        Create options support added.
      storage/example/ha_example.cc:
        Create options example.
      storage/example/ha_example.h:
        Create options example.
      storage/pbxt/src/discover_xt.cc:
        Create options support added.
      e24e1668
    • Michael Widenius's avatar
      Fixed race condition in safe_process.cc which may have caused some mysqltests... · 4a462710
      Michael Widenius authored
      Fixed race condition in safe_process.cc which may have caused some mysqltests to be reported as failed even if they succeded.
      
      mysql-test/lib/My/SafeProcess/safe_process.cc:
        Fixed race condition when getting a signal while calling waitpid()
        Don't send kill on killed processes
        Return different exit codes depending on how we die.
      4a462710
    • Michael Widenius's avatar
      Merge with 5.1 · db1d83a5
      Michael Widenius authored
      db1d83a5
    • Michael Widenius's avatar
      Fixed compiler warning · a91e89de
      Michael Widenius authored
      a91e89de
    • Michael Widenius's avatar
      Fixed syntax error and some timeing issues in test suite · 04ff96f7
      Michael Widenius authored
      mysql-test/r/func_time.result:
        Updated result
      mysql-test/t/func_time.test:
        sysdate() could be same even with one sleep(1) in between.
      storage/maria/ma_loghandler.c:
        Fixed syntax error
      04ff96f7
  2. 07 Apr, 2010 2 commits
    • Michael Widenius's avatar
      Fixed suppression of compiler/test warnings · b3426226
      Michael Widenius authored
      Fixed some timing issues in test suite
      
      
      
      mysql-test/mysql-test-run.pl:
        Added suppression of errors that comes when master is killed before slave has connect (like with rpl_udf.test)
      mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
        Wait for check thread to end
      mysql-test/suite/pbxt/t/status.test:
        Added longer sleep to avoid timing issue
      support-files/compiler_warnings.supp:
        Fixed wrong suppression
      b3426226
    • Sergei Golubchik's avatar
      test fix for sol-sparc-32 · 8e122db9
      Sergei Golubchik authored
      8e122db9
  3. 06 Apr, 2010 7 commits
    • Michael Widenius's avatar
      Removed compiler warnings · 1bee5903
      Michael Widenius authored
      Removed random failures from test suite
      
      mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
        Make test predicatable.
      mysql-test/include/maria_empty_logs.inc:
        We can't use 'Threads_connected' for syncronization, as the 'check_warnings' thread that just quit may still be counted in 'Threads_connected'
        Now we just wait until MySQLD answers again, which should be good enough for our purposes
      mysql-test/suite/binlog/r/binlog_index.result:
        Updated results file
      mysql-test/suite/binlog/t/binlog_index-master.opt:
        Added option file to not get stack traces in .err file.
      mysql-test/suite/binlog/t/binlog_index.test:
        Added 'flush tables' to remove warning about crashed suppression file from logs
      mysql-test/suite/pbxt/r/multi_statement.result:
        Updated results
      mysql-test/suite/pbxt/t/multi_statement-master.opt:
        Added options so that slow query testing makes sense
      sql/events.cc:
        Don't write Event Scheduler startup message if warnings are turned off.
      sql/handler.cc:
        Removed compiler warning
      sql/log.cc:
        Removed compiler warning
      sql/mysqld.cc:
        Added option 'test-expect-abort'; If this is set, we don't write message to log in case of 'DBUG_ABORT'.
        (Gives us smaller, easier to read log files)
      sql/set_var.cc:
        Removed compiler warning
      sql/slave.cc:
        Removed compiler warning
      sql/sql_plugin.cc:
        Don't write warnings about disabled plugin if using --log_warnings=0
      storage/xtradb/include/ut0lst.h:
        Removed compiler warning
      support-files/compiler_warnings.supp:
        Supress warning from xtradb
      1bee5903
    • Sergei Golubchik's avatar
      more fixes for buildbot failures · 076a1378
      Sergei Golubchik authored
      sql/log_event.cc:
        revert a wrong attempt to get rid of a warning.
        it broke tests on x86
      sql/sql_show.cc:
        more fixes for old gcc
      076a1378
    • Sergei Golubchik's avatar
      fixes for builbot failures · 0b23966f
      Sergei Golubchik authored
      mysql-test/t/connect.test:
        replace the port correctly
      sql/set_var.cc:
        opensolaris gcc (or just an old gcc ?) does not like offsetof() as a case label.
      0b23966f
    • Sergei Golubchik's avatar
      keep acl_user->auth_string and acl_user->salt always in sync · fd3e6e37
      Sergei Golubchik authored
      print authenticated via in show grants
      fd3e6e37
    • Sergei Golubchik's avatar
      fix a warning · d04d8aa6
      Sergei Golubchik authored
      d04d8aa6
    • Igor Babaev's avatar
    • Igor Babaev's avatar
      Post review fixes. · a37899a8
      Igor Babaev authored
      a37899a8
  4. 05 Apr, 2010 2 commits
  5. 03 Apr, 2010 1 commit
  6. 02 Apr, 2010 4 commits
  7. 01 Apr, 2010 9 commits
    • Igor Babaev's avatar
      Post-review fixes. · 59baf97d
      Igor Babaev authored
      59baf97d
    • unknown's avatar
      Fied problem with of compilation without dynamic plugin loading. · 3dfa7cdd
      unknown authored
      sql/sql_plugin.cc:
        Fixed #ifdef
      3dfa7cdd
    • unknown's avatar
      Maria WL#61 · 20739646
      unknown authored
        
        Interface for maria extensions.
        Alternative plugin interface with additional info (maturity and string version).
      
      CMakeLists.txt:
        Maria plugin interface used.
      config/ac-macros/plugins.m4:
        Maria plugin interface used.
      configure.in:
        Maria plugin interface used.
      include/mysql/plugin.h:
        Maria plugin interface added.
      include/mysql/plugin_auth.h.pp:
        Maria plugin interface added.
      plugin/auth/auth_socket.c:
        Maria plugin interface added.
      plugin/auth/dialog.c:
        Maria plugin interface added.
      plugin/daemon_example/daemon_example.cc:
        Maria plugin interface added.
      plugin/fulltext/plugin_example.c:
        Maria plugin interface added.
      sql/ha_ndbcluster.cc:
        Maria plugin interface added.
      sql/ha_partition.cc:
        Maria plugin interface added.
      sql/log.cc:
        Maria plugin interface added.
      sql/sql_acl.cc:
        Maria plugin interface added.
      sql/sql_builtin.cc.in:
        Maria plugin interface used.
      sql/sql_plugin.cc:
        Maria plugin interface added.
      sql/sql_plugin.h:
        Maria plugin interface used.
      sql/sql_show.cc:
        Maria plugin interface added.
      storage/archive/ha_archive.cc:
        Maria plugin interface added.
      storage/blackhole/ha_blackhole.cc:
        Maria plugin interface added.
      storage/csv/ha_tina.cc:
        Maria plugin interface added.
      storage/example/ha_example.cc:
        Maria plugin interface added.
      storage/federated/ha_federated.cc:
        Maria plugin interface added.
      storage/federatedx/ha_federatedx.cc:
        Maria plugin interface added.
      storage/heap/ha_heap.cc:
        Maria plugin interface added.
      storage/ibmdb2i/ha_ibmdb2i.cc:
        Maria plugin interface added.
      storage/innobase/handler/ha_innodb.cc:
        Maria plugin interface added.
      storage/innodb_plugin/handler/i_s.cc:
        Maria plugin interface added.
      storage/maria/ha_maria.cc:
        Maria plugin interface added.
      storage/myisam/ha_myisam.cc:
        Maria plugin interface added.
      storage/myisammrg/ha_myisammrg.cc:
        Maria plugin interface added.
      storage/pbxt/src/ha_pbxt.cc:
        Maria plugin interface added.
      storage/xtradb/handler/ha_innodb.cc:
        Maria plugin interface added.
      storage/xtradb/handler/i_s.cc:
        Maria plugin interface added.
      storage/xtradb/handler/i_s.h:
        Maria plugin interface added.
      20739646
    • Michael Widenius's avatar
      Auto merge with 5.1 · 8a7f2559
      Michael Widenius authored
      8a7f2559
    • Michael Widenius's avatar
      Fixed wrong regexps · 10af1c1f
      Michael Widenius authored
      10af1c1f
    • Michael Widenius's avatar
      Auto merge with 5.1 · d4dfd80c
      Michael Widenius authored
      d4dfd80c
    • Michael Widenius's avatar
      Auto merge with 5.1 · 7feccbea
      Michael Widenius authored
      7feccbea
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Merge with 5.1 · 1aafea91
      Michael Widenius authored
      Fixed valgrind warnings found from running main.connect under valgrind
      
      
      sql/sp_head.cc:
        Ensure that vcol_info is reset
      sql/sql_acl.cc:
        Fixed usage of wrong memroot for password
      sql/sql_yacc.yy:
        Ensure that vcol_info is reset
      1aafea91
  8. 31 Mar, 2010 6 commits
    • Igor Babaev's avatar
    • Igor Babaev's avatar
      Merge with the latest changes og 5.2. · 48014285
      Igor Babaev authored
      48014285
    • Michael Widenius's avatar
      Added missing space from last push · 33a5571b
      Michael Widenius authored
      Fixed compiler warnings
      
      mysys/my_gethostbyname.c:
        Added missing space from last push
      storage/xtradb/handler/i_s.cc:
        Removed not used variable
      storage/xtradb/log/log0recv.c:
        Removed not used variable
      33a5571b
    • Michael Widenius's avatar
      Fixed compiler warnings · cebec393
      Michael Widenius authored
      Fixed random failure in test system
      
      BUILD/compile-solaris-sparc:
        Addex EXTRA_FLAGS to configure line (to get rid of warnings for not initialzed variables on buildbot)
      cmd-line-utils/libedit/filecomplete.c:
        Remove not used variables
      mysql-test/suite/rpl/r/rpl_optimize.result:
        Updated result
      mysql-test/suite/rpl/t/rpl_optimize.test:
        Use sync_salve_with_master to ensure cleanup on slave
      support-files/compiler_warnings.supp:
        Added suppression of libedit files
      cebec393
    • Igor Babaev's avatar
      Adjusted results · 0513c246
      Igor Babaev authored
      0513c246
    • Michael Widenius's avatar
      Fixed some compiler warnings · fee40e27
      Michael Widenius authored
      include/m_ctype.h:
        MY_UNICASE_INFO already includes 'const'
      plugin/auth/dialog.c:
        Fixed parameters to have correct signed/unsigned type
      sql/sql_acl.cc:
        old_password_plugin is not used for EMBEDDED_LIBRARY
      storage/pbxt/src/ha_pbxt.cc:
        Remove not used variable
      fee40e27
  9. 30 Mar, 2010 1 commit
    • Michael Widenius's avatar
      Removed compiler warning · d904739c
      Michael Widenius authored
      Disable pbxt for test cases not using pbxt (speeds up test suite)
      
      extra/comp_err.c:
        Added cast to get rid of compiler warning
      extra/libevent/kqueue.c:
        Added cast to get rid of compiler warning
      mysql-test/lib/mtr_cases.pm:
        Use --skip-pbxt for test cases that doesn't need pbxt
        Collect default-storage-engine from suite.opt file (should actually be my.cnf file, but that wasn't easy to do)
      mysql-test/suite/pbxt/t/suite.opt:
        Added marker for mysql-test-run.pl that this suite require pbxt
      mysys/mf_keycache.c:
        Use LINT_INIT() to remove compiler warnings
      mysys/my_gethostbyname.c:
        Remove compiler warnings
      sql/handler.cc:
        Reset variable that may be used uninitialized
      sql/item.h:
        Remove compiler warning
      sql/mysqld.cc:
        Use LINT_INIT() to remove compiler warnings
      sql/sql_class.h:
        Remove compiler warning
      sql/sql_table.cc:
        Ensure variable is always set (to remove compiler warning)
      sql/sql_view.cc:
        Use LINT_INIT() to remove compiler warnings
      storage/maria/ma_loghandler.c:
        Use LINT_INIT() to remove compiler warnings
      storage/myisammrg/ha_myisammrg.cc:
        Fixed wrong type to printf
      storage/myisammrg/myrg_open.c:
        Use LINT_INIT() to remove compiler warnings
      storage/xtradb/include/ut0lst.h:
        Trivial change of macro to remove compiler warning
      strings/ctype-ucs2.c:
        Use LINT_INIT() to remove compiler warnings
      strings/ctype-utf8.c:
        Use LINT_INIT() to remove compiler warnings
      support-files/compiler_warnings.supp:
        Suppress some not relevant warnings
      unittest/mysys/waiting_threads-t.c:
        Don't use ftruncate() as this gives warning about ignored return value
      d904739c