Merge lp:myconnpy/0.1 into lp:~geertjmvdk/myconnpy/main

[Geert JM Vanderkelen]

Unmerged revisions

243. By Geert JM Vanderkelen on 2010-08-11

Fix: examples.config.Config.dbinfo() not returning TCP port

o Bug lp:586003
o Config.dbinfo() now includes the TCP port
o Adding test case
o Updating ChangeLog

242. By Geert JM Vanderkelen on 2010-05-27

Preparing release 0.1.5-devel

241. By Geert JM Vanderkelen on 2010-05-27

Copyright change to Oracle

o Change copyright in all files
o Fixing a silly typo

240. By Geert JM Vanderkelen on 2010-05-27

Critical bug fix: impossible to select big results

o It was impossible to select big result sets.
o Fixed for both Python2 and Python3.
o Added test case for bug lp:586003 and lp:551533

=== modified file 'ChangeLog'
--- ChangeLog	2010-05-23 11:39:37 +0000
+++ ChangeLog	2010-05-28 13:28:30 +0000
@@ -1,11 +1,210 @@
 MySQL Connector/Python - Release Notes / ChangeLog
-Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 Use is subject to license terms. (See COPYING)
 
 -----------------------------------------------------------------------
+<<<<<<< TREE
 0.2.0
 -----------------------------------------------------------------------
 o Tidy-up and reorganizing the code so we have a clearer seperation between
   Python v2 and Python v3 code.
 o Some overhead was removed when reading packets send by MySQL.
-  (Bug lp:584518)
 \ No newline at end of file
