1. 03 Jun, 2013 2 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
  2. 28 May, 2013 3 commits
  3. 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
  4. 26 May, 2013 1 commit
  5. 24 May, 2013 5 commits
    • Alexander Barkov's avatar
      Adding the timezone plugin service, to convert between · 32bd0c7d
      Alexander Barkov authored
      MYSQL_TIME and my_time_t and back.
      
      Using the new service instead of direct access to thd.
      
      added:
        include/mysql/service_thd_timezone.h
        libservices/thd_timezone_service.c
      modified:
        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/service_versions.h
        libservices/CMakeLists.txt
        sql/sql_class.cc
        sql/sql_plugin_services.h
        storage/connect/value.cpp
      32bd0c7d
    • Alexander Barkov's avatar
      Do not run mysql.test in case of embedded server. · 74be65c6
      Alexander Barkov authored
      We need a running MySQL server for this test.
      
      modified:
        storage/connect/mysql-test/connect/t/mysql.test
      74be65c6
    • Alexander Barkov's avatar
      Splitting SQLite3 tests into two parts: · aa505ea3
      Alexander Barkov authored
      1. for both server and embedded
      2. for server only
      
      added:
        storage/connect/mysql-test/connect/r/odbc_sqlite3_grant.result
        storage/connect/mysql-test/connect/t/have_odbc_sqlite3.inc
        storage/connect/mysql-test/connect/t/odbc_sqlite3_grant.test
      modified:
        storage/connect/mysql-test/connect/r/odbc_sqlite3.result
        storage/connect/mysql-test/connect/t/odbc_sqlite3.test
      aa505ea3
    • Alexander Barkov's avatar
      Removing more cases of direct use of thd. · 5b0e3a53
      Alexander Barkov authored
      Also, TABLE_TYPE=MySQL now uses "root@localhost" by default,
      instead of current user and current host name.
      
      modified:
        storage/connect/ha_connect.cc
      5b0e3a53
    • Alexander Barkov's avatar
      Removing direct access to thd, using functions: · f2e14736
      Alexander Barkov authored
      - thd_query_string() insted of thd->query_string
      - thd_sql_command() instead ot thd->lex->sql_command
      - table_share->s.db.str instead of thd->db
      
      modified:
        storage/connect/connect.cc
        storage/connect/ha_connect.cc
      f2e14736
  6. 23 May, 2013 3 commits
    • Olivier Bertrand's avatar
      - Fix setting default type to MYSQL->PROXY->DOS in some places where it · 33b95315
      Olivier Bertrand authored
        was not done correctly.
      - Fix a bug causing add_field to generate a syntax error on DOUBLE columns
        with a 0 decimal value.
      - Column can be undefined when Srcdef is specified.
      
      modified:
        storage/connect/ha_connect.cc
        storage/connect/mycat.cc
        storage/connect/tabmysql.cpp
        storage/connect/tabutil.cpp
        storage/connect/tabutil.h
      33b95315
    • Vladislav Vaintroub's avatar
      MDEV-4566 : Failing DBUG_ASSERT() in SELECT SLEEP(), with threadpool. · 08ce9bfe
      Vladislav Vaintroub authored
      This bug only happens with long sleep()s ( > 5 sec), and in debug version.
      
      Analysis: 
      The assertion is caused by nested thd_wait_begin() calls, which is not an expected condition.
      -  "outer" thd_wait_begin()) , in Item_func_sleep::val_int()
      -  "inner" thd_wait_begin() in Interruptible_wait::wait(). This function periodically checks whether connection is still valid, via THD::is_connection(), which ends up  calling vio_io_wait()  with timeout parameter set to  0.
      
      
      Fix is not to call thd wait callback in vio_io_wait(), if timeout parameter is 0. There is no "waiting" in this case.
      08ce9bfe
    • Alexander Barkov's avatar
      Connect: fixing non thread-safe code. · 7ef4c5df
      Alexander Barkov authored
      Passing "struct tm" buffer to GetGmTime() instead of using a static bufer.
      
      modified:
        storage/connect/tabodbc.cpp
        storage/connect/value.cpp
        storage/connect/value.h
      7ef4c5df
  7. 22 May, 2013 1 commit
    • Olivier Bertrand's avatar
      - Changing CONNECT version number and date · aebcd56c
      Olivier Bertrand authored
      modified:
        storage/connect/ha_connect.cc
        storage/connect/mysql-test/connect/r/xml.result
      
      - Testing default pivot columns for srcdef
        Fixing order by MariaDB bug for pivot tables
      modified:
        storage/connect/tabmysql.cpp
        storage/connect/tabmysql.h
        storage/connect/tabpivot.cpp
        storage/connect/tabpivot.h
      aebcd56c
  8. 21 May, 2013 1 commit
    • Alexander Barkov's avatar
      "mtr --suite=connect --embedded" tests did not work for two reasons: · 41bda068
      Alexander Barkov authored
      1. The Connect engine code assumed that mysql_home_directory is always "./",
      which is not the fact in case of embedded server.
      Fixing the routines creating file names to add the mysql_home_directory prefix.
      
      2. FILE privilege is not checked in embedded server.
      Moving FILE related tests into separate files.
      Skipping the FILE related tests when running with --embedded.
      
      added:
        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/xml_grant.result
        storage/connect/mysql-test/connect/t/grant.test
        storage/connect/mysql-test/connect/t/ini_grant.test
        storage/connect/mysql-test/connect/t/mysql_grant.test
        storage/connect/mysql-test/connect/t/xml_grant.test
      modified:
        storage/connect/global.h
        storage/connect/ha_connect.cc
        storage/connect/mycat.cc
        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/ini.result
        storage/connect/mysql-test/connect/r/mysql.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/ini.test
        storage/connect/mysql-test/connect/t/mysql.test
        storage/connect/mysql-test/connect/t/vec.test
        storage/connect/mysql-test/connect/t/xml.test
        storage/connect/plgdbsem.h
        storage/connect/plugutil.c
      41bda068
  9. 20 May, 2013 4 commits
  10. 19 May, 2013 3 commits
    • Olivier Bertrand's avatar
      - Removing unused copy file · aacd6f55
      Olivier Bertrand authored
      modified:
        storage/connect/mysql-test/connect/t/pivot.test
      aacd6f55
    • Olivier Bertrand's avatar
      - Commit merged and resolve · cc38c511
      Olivier Bertrand authored
      added:
        storage/connect/inihandl.h
        storage/connect/rcmsg.h
      modified:
        storage/connect/CMakeLists.txt
        storage/connect/connect.h
        storage/connect/ha_connect.cc
        storage/connect/inihandl.c
        storage/connect/maputil.h
        storage/connect/odbconn.cpp
        storage/connect/osutil.c
        storage/connect/osutil.h
        storage/connect/plgdbutl.cpp
        storage/connect/plugutil.c
        storage/connect/rcmsg.c
        storage/connect/tabmysql.cpp
        storage/connect/tabodbc.cpp
        storage/connect/tabpivot.cpp
        storage/connect/tabsys.cpp
        storage/connect/tabutil.cpp
        storage/connect/tabutil.h
        storage/connect/user_connect.cc
        storage/connect/value.cpp
      cc38c511
    • Olivier Bertrand's avatar
      - Allowing views and queries as parameters for PROXY base tables · c035bde3
      Olivier Bertrand authored
        NOTE: Checking for looping references cannot be done when using views
        as parameters. This should not be allowed on production servers and
        should be dependant on a system variable and/or on speciel grant.
      
      modified:
        storage/connect/CMakeLists.txt
        storage/connect/connect.cc
        storage/connect/ha_connect.cc
        storage/connect/myconn.cpp
        storage/connect/myconn.h
        storage/connect/mysql-test/connect/r/fmt.result
        storage/connect/mysql-test/connect/r/pivot.result
        storage/connect/mysql-test/connect/t/fmt.test
        storage/connect/mysql-test/connect/t/pivot.test
        storage/connect/plgdbsem.h
        storage/connect/plugutil.c
        storage/connect/tabcol.cpp
        storage/connect/tabcol.h
        storage/connect/tabfmt.cpp
        storage/connect/tabmysql.cpp
        storage/connect/tabmysql.h
        storage/connect/taboccur.cpp
        storage/connect/taboccur.h
        storage/connect/tabpivot.cpp
        storage/connect/tabpivot.h
        storage/connect/tabtbl.cpp
        storage/connect/tabutil.cpp
        storage/connect/tabutil.h
        storage/connect/xtable.h
      c035bde3
  11. 13 May, 2013 10 commits
  12. 12 May, 2013 2 commits
    • Olivier Bertrand's avatar
      - Changing mode from +x to -x · 5ac8c8be
      Olivier Bertrand authored
      modified:
        storage/connect/mysql-test/connect/r/pivot.result*
        storage/connect/mysql-test/connect/t/pivot.test*
        storage/connect/tabpivot.cpp*
        storage/connect/tabpivot.h*
      5ac8c8be
    • Olivier Bertrand's avatar
      - Code cleaning. · 8c9ce173
      Olivier Bertrand authored
      modified:
        storage/connect/connect.cc
        storage/connect/tabutil.h
      
      - Fix closing invalid tdbp in External_lock.
      modified:
        storage/connect/ha_connect.cc
      
      - Fix closing null Tdbp
      modified:
        storage/connect/tabpivot.cpp*
      
      - Fix regression error in table type TBL no more accepting missing
        columns in sub-tables even when Accept was set to TRUE.
      modified:
        storage/connect/tabtbl.cpp
      8c9ce173
  13. 11 May, 2013 1 commit
    • Olivier Bertrand's avatar
      - Fix tabpivot compile errors on Linux. · 44cb1ce8
      Olivier Bertrand authored
      - Fix Tabpivot not closing the source table.
      - Fix pivot.test error on Linux by specifying ENDING=2 for the expenses table.
      
      modified:
        storage/connect/mysql-test/connect/r/pivot.result
        storage/connect/mysql-test/connect/t/pivot.test
        storage/connect/tabpivot.cpp
        storage/connect/tabpivot.h
      44cb1ce8