Permalink
Commits on Aug 1, 2012
  1. Merge pull request #252 from sodabrew/issue-233

    Issue 233 - Add :local_infile option and refactor mysql_options code
    brianmario committed Aug 1, 2012
  2. Merge branch 'master' into issue-233a

    Conflicts:
    	ext/mysql2/client.c
    	ext/mysql2/client.h
    sodabrew committed Aug 1, 2012
Commits on Jul 16, 2012
  1. Merge pull request #258 from yb66/mysql_opts

    Mysql opts
    brianmario committed Jul 16, 2012
  2. Merge pull request #273 from camilo/streaming_query_improvements

    Streaming query, fixes count and removes extraneous nil
    brianmario committed Jul 16, 2012
Commits on Jul 15, 2012
  1. Merge pull request #276 from pixeltrix/invert-boolean-casting-logic

    Invert boolean casting logic
    brianmario committed Jul 15, 2012
Commits on Jul 14, 2012
  1. Merge pull request #268 from eric/patch-1

    Fix misplaced period in warn
    brianmario committed Jul 14, 2012
  2. Merge pull request #254 from abrody/master

    :connect_timeout does not work due to EINTR loop
    brianmario committed Jul 14, 2012
Commits on Jul 12, 2012
  1. Merge pull request #265 from abrody/conn-close-fix

    Detach EM.watch from close().
    brianmario committed Jul 12, 2012
Commits on Jul 10, 2012
  1. track active thread in client to ease debugging

    The boolean "active" flag was less informative than
    it could've been.   By storing the active_thread VALUE
    instead, we can inform the user which thread is using
    the connection in the exception message.
    Eric Wong committed Jul 10, 2012
Commits on Jun 18, 2012
  1. Invert boolean casting logic

    Change the logic of casting tinyints to boolean from == 1 being
    true to != 0 being true. Whilst it's universally accepted that 0
    is equivalent to false some database access libraries
    (MS Access/ODBC for example) will write a -1 for a true value.
    This is actually more consistent with Ruby behaviour where anything
    other than nil or false is truthy.
    committed Jun 18, 2012
Commits on Jun 12, 2012
  1. Handles the extra nil row for streaming queries.

    Makes sure the extra nil row is accounted for on #count after a streaming query,
    ideally the nil should not be yielded but that'd be a separate patch.
    camilo committed Jun 12, 2012
Commits on Jun 11, 2012
  1. Fix returns the number of rows processed after an stream: true query.

    As of now when using the ```:stream => true``` after all the results have been
    fetched Result#count would still return 0.
    
    This patch attempts to read the value from numberOfRows when the result has
    finished streaming.
    camilo committed Jun 11, 2012
Commits on May 26, 2012
  1. Fix misplaced period in warn

    Moves the `.` inside of the quotes.
    eric committed May 26, 2012
Commits on May 3, 2012
  1. Detach EM.watch from close().

    Fixes #264
    Andy Brody committed May 3, 2012
  2. Fix :connect_timeout / EINTR loop bug.

    Fixes #189
    Andy Brody committed Apr 10, 2012
Commits on Apr 18, 2012
  1. Added method to symbolise keys (within the ruby code) for use with th…

    …e client options.
    yb66 committed Apr 18, 2012
Commits on Apr 4, 2012
  1. List of valid Mysql2::Client options.

    	README.md
    sodabrew committed Jan 28, 2012
Commits on Mar 29, 2012
Commits on Mar 28, 2012
  1. the result struct should not be accessed after it's been freed.

    Iterating through the rows will cause the result struct to be freed,
    which means that the `count` method could do an invalid memory access.
    
    fixes #190
    tenderlove committed Mar 28, 2012
  2. Merge remote-tracking branch 'wok/master' into zzz

    * wok/master:
      Cast MYSQL_TYPE_DECIMAL AND MYSQL_TYPE_NEWDECIMAL to integer if number of decimals is 0
      Fix compiler error on ruby 1.9.3
      Updating Specs and Readme
      Adding more_results, next_result and store_result
    
    Conflicts:
    	ext/mysql2/client.c
    tenderlove committed Mar 28, 2012
  3. Taught RDoc about the mysql2 class, added documentation to the methods

    on Mysql2::Client. Fixes #204
    tenderlove committed Mar 28, 2012
Commits on Mar 16, 2012
  1. Merge pull request #248 from thoughtless/em_callback_exceptions

    Don't fail deferrables when callbacks raise exceptions
    brianmario committed Mar 16, 2012
Commits on Mar 15, 2012
  1. Don't succeed the deferrable client raises exception

    * If there is a MySQL error when using EM, don't succeed the deferrable.
    * Thanks to: qqshfox/em-synchrony@3448059
    thoughtless committed Mar 15, 2012
  2. Don't fail deferrables when callbacks raise exceptions

    * Only fail the deferrable if the exception came from the client.
    thoughtless committed Mar 15, 2012
Commits on Mar 13, 2012
  1. Merge pull request #247 from osheroff/master

    Support mysql's select_db
    brianmario committed Mar 13, 2012