+  (Bug lp:584518)=======
+0.1.5
+-----------------------------------------------------------------------
+Highlights:
+o It was impossible to retrieve big result sets. (bug lp:551533 and lp:586003)
+o Changing copyright from Sun to Oracle (also fixing silly typo).
+
+Details:
+241: Geert Vanderkelen 2010-05-27
+  Copyright change to Oracle
+240: Geert Vanderkelen 2010-05-27
+  Critical bug fix: impossible to select big results
+
+
+-----------------------------------------------------------------------
+0.1.4
+-----------------------------------------------------------------------
+Highlights:
+o Reading from network was broken for bigger packages.
+o Reimplementing protocol.MySQLProtocol marking simpler and easier to
+  maintain.
+o It is now possible to send multiple statements to MySQL using
+  MySQLCursor.execute(). The results are accessible by calling the method
+  next_resultset().
+o MySQLCursor.callproc() will now store all result sets as a
+  MySQLCursorBuffered. They are accessible using the next_proc_resultset()
+  method. The result of the stored procedure is returned by callproc()
+  itself as defined by PEP249.
+o MySQL DATETIME conversion to Python datetime.datetime is now much faster.
+o Some overall performance improvements.
+o Copyright notice changes
+
+Details:
+238: Geert Vanderkelen 2010-05-20
+  Fix raising errors
+237: Geert Vanderkelen 2010-05-16
+  Additional fix for bug lp:573274
+236: Geert Vanderkelen 2010-05-16
+  Fixes the operation not being encoded to character set
+235: Geert Vanderkelen 2010-05-14
+  Adding default collations to constants.CharacterSet
+234: Geert Vanderkelen 2010-05-13
+  Improving DATETIME to datetime.datetime conversion
+233: Geert Vanderkelen 2010-05-05
+  Adding support for Multiple Statements using MySQLCusor.execute()
+232: Geert Vanderkelen 2010-05-05
+  Adding new debug output 'mode' to utils._dump_buffer()
+231: Geert Vanderkelen 2010-05-05
+  Adding constants.flag_is_set helper method
+230: Geert Vanderkelen 2010-04-29
+  Removing debug code from MySQLCursor
+229: Geert Vanderkelen 2010-04-24
+  Fixing unittests checking temporal data
+228: Geert Vanderkelen 2010-04-23
+  Updating the ChangeLog for 0.1.4
+227: Geert Vanderkelen 2010-04-23
+	Adding support for multiple results sets returned by stored procedures
+226: Geert Vanderkelen 2010-04-20
+	Fixing compat with 2.5 and get_desc() now works
+225: Geert Vanderkelen 2010-04-20
+	Adding changes done since rev 220
+224: Geert Vanderkelen 2010-03-19
+	Reverting to use regular expressions when parting MySQL version
+223: Geert Vanderkelen 2010-03-16
+	Optimizing read_lc_string and fixing intread a bit
+222: Geert Vanderkelen 2010-02-26
+	Removing MySQLBase.conn, moving connection to MySQLProtocol
+221: Geert Vanderkelen 2010-02-26
+	Reimplementing protocol.MySQLProtocol
+220: Geert Vanderkelen 2010-02-22
+	Correct test case for bug lp:524668 using Py3k
+219: Geert Vanderkelen 2010-02-22
+	Removing socket flags when using UNIX socket
+218: Geert Vanderkelen 2010-02-22
+	Fix parsing MySQL versions which have none-digits
+217: Geert Vanderkelen 2010-02-21
+	Fix test case for Bug499362 to support older versions of MySQL
+216: Geert Vanderkelen 2010-02-19
+	Refactoring MySQLBaseConnection.recv()
+215: Geert Vanderkelen 2010-02-18
+	Moving packet header parsing into MySQLBaseConnection
+214: Geert Vanderkelen 2010-02-18
+	Refactoring utils.read_lc_string_list() back to original
+213: Geert Vanderkelen 2010-02-18
+	Removing unnecessary constants import
+212: Geert Vanderkelen 2010-02-18
+	Refactoring methods utils.intread and utils.read_int
+211: Geert Vanderkelen 2010-02-18
+	Refactoring MySQLBase._open_connection
+210: Geert Vanderkelen 2010-02-18
+	Refactoring MySQLProtocol.set_handshake
+209: Geert Vanderkelen 2010-02-18
+	Refactoring MySQLBase.set_autocommit
+208: Geert Vanderkelen 2010-02-17
+	Optimizing the CharacterSet constant
+207: Geert Vanderkelen 2010-02-16
+	Adding passwd as connection parameter
+206: Geert Vanderkelen 2010-02-12
+	Adding support Cygwin setting socket flags to zero
+205: Geert Vanderkelen 2010-02-12
+	Fix authentication by fixing utils.int1read()
+204: Geert Vanderkelen 2010-02-12
+	Reverting rev200
+203: Geert Vanderkelen 2010-02-08
+	Fix possible problem with socket.error without errno
+202: Geert Vanderkelen 2010-01-28
+	{0.1.3-devel} Adding changelog for 0.1.3-devel
+
+-----------------------------------------------------------------------
+0.1.3-devel (2010-01-28)
+-----------------------------------------------------------------------
+Highlights:
+o Important memory leak fixed when closing cursors.
+o Warnings can now be raised as exceptions.
+o Fixing unicode usage and broken error message when MySQL chops them
+o Client flags can now be set correctly when connecting
+o Conversion fixes for BIT/YEARSET and Python to DATE/DATETIME
+o Adding MySQL Client Errors and raising better exceptions based on errno.
+
+Details:
+201: Geert Vanderkelen 2010-01-28 {0.1.3-devel} Using weak references
+200: Geert Vanderkelen 2010-01-28 Moving dict attributes of MySQLConverter to methods
+199: Geert Vanderkelen 2010-01-27 Fixing memory leak when opening cursors
+198: Geert Vanderkelen 2010-01-26 Exception raised in protocol module using errors.get_mysql_exception
+197: Geert Vanderkelen 2010-01-26 Fixing mysql.Error and simplying
+196: Geert Vanderkelen 2010-01-25 Adding MySQL server errors and better exceptions (part 1)
+195: Geert Vanderkelen 2010-01-25 Fixing rowcount in Cursor executemany() with no-result sets
+194: Geert Vanderkelen 2010-01-25 Using MySQL Client Error messages when connecting
+193: Geert Vanderkelen 2010-01-25 Implementing MySQL Client Errors
+192: Geert Vanderkelen 2010-01-23 Simplying the cursor.set_connection method raising correct Exception
+191: Geert Vanderkelen 2010-01-23 Changing get_flags_info to get_bit_info in a new class
+190: Geert Vanderkelen 2010-01-22 Implementing Raise-On-Warnings
+189: Geert Vanderkelen 2010-01-22 Fixed the conversion of binary fields
+188: Geert Vanderkelen 2010-01-22 Removing sys.path change
+187: Geert Vanderkelen 2010-01-22 Adding method to retrieve names given FieldFlag bitvalues
+186: Geert Vanderkelen 2010-01-22 Fixing _constants get_desc/get_info methods
+185: Geert Vanderkelen 2010-01-22 Adding missing check for BIT-field in to_python method
+184: Geert Vanderkelen 2010-01-22 Fixing buffered MySQL cursor & handling unread results
+183: Geert Vanderkelen 2010-01-20 Change in convesion of SET data type to Python set
+182: Geert Vanderkelen 2010-01-20 Adding tests for MySQL data types (numeric and temporal)
+181: Geert Vanderkelen 2010-01-19 Fixing Python to MySQL DATE/DATETIME conversions and throwing exceptions
+180: Geert Vanderkelen 2010-01-17 Removing fields and nrflds attributes from MySQLCursor
+179: Geert Vanderkelen 2010-01-15 Fixing MySQL BIT column conversion to Python
+178: Geert Vanderkelen 2010-01-14 Adding conversion for MySQL's BIT data type
+177: Geert Vanderkelen 2010-01-14 Updating inserts.py example so it commits
+176: Geert Vanderkelen 2010-01-14 Adding conversion for MySQL's YEAR data type
+175: Geert Vanderkelen 2009-12-31 Fix in unittests for comparing results from MySQL and what is expected
+174: Geert Vanderkelen 2009-12-31 Fix for setting client flags when connecting
+173: Geert Vanderkelen 2009-12-23 [merge] Merging from 0.1.2-devel release
+172: Geert Vanderkelen 2009-12-23 Fix for broken unicode characters when MySQL trimed the errmsg
+171: Geert Vanderkelen 2009-12-23 Fixing unicode usage for both Python 2.4+ and 3.1
+
+-----------------------------------------------------------------------
+0.1.2-devel (2009-12-23)
+-----------------------------------------------------------------------
+o Fixing unicode usage for both Python 2.4+ and 3.1
+  * Setting 'use_unicode' at connection time is now working.
+  * conversion.py: removing regular expression for quoting backslashes.
+  * Adding test case for bug lp:499410
+  
+  Py3k specific:
+  * Strings from MySQL are decoded to the given character when use_unicode
+    is false
+  * The statement is encoded just before sending it to the MySQL server.
+    Internally, all is done in unicode.
+  * In conversion.py: removing _unicode_to_mysql, adding _bytes_to_mysql
+  * MySQLCursor.__unicode__ is obsolete and replaced with __str__
+  * Removing tests for which the methods were deleted.
+
+o Fix setting character set at connection
+  
+  * mysql.connector.Connect(charset='latin1') now works as expected
+  * Default character set is (still) UTF-8.
+  * SET NAMES is only used when changing character set after connecting.
+    Use MySQL.set_charset(charsetname) to change.
+  * Test case added for bug report; fixing test case in test_protocol.py
+    to reflect the new default character set 'utf-8'.
+
+-----------------------------------------------------------------------
+0.1.1-devel (2009-12-21)
+-----------------------------------------------------------------------
+o Added Python v3.1 support
+  * The subdirectory/module py3k/ contains Connector/Python compatible
+    with Python v3.1.1.
+  * setup.py will install the correct Connector/Python distribution
+    depending on the Python version.
+  * Test cases which were running against Python v2.4+ are also working
+    under Python v3.1
+  * Examples found in py3k/examples should work with Python v3.1
+  * The code will not check whether the Python version is supported.
+  
+o Misc.
+  * Using divmod() in MySQLConverter._timedelta_to_mysql()
+  * Avoiding imports and the use of isinstance() by putting code in
+    exceptions.
+  * Stop using types module.
+
+
+>>>>>>> MERGE-SOURCE
 
