1. 27 Jun, 2013 1 commit
  2. 10 Jun, 2013 1 commit
  3. 09 Jun, 2013 1 commit
  4. 07 Jun, 2013 2 commits
    • Alexander Barkov's avatar
      Merge from 10.0-connect · a2cfb802
      Alexander Barkov authored
      added:
        include/mysql/service_thd_timezone.h
        libservices/thd_timezone_service.c
        storage/connect/inihandl.h
        storage/connect/mysql-test/connect/r/grant.result
        storage/connect/mysql-test/connect/r/ini_grant.result
        storage/connect/mysql-test/connect/r/mysql_grant.result
        storage/connect/mysql-test/connect/r/occur.result
        storage/connect/mysql-test/connect/r/odbc_sqlite3_grant.result
        storage/connect/mysql-test/connect/r/pivot.result
        storage/connect/mysql-test/connect/r/xcol.result
        storage/connect/mysql-test/connect/r/xml_grant.result
        storage/connect/mysql-test/connect/std_data/expenses.txt
        storage/connect/mysql-test/connect/t/grant.test
        storage/connect/mysql-test/connect/t/have_odbc_sqlite3.inc
        storage/connect/mysql-test/connect/t/ini_grant.test
        storage/connect/mysql-test/connect/t/mysql_grant.test
        storage/connect/mysql-test/connect/t/occur.test
        storage/connect/mysql-test/connect/t/odbc_sqlite3_grant.test
        storage/connect/mysql-test/connect/t/pivot.test
        storage/connect/mysql-test/connect/t/xcol.test
        storage/connect/mysql-test/connect/t/xml_grant.test
        storage/connect/rcmsg.h
        storage/connect/taboccur.cpp
        storage/connect/taboccur.h
        storage/connect/tabutil.cpp
        storage/connect/tabutil.h
        storage/connect/tabxcl.cpp
        storage/connect/tabxcl.h
      modified:
        include/my_global.h
        include/my_time.h
        include/mysql.h.pp
        include/mysql/plugin.h
        include/mysql/plugin_audit.h.pp
        include/mysql/plugin_auth.h.pp
        include/mysql/plugin_ftparser.h.pp
        include/mysql/services.h
        include/mysql_time.h
        include/probes_mysql_nodtrace.h
        include/service_versions.h
        libservices/CMakeLists.txt
        mysql-test/r/handlersocket.result
        mysql-test/r/plugin.result
        mysql-test/suite/plugins/r/show_all_plugins.result
        sql/item_func.cc
        sql/mysqld.cc
        sql/set_var.cc
        sql/sql_class.cc
        sql/sql_plugin.cc
        sql/sql_plugin.h
        sql/sql_plugin_services.h
        sql/sql_show.cc
        sql/sys_vars.cc
        storage/connect/CMakeLists.txt
        storage/connect/catalog.h
        storage/connect/colblk.cpp
        storage/connect/colblk.h
        storage/connect/connect.cc
        storage/connect/connect.h
        storage/connect/filamdbf.cpp
        storage/connect/global.h
        storage/connect/ha_connect.cc
        storage/connect/ha_connect.h
        storage/connect/inihandl.c
        storage/connect/maputil.h
        storage/connect/mycat.cc
        storage/connect/myconn.cpp
        storage/connect/myconn.h
        storage/connect/mysql-test/connect/r/bin.result
        storage/connect/mysql-test/connect/r/csv.result
        storage/connect/mysql-test/connect/r/dbf.result
        storage/connect/mysql-test/connect/r/dir.result
        storage/connect/mysql-test/connect/r/fix.result
        storage/connect/mysql-test/connect/r/fmt.result
        storage/connect/mysql-test/connect/r/ini.result
        storage/connect/mysql-test/connect/r/mysql.result
        storage/connect/mysql-test/connect/r/odbc_sqlite3.result
        storage/connect/mysql-test/connect/r/tbl.result
        storage/connect/mysql-test/connect/r/upd.result
        storage/connect/mysql-test/connect/r/vec.result
        storage/connect/mysql-test/connect/r/xml.result
        storage/connect/mysql-test/connect/t/bin.test
        storage/connect/mysql-test/connect/t/csv.test
        storage/connect/mysql-test/connect/t/dbf.test
        storage/connect/mysql-test/connect/t/dir.test
        storage/connect/mysql-test/connect/t/fix.test
        storage/connect/mysql-test/connect/t/fmt.test
        storage/connect/mysql-test/connect/t/ini.test
        storage/connect/mysql-test/connect/t/mysql.test
        storage/connect/mysql-test/connect/t/odbc_sqlite3.test
        storage/connect/mysql-test/connect/t/tbl.test
        storage/connect/mysql-test/connect/t/vec.test
        storage/connect/mysql-test/connect/t/xml.test
        storage/connect/odbconn.cpp
        storage/connect/osutil.c
        storage/connect/osutil.h
        storage/connect/plgcnx.h
        storage/connect/plgdbsem.h
        storage/connect/plgdbutl.cpp
        storage/connect/plugutil.c
        storage/connect/rcmsg.c
        storage/connect/reldef.cpp
        storage/connect/tabcol.cpp
        storage/connect/tabcol.h
        storage/connect/tabfmt.cpp
        storage/connect/tabmysql.cpp
        storage/connect/tabmysql.h
        storage/connect/tabodbc.cpp
        storage/connect/tabpivot.cpp
        storage/connect/tabpivot.h
        storage/connect/tabsys.cpp
        storage/connect/tabsys.h
        storage/connect/tabtbl.cpp
        storage/connect/tabtbl.h
        storage/connect/tabwmi.cpp
        storage/connect/user_connect.cc
        storage/connect/valblk.cpp
        storage/connect/valblk.h
        storage/connect/value.cpp
        storage/connect/value.h
        storage/connect/xobject.h
        storage/connect/xtable.h
        storage/perfschema/ha_perfschema.cc
      pending merges:
        Alexander Barkov 2013-06-08 Fixing a few compiler warnings
          Olivier Bertrand 2013-06-05 - Change CRLF line endings to LF
          Olivier Bertrand 2013-06-04 - Adding parallelism to the TBL table type
          Sergei Golubchik 2013-06-03 compiler warnings
          Alexander Barkov 2013-06-03 Fixing the problem with my_bool_t define...
          Olivier Bertrand 2013-05-28 - Fix crash when a null qrp is returned ...
          Olivier Bertrand 2013-05-28 - Extending connect_assisted_discovery c...
          Alexander Barkov 2013-05-28 Recording test results forgotten in the ...
          Alexander Barkov 2013-05-27 [merge] Merging with the latest 10.0
          Alexander Barkov 2013-05-27 - Fixing embedded verision of the Connec...
          Alexander Barkov 2013-05-27 Fixing ABI template, to take into accoun...
          Alexander Barkov 2013-05-27 Fixing ABI template, to take into accoun...
          Olivier Bertrand 2013-05-27 - Fix Windows compile error
          Alexander Barkov 2013-05-24 Adding the timezone plugin service, to c...
          Alexander Barkov 2013-05-24 Do not run mysql.test in case of embedde...
          Alexander Barkov 2013-05-24 Splitting SQLite3 tests into two parts:
          Alexander Barkov 2013-05-24 Removing more cases of direct use of thd.
          Alexander Barkov 2013-05-24 Removing direct access to thd, using fun...
          Olivier Bertrand 2013-05-24 - Fix setting default type to MYSQL->PRO...
          Alexander Barkov 2013-05-23 Connect: fixing non thread-safe code.
          Olivier Bertrand 2013-05-22 - Changing CONNECT version number and date
          Alexander Barkov 2013-05-21 "mtr --suite=connect --embedded" tests d...
          Olivier Bertrand 2013-05-20 - Correct misplaced parenthesis in last ...
          Olivier Bertrand 2013-05-20 - Save and restore srcdef when getting a...
          Olivier Bertrand 2013-05-19 - Removing unused copy file
          Olivier Bertrand 2013-05-19 [merge] - Commit merged and resolve
          Alexander Barkov 2013-05-13 Fixing warnings (mostly "no previous dec...
          Alexander Barkov 2013-05-13 Fixing compiler warnings ("no previous d...
          Alexander Barkov 2013-05-13 Fixing a few "no previous declaration" w...
          Alexander Barkov 2013-05-13 Fixing a few compilation warnings ("no p...
          Olivier Bertrand 2013-05-19 - Allowing views and queries as paramete...
          Olivier Bertrand 2013-05-13 [merge] - Commit merged changes
          Alexander Barkov 2013-05-13 [merge] Merge from maria-10.0
          Alexander Barkov 2013-05-13 Enabling --suite=connect by default
          Olivier Bertrand 2013-05-13 - Code cleaning. Eliminating unused code...
          Olivier Bertrand 2013-05-13 - fix use of uninitialized variable (colp)
          Olivier Bertrand 2013-05-13 - Set tdbp to NULL when ignored
          Olivier Bertrand 2013-05-12 - Changing mode from +x to -x
          Olivier Bertrand 2013-05-12 - Code cleaning.
          Olivier Bertrand 2013-05-11 - Fix tabpivot compile errors on Linux.
          Olivier Bertrand 2013-05-11 - Added a test case for PIVOT tables
          Olivier Bertrand 2013-05-10 - Add pivot table files and support
          Olivier Bertrand 2013-05-10 - Added table type PIVOT
          Olivier Bertrand 2013-05-09 - Fix inverted test on am in MYSQLDEF::D...
          Olivier Bertrand 2013-05-05 - General code cleaning, eliminating a f...
          Olivier Bertrand 2013-05-04 - Add test for XCOL and OCCUR tables
          Olivier Bertrand 2013-05-02 - Adding a loop test to prevent PROXY ba...
          Olivier Bertrand 2013-04-30 - Change in connect_assisted_discovery t...
          Olivier Bertrand 2013-04-30 - Allow PROXY based tables to specify My...
          Olivier Bertrand 2013-04-29 - Fix a bug causing a crash when using O...
          Olivier Bertrand 2013-04-29 - Adding 3 new table types:
      a2cfb802
    • Alexander Barkov's avatar
      Fixing a few compiler warnings · ffa2eb43
      Alexander Barkov authored
      modified:
        storage/connect/ha_connect.cc
        storage/connect/value.cpp
      ffa2eb43
  5. 06 Jun, 2013 4 commits
    • Sergei Golubchik's avatar
      10.0-base merge · 72ba9587
      Sergei Golubchik authored
      (without InnoDB - all InnoDB changes were ignored)
      72ba9587
    • Sergei Golubchik's avatar
      5.5 merge · 4749d40c
      Sergei Golubchik authored
      4749d40c
    • Vladislav Vaintroub's avatar
      fix compile error · 1ff1cb10
      Vladislav Vaintroub authored
      1ff1cb10
    • Michael Widenius's avatar
      Fixed timing failure in myisam-metadata.test · 5cf5a9a1
      Michael Widenius authored
      mysql-test/include/wait_show_condition.inc:
        Print failing statement if timeout
      mysql-test/r/myisam-metadata.result:
        Updated DBUG_SYNC
      mysql-test/t/myisam-metadata.test:
        Updated DBUG_SYNC.
        Removed wait_show_condtion, as this is not needed when we use DBUG_SYNC
        This should fix timing issues with the test
      mysys/thr_mutex.c:
        Added comments
      sql/sql_acl.cc:
        atoi -> atoll()  (Safety)
      storage/myisam/ha_myisam.cc:
        Send signal before mi_repair_by_sort.
      5cf5a9a1
  6. 05 Jun, 2013 3 commits
    • unknown's avatar
      Fix two small problems in previous push. · 64e53a0f
      unknown authored
      64e53a0f
    • unknown's avatar
      MDEV-26: Global transaction ID. · 5cb486d1
      unknown authored
      Fix problems related to reconnect. When we need to reconnect (ie. explict
      stop/start of just the IO thread by user, or automatic reconnect due to
      loosing network connection with the master), it is a bit complex to correctly
      resume at the right point without causing duplicate or missing events in the
      relay log. The previous code had multiple problems in this regard.
      
      With this patch, the problem is solved as follows. The IO thread keeps track
      (in memory) of which GTID was last queued to the relay log. If it needs to
      reconnect, it resumes at that GTID position. It also counts number of events
      received within the last, possibly partial, event group, and skips the same
      number of events after a reconnect, so that events already enqueued before the
      reconnect are not duplicated.
      
      (There is no need to keep any persistent state; whenever we restart slave
      threads after both of them being stopped (such as after server restart), we
      erase the relay logs and start over from the last GTID applied by SQL thread.
      But while the SQL thread is running, this patch is needed to get correct relay
      log).
      5cb486d1
    • Michael Widenius's avatar
      - Fixed compiler warning · fab9a55d
      Michael Widenius authored
      - Don't abort InnoDB if one can't allocate resources for AIO
        (this patch was in 5.5 and 10.0-base but was missing in 10.0)
      
      
      sql/mdl.cc:
        Fixed compiler warning
      storage/innobase/os/os0file.cc:
        Don't abort InnoDB if one can't allocate resources for AIO
      fab9a55d
  7. 04 Jun, 2013 2 commits
  8. 03 Jun, 2013 3 commits
    • Sergei Golubchik's avatar
      compiler warnings · 0a01953c
      Sergei Golubchik authored
      0a01953c
    • Alexander Barkov's avatar
      Fixing the problem with my_bool_t defined two times. · 1fe92fb8
      Alexander Barkov authored
      (it worked fine with the modern gcc, but failed on some other compilers).
      
      
      modified:
        include/my_global.h
        include/mysql/plugin.h
        include/mysql/plugin_audit.h.pp
        include/mysql/plugin_auth.h.pp
        include/mysql/plugin_ftparser.h.pp
        include/mysql/service_thd_timezone.h
        sql/item_func.cc
        sql/mysqld.cc
        sql/set_var.cc
        sql/sql_plugin.cc
        sql/sql_plugin.h
        sql/sql_show.cc
        sql/sys_vars.cc
        storage/perfschema/ha_perfschema.cc
      1fe92fb8
    • unknown's avatar
      MDEV-4605: Failing to load GTID slave position from rpl.gtid_slave_pos · 7ad47ab0
      unknown authored
      There were several cases where the slave GTID position was not loaded
      correctly before being used. This caused various failures such as
      corrupting the position at slave start and empty values of
      @@gtid_slave_pos and @@gtid_current_pos.
      
      Fixed by adding more checks for loaded position, and by always loading
      the position at server startup.
      7ad47ab0
  9. 01 Jun, 2013 2 commits
  10. 30 May, 2013 1 commit
  11. 29 May, 2013 2 commits
    • unknown's avatar
      MDEV-4485: Incorrect error handling in record_gtid(). · 6feadb10
      unknown authored
      Fix the error handling when access to the table mysql.gtid_slave_pos
      fails for whatever reason. Add some test cases.
      6feadb10
    • unknown's avatar
      MDEV-4485: Master did not allow slave to connect from the very start (empty... · 385780f5
      unknown authored
      MDEV-4485: Master did not allow slave to connect from the very start (empty GTID pos) if GTIDs from other multi_source master was present
      
      The idea in the code was to protect the user that tries to connect a slave
      to a master with completely different domains than what was intended. If
      none of the domains in the start position are present at all in the master
      binlog, we gave an error.
      
      However, this is a stupid idea. Because when a slave connects to a master
      to start replication from the very start of binlogs - such as when setting
      up new master->slave servers from scratch - there will be just this
      situation, the requested slave position is empty for all the domains in the
      master's binlog.
      
      So the code that gives this error is wrong, and the solution is simply to
      remove it.
      385780f5
  12. 28 May, 2013 11 commits
  13. 27 May, 2013 4 commits
    • Alexander Barkov's avatar
      Merging with the latest 10.0 · 15b86a5a
      Alexander Barkov authored
      pending merges:
        Vladislav Vaintroub 2013-05-23 MDEV-4566 : Failing DBUG_ASSERT()  in SEL...
          Sergey Petrunya 2013-05-20 MDEV-4000: Mapping between Cassandra blob...
          Sergey Petrunya 2013-05-20 Update test results.
          knielsen@knielse... 2013-05-03 [merge] Merge 10.0-base -> 10.0
          knielsen@knielse... 2013-05-03 MDEV-4473: mysql_binlog_send() starts...
          Michael Widenius 2013-05-03 Instead of writing "Errcode" to the log ...
          Michael Widenius 2013-05-03 Fixed: MDEV-4352; LOAD DATA was not mult...
          knielsen@knielse... 2013-04-29 [merge] Merge 10.0-base -> 10.0
          knielsen@knielse... 2013-04-29 MDEV-4446: Incorrect handling of binl...
          knielsen@knielse... 2013-04-25 Fix more failures in buildbot.
          knielsen@knielse... 2013-04-24 Add missing check for thd->killed in ...
      15b86a5a
    • Alexander Barkov's avatar
      - Fixing embedded verision of the Connect engine when handling · 8b6e7f66
      Alexander Barkov authored
        table_type=MySQL (and some other types) to connect only to
        remote MySQL server, do not try to establish embedded connections
        from the running embedded connection.
      
      - Disabling "mtr --embedded" for the tests that need a remote MySQL server.
      
      
      modified:
        storage/connect/myconn.cpp
        storage/connect/mysql-test/connect/t/occur.test
        storage/connect/mysql-test/connect/t/pivot.test
        storage/connect/mysql-test/connect/t/tbl.test
      8b6e7f66
    • Alexander Barkov's avatar
      Fixing ABI template, to take into account the latest change in · 941a20a4
      Alexander Barkov authored
      the thd_time_zone_service.
      
      modified:
        include/mysql/plugin_auth.h.pp
        include/mysql/plugin_ftparser.h.pp
      941a20a4
    • Alexander Barkov's avatar
      Fixing ABI template, to take into account the latest change in · d9f90dc0
      Alexander Barkov authored
      the thd_time_zone_service.
      
      modified:
        include/mysql/plugin_audit.h.pp
      d9f90dc0
  14. 26 May, 2013 1 commit
  15. 25 May, 2013 1 commit
  16. 24 May, 2013 1 commit
    • unknown's avatar
      MDEV-4475: Replication from MariaDB 10.0 to 5.5 does not work · 416aed25
      unknown authored
      The problem was the Gtid_list event which is logged to the binlog in
      10.0 and is not understood by the 5.5 server.
      
      This event is supposed to be replaced with a dummy event for 5.5
      servers. But the very first event logged in the very first binlog
      has an empty list of GTID, which makes the event too short to be
      replacable with an empty event.
      
      The fix is to pad the empty Gtid_list event to be big enough to
      be replacable by a dummy event.
      416aed25