=== modified file 'README'
--- README	2010-05-21 13:52:17 +0000
+++ README	2010-05-28 13:28:30 +0000
@@ -1,7 +1,11 @@
 
 MySQL Connector/Python                          MySQL driver written in Python
 ==============================================================================
+<<<<<<< TREE
 Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+=======
+Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+>>>>>>> MERGE-SOURCE
 Use is subject to license terms. (See COPYING)
 
 MySQL Connector/Python is implementing the MySQL Client/Server protocol
 
=== modified file 'make_release.py'
--- make_release.py	2010-05-21 13:52:17 +0000
+++ make_release.py	2010-05-28 13:28:30 +0000
@@ -1,7 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # MySQL Connector/Python - MySQL driver written in Python.
+<<<<<<< TREE
 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+>>>>>>> MERGE-SOURCE
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python2/examples/client.py' (properties changed: +x to -x)
--- python2/examples/client.py	2010-05-21 13:52:17 +0000
+++ python2/examples/client.py	2010-05-28 13:28:30 +0000
@@ -1,7 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # MySQL Connector/Python - MySQL driver written in Python.
+<<<<<<< TREE
 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+>>>>>>> MERGE-SOURCE
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python2/mysql/connector/__init__.py'
--- python2/mysql/connector/__init__.py	2009-12-31 10:34:36 +0000
+++ python2/mysql/connector/__init__.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python2/mysql/connector/_version.py'
--- python2/mysql/connector/_version.py	2010-05-21 09:32:25 +0000
+++ python2/mysql/connector/_version.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,9 @@
 # MySQL Connector/Python - MySQL driver written in Python.
+<<<<<<< TREE
 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+>>>>>>> MERGE-SOURCE
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python2/mysql/connector/connection.py'
--- python2/mysql/connector/connection.py	2010-05-23 12:16:35 +0000
+++ python2/mysql/connector/connection.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,9 @@
 # MySQL Connector/Python - MySQL driver written in Python.
+<<<<<<< TREE
 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+>>>>>>> MERGE-SOURCE
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -88,14 +92,14 @@
                 if pktnr == -1 and totalsize > 4:
                     pktsize = utils.intread(buf[0:3])
                     pktnr = utils.intread(buf[3])
-                if pktnr > -1 and totalsize >= pktsize:
+                if pktnr > -1 and totalsize >= pktsize+4:
                     size = pktsize+4
                     self.buffer.append(buf[0:size])
                     buf = buf[size:]
                     pktnr = -1
                     if len(buf) == 0:
                         break
-                elif len(buf) < pktsize:
+                elif len(buf) < pktsize+4:
                     buf += self.sock.recv(self.recvsize, self.socket_flags)
         except socket.error, e:
             raise errors.InterfaceError(errno=2055,
 
=== modified file 'python2/mysql/connector/constants.py'
--- python2/mysql/connector/constants.py	2010-05-14 11:41:54 +0000
+++ python2/mysql/connector/constants.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python2/mysql/connector/conversion.py'
--- python2/mysql/connector/conversion.py	2010-05-13 07:01:07 +0000
+++ python2/mysql/connector/conversion.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -413,4 +413,4 @@
                 return v
         
         return self._STRING_to_python(v, dsc)
-    
 \ No newline at end of file
+    
 
=== modified file 'python2/mysql/connector/cursor.py'
--- python2/mysql/connector/cursor.py	2010-05-16 11:38:16 +0000
+++ python2/mysql/connector/cursor.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -605,4 +605,4 @@
         return res
     
 
-        
 \ No newline at end of file
+        
 
=== modified file 'python2/mysql/connector/dbapi.py'
--- python2/mysql/connector/dbapi.py	2009-11-26 16:14:48 +0000
+++ python2/mysql/connector/dbapi.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python2/mysql/connector/errors.py'
--- python2/mysql/connector/errors.py	2010-05-23 12:16:35 +0000
+++ python2/mysql/connector/errors.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,9 @@
 # MySQL Connector/Python - MySQL driver written in Python.
+<<<<<<< TREE
 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+>>>>>>> MERGE-SOURCE
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python2/mysql/connector/mysql.py'
--- python2/mysql/connector/mysql.py	2010-05-20 09:43:47 +0000
+++ python2/mysql/connector/mysql.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python2/mysql/connector/protocol.py'
--- python2/mysql/connector/protocol.py	2010-05-23 11:15:53 +0000
+++ python2/mysql/connector/protocol.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python2/mysql/connector/utils.py'
--- python2/mysql/connector/utils.py	2010-05-05 13:27:52 +0000
+++ python2/mysql/connector/utils.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python2/tests/__init__.py'
--- python2/tests/__init__.py	2010-01-20 13:01:19 +0000
+++ python2/tests/__init__.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -126,4 +126,4 @@
 
 def printmsg(msg=None):
     if msg is not None:
-        print(msg)
 \ No newline at end of file
+        print(msg)
 
=== modified file 'python2/tests/test_bugs.py'
--- python2/tests/test_bugs.py	2010-05-23 10:34:51 +0000
+++ python2/tests/test_bugs.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -505,3 +505,45 @@
         self.assertEqual(exp,self.c.fetchall())
         self.assertEqual(None,self.c.next_resultset())
 
+class Bug551533and586003(tests.MySQLConnectorTests):
+    """lp: 551533, 586003: impossible to retrive big result sets"""
+
+    def setUp(self):
+        config = self.getMySQLConfig()
+        config['connection_timeout'] = 2
+        self.db = mysql.MySQL(**config)
+        self.c = self.db.cursor()
+
+        self.tbl = 'Bug551533'
+        self.c.execute("DROP TABLE IF EXISTS %s" % (self.tbl))
+        self.c.execute("""CREATE TABLE %s (
+            id INT AUTO_INCREMENT KEY,
+            c1 VARCHAR(100) DEFAULT 'abcabcabcabcabcabcabcabcabcabc'
+        )""" % (self.tbl))
+
+    def tearDown(self):
+        try:
+            self.c = db.cursor("DROP TABLE IF EXISTS %s" % (self.tbl))
+            self.c.close()
+        except:
+            pass
+        self.db.close()
+
+    def test_select(self):
+        """lp: 551533, 586003: impossible to retrive big result sets"""
+
+        insert = "INSERT INTO %s VALUES ()" % (self.tbl)
+        exp = 20000
+        i = exp
+        while i > 0:
+            self.c.execute(insert)
+            i -= 1
+        
+        self.c.execute('SELECT * FROM %s LIMIT 20000' % (self.tbl))
+        try:
+            rows = self.c.fetchall()
+        except:
+            self.fail("Failed retrieving big result set")
+        else:
+            self.assertEqual(exp, self.c.rowcount)
+
 
=== modified file 'python2/tests/test_constants.py'
--- python2/tests/test_constants.py	2010-05-14 11:41:54 +0000
+++ python2/tests/test_constants.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -284,4 +284,4 @@
         
         self.assertEqual(exp, constants.CharacterSet.get_supported())
 
-    
 \ No newline at end of file
+    
 
=== modified file 'python2/tests/test_conversion.py'
--- python2/tests/test_conversion.py	2010-01-22 14:47:52 +0000
+++ python2/tests/test_conversion.py	2010-05-28 13:28:30 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -429,4 +429,4 @@
         res = self.cnv._BLOB_to_python(data,desc)
         
         self.assertEqual(data,res)
-    
 \ No newline at end of file
+    
 
=== modified file 'python2/tests/test_cursor.py'
--- python2/tests/test_cursor.py	2010-05-05 14:08:47 +0000
+++ python2/tests/test_cursor.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -821,4 +821,4 @@
             pass
         else:
             self.fail("Did not get exception while raising warnings.")
-        
 \ No newline at end of file
+        
 
=== modified file 'python2/tests/test_examples.py'
--- python2/tests/test_examples.py	2010-05-05 14:08:47 +0000
+++ python2/tests/test_examples.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -99,4 +99,4 @@
             import examples.multi_resultsets as exp
         except StandardError, e:
             self.fail(e)
-        self._exec_main(exp)
 \ No newline at end of file
+        self._exec_main(exp)
 
=== modified file 'python2/tests/test_mysql_datatypes.py'
--- python2/tests/test_mysql_datatypes.py	2010-04-24 16:53:06 +0000
+++ python2/tests/test_mysql_datatypes.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -328,4 +328,4 @@
                 compare("%s (data[%d])" % (col,j),data[j][i],rows[j][i])
         
         c.close()
-        
 \ No newline at end of file
+        
 
=== modified file 'python2/tests/test_pep249.py'
--- python2/tests/test_pep249.py	2010-04-24 16:53:06 +0000
+++ python2/tests/test_pep249.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python2/tests/test_protocol.py'
--- python2/tests/test_protocol.py	2010-05-23 11:15:53 +0000
+++ python2/tests/test_protocol.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python2/tests/test_utils.py'
--- python2/tests/test_utils.py	2010-02-18 16:33:28 +0000
+++ python2/tests/test_utils.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/mysql/connector/__init__.py'
--- python3/mysql/connector/__init__.py	2009-12-31 10:34:36 +0000
+++ python3/mysql/connector/__init__.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/mysql/connector/_version.py'
--- python3/mysql/connector/_version.py	2010-05-21 09:32:25 +0000
+++ python3/mysql/connector/_version.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,9 @@
 # MySQL Connector/Python - MySQL driver written in Python.
+<<<<<<< TREE
 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+>>>>>>> MERGE-SOURCE
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/mysql/connector/connection.py'
--- python3/mysql/connector/connection.py	2010-05-23 12:16:35 +0000
+++ python3/mysql/connector/connection.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,9 @@
 # MySQL Connector/Python - MySQL driver written in Python.
+<<<<<<< TREE
 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+>>>>>>> MERGE-SOURCE
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -87,14 +91,14 @@
                 if pktnr == -1 and totalsize > 4:
                     pktsize = utils.intread(buf[0:3])
                     pktnr = utils.intread(buf[3])
-                if pktnr > -1 and totalsize >= pktsize:
+                if pktnr > -1 and totalsize >= pktsize+4:
                     size = pktsize+4
                     self.buffer.append(buf[0:size])
                     buf = buf[size:]
                     pktnr = -1
                     if len(buf) == 0:
                         break
-                elif len(buf) < pktsize:
+                elif len(buf) < pktsize+4:
                     buf += self.sock.recv(self.recvsize, self.socket_flags)
         except socket.error as e:
             raise errors.InterfaceError(errno=2055,
 
=== modified file 'python3/mysql/connector/constants.py'
--- python3/mysql/connector/constants.py	2010-05-14 11:41:54 +0000
+++ python3/mysql/connector/constants.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/mysql/connector/conversion.py'
--- python3/mysql/connector/conversion.py	2010-05-13 07:01:07 +0000
+++ python3/mysql/connector/conversion.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/mysql/connector/cursor.py'
--- python3/mysql/connector/cursor.py	2010-05-16 11:27:39 +0000
+++ python3/mysql/connector/cursor.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/mysql/connector/dbapi.py'
--- python3/mysql/connector/dbapi.py	2009-12-21 15:53:20 +0000
+++ python3/mysql/connector/dbapi.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/mysql/connector/errors.py'
--- python3/mysql/connector/errors.py	2010-05-23 12:16:35 +0000
+++ python3/mysql/connector/errors.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/mysql/connector/mysql.py'
--- python3/mysql/connector/mysql.py	2010-05-20 09:43:47 +0000
+++ python3/mysql/connector/mysql.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/mysql/connector/protocol.py'
--- python3/mysql/connector/protocol.py	2010-05-23 11:15:53 +0000
+++ python3/mysql/connector/protocol.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/mysql/connector/utils.py'
--- python3/mysql/connector/utils.py	2010-05-05 13:27:52 +0000
+++ python3/mysql/connector/utils.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/tests/__init__.py'
--- python3/tests/__init__.py	2010-01-20 13:01:19 +0000
+++ python3/tests/__init__.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/tests/test_bugs.py'
--- python3/tests/test_bugs.py	2010-05-23 10:34:51 +0000
+++ python3/tests/test_bugs.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -520,3 +520,45 @@
         exp = [(1, 10), (2, 20)]
         self.assertEqual(exp,self.c.fetchall())
         self.assertEqual(None,self.c.next_resultset())
+
+class Bug551533and586003(tests.MySQLConnectorTests):
+    """lp: 551533, 586003: impossible to retrive big result sets"""
+
+    def setUp(self):
+        config = self.getMySQLConfig()
+        config['connection_timeout'] = 2
+        self.db = mysql.MySQL(**config)
+        self.c = self.db.cursor()
+
+        self.tbl = 'Bug551533'
+        self.c.execute("DROP TABLE IF EXISTS %s" % (self.tbl))
+        self.c.execute("""CREATE TABLE %s (
+            id INT AUTO_INCREMENT KEY,
+            c1 VARCHAR(100) DEFAULT 'abcabcabcabcabcabcabcabcabcabc'
+        )""" % (self.tbl))
+
+    def tearDown(self):
+        try:
+            self.c = db.cursor("DROP TABLE IF EXISTS %s" % (self.tbl))
+            self.c.close()
+        except:
+            pass
+        self.db.close()
+
+    def test_select(self):
+        """lp: 551533, 586003: impossible to retrive big result sets"""
+
+        insert = "INSERT INTO %s VALUES ()" % (self.tbl)
+        exp = 20000
+        i = exp
+        while i > 0:
+            self.c.execute(insert)
+            i -= 1
+
+        self.c.execute('SELECT * FROM %s LIMIT 20000' % (self.tbl))
+        try:
+            rows = self.c.fetchall()
+        except:
+            self.fail("Failed retrieving big result set")
+        else:
+            self.assertEqual(exp, self.c.rowcount)
 
=== modified file 'python3/tests/test_constants.py'
--- python3/tests/test_constants.py	2010-05-14 11:41:54 +0000
+++ python3/tests/test_constants.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -283,4 +283,4 @@
         
         self.assertEqual(exp, constants.CharacterSet.get_supported())
 
-    
 \ No newline at end of file
+    
 
=== modified file 'python3/tests/test_conversion.py'
--- python3/tests/test_conversion.py	2010-01-22 14:47:52 +0000
+++ python3/tests/test_conversion.py	2010-05-28 13:28:30 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -426,4 +426,4 @@
         desc = ('foo', constants.FieldType.BLOB, 2, 3, 4, 5, 6, constants.FieldFlag.BINARY)
         res = self.cnv._BLOB_to_python(data,desc)
 
-        self.assertEqual(data,res)
 \ No newline at end of file
+        self.assertEqual(data,res)
 
=== modified file 'python3/tests/test_cursor.py'
--- python3/tests/test_cursor.py	2010-05-05 14:08:47 +0000
+++ python3/tests/test_cursor.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/tests/test_examples.py'
--- python3/tests/test_examples.py	2010-05-21 13:52:17 +0000
+++ python3/tests/test_examples.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
@@ -99,4 +99,4 @@
         except StandardError as e:
             self.fail(e)
         self._exec_main(exp)
-    
 \ No newline at end of file
+    
 
=== modified file 'python3/tests/test_mysql_datatypes.py'
--- python3/tests/test_mysql_datatypes.py	2010-04-24 16:53:06 +0000
+++ python3/tests/test_mysql_datatypes.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/tests/test_pep249.py'
--- python3/tests/test_pep249.py	2010-04-24 16:53:06 +0000
+++ python3/tests/test_pep249.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/tests/test_protocol.py'
--- python3/tests/test_protocol.py	2010-05-23 11:15:53 +0000
+++ python3/tests/test_protocol.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'python3/tests/test_utils.py'
--- python3/tests/test_utils.py	2010-02-18 16:33:28 +0000
+++ python3/tests/test_utils.py	2010-05-28 13:28:30 +0000
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'setup.py' (properties changed: +x to -x)
--- setup.py	2010-05-21 13:52:17 +0000
+++ setup.py	2010-05-28 13:28:30 +0000
@@ -1,7 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # MySQL Connector/Python - MySQL driver written in Python.
+<<<<<<< TREE
 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+>>>>>>> MERGE-SOURCE
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify
 
=== modified file 'unittests.py' (properties changed: +x to -x)
--- unittests.py	2010-05-21 13:52:17 +0000
+++ unittests.py	2010-05-28 13:28:30 +0000
@@ -1,7 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # MySQL Connector/Python - MySQL driver written in Python.
+<<<<<<< TREE
 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
+>>>>>>> MERGE-SOURCE
 # Use is subject to license terms. (See COPYING)
 
 # This program is free software; you can redistribute it and/or modify