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

Proposed by Geert JM Vanderkelen on 2010-05-28
Status: Rejected
Rejected by: Geert JM Vanderkelen on 2010-05-28
Proposed branch: lp:myconnpy/0.1
Merge into: lp:~geertjmvdk/myconnpy/main
Diff against target: 979 lines (+377/-54) (has conflicts)
48 files modified
ChangeLog (+201/-2)
README (+4/-0)
make_release.py (+4/-0)
python2/examples/client.py (+4/-0)
python2/mysql/connector/__init__.py (+1/-1)
python2/mysql/connector/_version.py (+4/-0)
python2/mysql/connector/connection.py (+6/-2)
python2/mysql/connector/constants.py (+1/-1)
python2/mysql/connector/conversion.py (+2/-2)
python2/mysql/connector/cursor.py (+2/-2)
python2/mysql/connector/dbapi.py (+1/-1)
python2/mysql/connector/errors.py (+4/-0)
python2/mysql/connector/mysql.py (+1/-1)
python2/mysql/connector/protocol.py (+1/-1)
python2/mysql/connector/utils.py (+1/-1)
python2/tests/__init__.py (+2/-2)
python2/tests/test_bugs.py (+43/-1)
python2/tests/test_constants.py (+2/-2)
python2/tests/test_conversion.py (+2/-2)
python2/tests/test_cursor.py (+2/-2)
python2/tests/test_examples.py (+2/-2)
python2/tests/test_mysql_datatypes.py (+2/-2)
python2/tests/test_pep249.py (+1/-1)
python2/tests/test_protocol.py (+1/-1)
python2/tests/test_utils.py (+1/-1)
python3/mysql/connector/__init__.py (+1/-1)
python3/mysql/connector/_version.py (+4/-0)
python3/mysql/connector/connection.py (+6/-2)
python3/mysql/connector/constants.py (+1/-1)
python3/mysql/connector/conversion.py (+1/-1)
python3/mysql/connector/cursor.py (+1/-1)
python3/mysql/connector/dbapi.py (+1/-1)
python3/mysql/connector/errors.py (+1/-1)
python3/mysql/connector/mysql.py (+1/-1)
python3/mysql/connector/protocol.py (+1/-1)
python3/mysql/connector/utils.py (+1/-1)
python3/tests/__init__.py (+1/-1)
python3/tests/test_bugs.py (+43/-1)
python3/tests/test_constants.py (+2/-2)
python3/tests/test_conversion.py (+2/-2)
python3/tests/test_cursor.py (+1/-1)
python3/tests/test_examples.py (+2/-2)
python3/tests/test_mysql_datatypes.py (+1/-1)
python3/tests/test_pep249.py (+1/-1)
python3/tests/test_protocol.py (+1/-1)
python3/tests/test_utils.py (+1/-1)
setup.py (+4/-0)
unittests.py (+4/-0)
Text conflict in ChangeLog
Text conflict in README
Text conflict in make_release.py
Text conflict in python2/examples/client.py
Text conflict in python2/mysql/connector/_version.py
Text conflict in python2/mysql/connector/connection.py
Text conflict in python2/mysql/connector/errors.py
Text conflict in python3/mysql/connector/_version.py
Text conflict in python3/mysql/connector/connection.py
Text conflict in setup.py
Text conflict in unittests.py
To merge this branch: bzr merge lp:myconnpy/0.1
Reviewer Review Type Date Requested Status
Geert JM Vanderkelen Pending
Review via email: mp+26303@code.launchpad.net
To post a comment you must log in.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2010-05-23 11:39:37 +0000
3+++ ChangeLog 2010-05-28 13:28:30 +0000
4@@ -1,11 +1,210 @@
5 MySQL Connector/Python - Release Notes / ChangeLog
6-Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
7+Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
8 Use is subject to license terms. (See COPYING)
9
10 -----------------------------------------------------------------------
11+<<<<<<< TREE
12 0.2.0
13 -----------------------------------------------------------------------
14 o Tidy-up and reorganizing the code so we have a clearer seperation between
15 Python v2 and Python v3 code.
16 o Some overhead was removed when reading packets send by MySQL.
17- (Bug lp:584518)
18\ No newline at end of file
19+ (Bug lp:584518)=======
20+0.1.5
21+-----------------------------------------------------------------------
22+Highlights:
23+o It was impossible to retrieve big result sets. (bug lp:551533 and lp:586003)
24+o Changing copyright from Sun to Oracle (also fixing silly typo).
25+
26+Details:
27+241: Geert Vanderkelen 2010-05-27
28+ Copyright change to Oracle
29+240: Geert Vanderkelen 2010-05-27
30+ Critical bug fix: impossible to select big results
31+
32+
33+-----------------------------------------------------------------------
34+0.1.4
35+-----------------------------------------------------------------------
36+Highlights:
37+o Reading from network was broken for bigger packages.
38+o Reimplementing protocol.MySQLProtocol marking simpler and easier to
39+ maintain.
40+o It is now possible to send multiple statements to MySQL using
41+ MySQLCursor.execute(). The results are accessible by calling the method
42+ next_resultset().
43+o MySQLCursor.callproc() will now store all result sets as a
44+ MySQLCursorBuffered. They are accessible using the next_proc_resultset()
45+ method. The result of the stored procedure is returned by callproc()
46+ itself as defined by PEP249.
47+o MySQL DATETIME conversion to Python datetime.datetime is now much faster.
48+o Some overall performance improvements.
49+o Copyright notice changes
50+
51+Details:
52+238: Geert Vanderkelen 2010-05-20
53+ Fix raising errors
54+237: Geert Vanderkelen 2010-05-16
55+ Additional fix for bug lp:573274
56+236: Geert Vanderkelen 2010-05-16
57+ Fixes the operation not being encoded to character set
58+235: Geert Vanderkelen 2010-05-14
59+ Adding default collations to constants.CharacterSet
60+234: Geert Vanderkelen 2010-05-13
61+ Improving DATETIME to datetime.datetime conversion
62+233: Geert Vanderkelen 2010-05-05
63+ Adding support for Multiple Statements using MySQLCusor.execute()
64+232: Geert Vanderkelen 2010-05-05
65+ Adding new debug output 'mode' to utils._dump_buffer()
66+231: Geert Vanderkelen 2010-05-05
67+ Adding constants.flag_is_set helper method
68+230: Geert Vanderkelen 2010-04-29
69+ Removing debug code from MySQLCursor
70+229: Geert Vanderkelen 2010-04-24
71+ Fixing unittests checking temporal data
72+228: Geert Vanderkelen 2010-04-23
73+ Updating the ChangeLog for 0.1.4
74+227: Geert Vanderkelen 2010-04-23
75+ Adding support for multiple results sets returned by stored procedures
76+226: Geert Vanderkelen 2010-04-20
77+ Fixing compat with 2.5 and get_desc() now works
78+225: Geert Vanderkelen 2010-04-20
79+ Adding changes done since rev 220
80+224: Geert Vanderkelen 2010-03-19
81+ Reverting to use regular expressions when parting MySQL version
82+223: Geert Vanderkelen 2010-03-16
83+ Optimizing read_lc_string and fixing intread a bit
84+222: Geert Vanderkelen 2010-02-26
85+ Removing MySQLBase.conn, moving connection to MySQLProtocol
86+221: Geert Vanderkelen 2010-02-26
87+ Reimplementing protocol.MySQLProtocol
88+220: Geert Vanderkelen 2010-02-22
89+ Correct test case for bug lp:524668 using Py3k
90+219: Geert Vanderkelen 2010-02-22
91+ Removing socket flags when using UNIX socket
92+218: Geert Vanderkelen 2010-02-22
93+ Fix parsing MySQL versions which have none-digits
94+217: Geert Vanderkelen 2010-02-21
95+ Fix test case for Bug499362 to support older versions of MySQL
96+216: Geert Vanderkelen 2010-02-19
97+ Refactoring MySQLBaseConnection.recv()
98+215: Geert Vanderkelen 2010-02-18
99+ Moving packet header parsing into MySQLBaseConnection
100+214: Geert Vanderkelen 2010-02-18
101+ Refactoring utils.read_lc_string_list() back to original
102+213: Geert Vanderkelen 2010-02-18
103+ Removing unnecessary constants import
104+212: Geert Vanderkelen 2010-02-18
105+ Refactoring methods utils.intread and utils.read_int
106+211: Geert Vanderkelen 2010-02-18
107+ Refactoring MySQLBase._open_connection
108+210: Geert Vanderkelen 2010-02-18
109+ Refactoring MySQLProtocol.set_handshake
110+209: Geert Vanderkelen 2010-02-18
111+ Refactoring MySQLBase.set_autocommit
112+208: Geert Vanderkelen 2010-02-17
113+ Optimizing the CharacterSet constant
114+207: Geert Vanderkelen 2010-02-16
115+ Adding passwd as connection parameter
116+206: Geert Vanderkelen 2010-02-12
117+ Adding support Cygwin setting socket flags to zero
118+205: Geert Vanderkelen 2010-02-12
119+ Fix authentication by fixing utils.int1read()
120+204: Geert Vanderkelen 2010-02-12
121+ Reverting rev200
122+203: Geert Vanderkelen 2010-02-08
123+ Fix possible problem with socket.error without errno
124+202: Geert Vanderkelen 2010-01-28
125+ {0.1.3-devel} Adding changelog for 0.1.3-devel
126+
127+-----------------------------------------------------------------------
128+0.1.3-devel (2010-01-28)
129+-----------------------------------------------------------------------
130+Highlights:
131+o Important memory leak fixed when closing cursors.
132+o Warnings can now be raised as exceptions.
133+o Fixing unicode usage and broken error message when MySQL chops them
134+o Client flags can now be set correctly when connecting
135+o Conversion fixes for BIT/YEARSET and Python to DATE/DATETIME
136+o Adding MySQL Client Errors and raising better exceptions based on errno.
137+
138+Details:
139+201: Geert Vanderkelen 2010-01-28 {0.1.3-devel} Using weak references
140+200: Geert Vanderkelen 2010-01-28 Moving dict attributes of MySQLConverter to methods
141+199: Geert Vanderkelen 2010-01-27 Fixing memory leak when opening cursors
142+198: Geert Vanderkelen 2010-01-26 Exception raised in protocol module using errors.get_mysql_exception
143+197: Geert Vanderkelen 2010-01-26 Fixing mysql.Error and simplying
144+196: Geert Vanderkelen 2010-01-25 Adding MySQL server errors and better exceptions (part 1)
145+195: Geert Vanderkelen 2010-01-25 Fixing rowcount in Cursor executemany() with no-result sets
146+194: Geert Vanderkelen 2010-01-25 Using MySQL Client Error messages when connecting
147+193: Geert Vanderkelen 2010-01-25 Implementing MySQL Client Errors
148+192: Geert Vanderkelen 2010-01-23 Simplying the cursor.set_connection method raising correct Exception
149+191: Geert Vanderkelen 2010-01-23 Changing get_flags_info to get_bit_info in a new class
150+190: Geert Vanderkelen 2010-01-22 Implementing Raise-On-Warnings
151+189: Geert Vanderkelen 2010-01-22 Fixed the conversion of binary fields
152+188: Geert Vanderkelen 2010-01-22 Removing sys.path change
153+187: Geert Vanderkelen 2010-01-22 Adding method to retrieve names given FieldFlag bitvalues
154+186: Geert Vanderkelen 2010-01-22 Fixing _constants get_desc/get_info methods
155+185: Geert Vanderkelen 2010-01-22 Adding missing check for BIT-field in to_python method
156+184: Geert Vanderkelen 2010-01-22 Fixing buffered MySQL cursor & handling unread results
157+183: Geert Vanderkelen 2010-01-20 Change in convesion of SET data type to Python set
158+182: Geert Vanderkelen 2010-01-20 Adding tests for MySQL data types (numeric and temporal)
159+181: Geert Vanderkelen 2010-01-19 Fixing Python to MySQL DATE/DATETIME conversions and throwing exceptions
160+180: Geert Vanderkelen 2010-01-17 Removing fields and nrflds attributes from MySQLCursor
161+179: Geert Vanderkelen 2010-01-15 Fixing MySQL BIT column conversion to Python
162+178: Geert Vanderkelen 2010-01-14 Adding conversion for MySQL's BIT data type
163+177: Geert Vanderkelen 2010-01-14 Updating inserts.py example so it commits
164+176: Geert Vanderkelen 2010-01-14 Adding conversion for MySQL's YEAR data type
165+175: Geert Vanderkelen 2009-12-31 Fix in unittests for comparing results from MySQL and what is expected
166+174: Geert Vanderkelen 2009-12-31 Fix for setting client flags when connecting
167+173: Geert Vanderkelen 2009-12-23 [merge] Merging from 0.1.2-devel release
168+172: Geert Vanderkelen 2009-12-23 Fix for broken unicode characters when MySQL trimed the errmsg
169+171: Geert Vanderkelen 2009-12-23 Fixing unicode usage for both Python 2.4+ and 3.1
170+
171+-----------------------------------------------------------------------
172+0.1.2-devel (2009-12-23)
173+-----------------------------------------------------------------------
174+o Fixing unicode usage for both Python 2.4+ and 3.1
175+ * Setting 'use_unicode' at connection time is now working.
176+ * conversion.py: removing regular expression for quoting backslashes.
177+ * Adding test case for bug lp:499410
178+
179+ Py3k specific:
180+ * Strings from MySQL are decoded to the given character when use_unicode
181+ is false
182+ * The statement is encoded just before sending it to the MySQL server.
183+ Internally, all is done in unicode.
184+ * In conversion.py: removing _unicode_to_mysql, adding _bytes_to_mysql
185+ * MySQLCursor.__unicode__ is obsolete and replaced with __str__
186+ * Removing tests for which the methods were deleted.
187+
188+o Fix setting character set at connection
189+
190+ * mysql.connector.Connect(charset='latin1') now works as expected
191+ * Default character set is (still) UTF-8.
192+ * SET NAMES is only used when changing character set after connecting.
193+ Use MySQL.set_charset(charsetname) to change.
194+ * Test case added for bug report; fixing test case in test_protocol.py
195+ to reflect the new default character set 'utf-8'.
196+
197+-----------------------------------------------------------------------
198+0.1.1-devel (2009-12-21)
199+-----------------------------------------------------------------------
200+o Added Python v3.1 support
201+ * The subdirectory/module py3k/ contains Connector/Python compatible
202+ with Python v3.1.1.
203+ * setup.py will install the correct Connector/Python distribution
204+ depending on the Python version.
205+ * Test cases which were running against Python v2.4+ are also working
206+ under Python v3.1
207+ * Examples found in py3k/examples should work with Python v3.1
208+ * The code will not check whether the Python version is supported.
209+
210+o Misc.
211+ * Using divmod() in MySQLConverter._timedelta_to_mysql()
212+ * Avoiding imports and the use of isinstance() by putting code in
213+ exceptions.
214+ * Stop using types module.
215+
216+
217+>>>>>>> MERGE-SOURCE
218
219=== modified file 'README'
220--- README 2010-05-21 13:52:17 +0000
221+++ README 2010-05-28 13:28:30 +0000
222@@ -1,7 +1,11 @@
223
224 MySQL Connector/Python MySQL driver written in Python
225 ==============================================================================
226+<<<<<<< TREE
227 Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
228+=======
229+Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
230+>>>>>>> MERGE-SOURCE
231 Use is subject to license terms. (See COPYING)
232
233 MySQL Connector/Python is implementing the MySQL Client/Server protocol
234
235=== modified file 'make_release.py'
236--- make_release.py 2010-05-21 13:52:17 +0000
237+++ make_release.py 2010-05-28 13:28:30 +0000
238@@ -1,7 +1,11 @@
239 #!/usr/bin/env python
240 # -*- coding: utf-8 -*-
241 # MySQL Connector/Python - MySQL driver written in Python.
242+<<<<<<< TREE
243 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
244+=======
245+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
246+>>>>>>> MERGE-SOURCE
247 # Use is subject to license terms. (See COPYING)
248
249 # This program is free software; you can redistribute it and/or modify
250
251=== modified file 'python2/examples/client.py' (properties changed: +x to -x)
252--- python2/examples/client.py 2010-05-21 13:52:17 +0000
253+++ python2/examples/client.py 2010-05-28 13:28:30 +0000
254@@ -1,7 +1,11 @@
255 #!/usr/bin/env python
256 # -*- coding: utf-8 -*-
257 # MySQL Connector/Python - MySQL driver written in Python.
258+<<<<<<< TREE
259 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
260+=======
261+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
262+>>>>>>> MERGE-SOURCE
263 # Use is subject to license terms. (See COPYING)
264
265 # This program is free software; you can redistribute it and/or modify
266
267=== modified file 'python2/mysql/connector/__init__.py'
268--- python2/mysql/connector/__init__.py 2009-12-31 10:34:36 +0000
269+++ python2/mysql/connector/__init__.py 2010-05-28 13:28:30 +0000
270@@ -1,5 +1,5 @@
271 # MySQL Connector/Python - MySQL driver written in Python.
272-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
273+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
274 # Use is subject to license terms. (See COPYING)
275
276 # This program is free software; you can redistribute it and/or modify
277
278=== modified file 'python2/mysql/connector/_version.py'
279--- python2/mysql/connector/_version.py 2010-05-21 09:32:25 +0000
280+++ python2/mysql/connector/_version.py 2010-05-28 13:28:30 +0000
281@@ -1,5 +1,9 @@
282 # MySQL Connector/Python - MySQL driver written in Python.
283+<<<<<<< TREE
284 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
285+=======
286+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
287+>>>>>>> MERGE-SOURCE
288 # Use is subject to license terms. (See COPYING)
289
290 # This program is free software; you can redistribute it and/or modify
291
292=== modified file 'python2/mysql/connector/connection.py'
293--- python2/mysql/connector/connection.py 2010-05-23 12:16:35 +0000
294+++ python2/mysql/connector/connection.py 2010-05-28 13:28:30 +0000
295@@ -1,5 +1,9 @@
296 # MySQL Connector/Python - MySQL driver written in Python.
297+<<<<<<< TREE
298 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
299+=======
300+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
301+>>>>>>> MERGE-SOURCE
302 # Use is subject to license terms. (See COPYING)
303
304 # This program is free software; you can redistribute it and/or modify
305@@ -88,14 +92,14 @@
306 if pktnr == -1 and totalsize > 4:
307 pktsize = utils.intread(buf[0:3])
308 pktnr = utils.intread(buf[3])
309- if pktnr > -1 and totalsize >= pktsize:
310+ if pktnr > -1 and totalsize >= pktsize+4:
311 size = pktsize+4
312 self.buffer.append(buf[0:size])
313 buf = buf[size:]
314 pktnr = -1
315 if len(buf) == 0:
316 break
317- elif len(buf) < pktsize:
318+ elif len(buf) < pktsize+4:
319 buf += self.sock.recv(self.recvsize, self.socket_flags)
320 except socket.error, e:
321 raise errors.InterfaceError(errno=2055,
322
323=== modified file 'python2/mysql/connector/constants.py'
324--- python2/mysql/connector/constants.py 2010-05-14 11:41:54 +0000
325+++ python2/mysql/connector/constants.py 2010-05-28 13:28:30 +0000
326@@ -1,5 +1,5 @@
327 # MySQL Connector/Python - MySQL driver written in Python.
328-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
329+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
330 # Use is subject to license terms. (See COPYING)
331
332 # This program is free software; you can redistribute it and/or modify
333
334=== modified file 'python2/mysql/connector/conversion.py'
335--- python2/mysql/connector/conversion.py 2010-05-13 07:01:07 +0000
336+++ python2/mysql/connector/conversion.py 2010-05-28 13:28:30 +0000
337@@ -1,5 +1,5 @@
338 # MySQL Connector/Python - MySQL driver written in Python.
339-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
340+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
341 # Use is subject to license terms. (See COPYING)
342
343 # This program is free software; you can redistribute it and/or modify
344@@ -413,4 +413,4 @@
345 return v
346
347 return self._STRING_to_python(v, dsc)
348-
349\ No newline at end of file
350+
351
352=== modified file 'python2/mysql/connector/cursor.py'
353--- python2/mysql/connector/cursor.py 2010-05-16 11:38:16 +0000
354+++ python2/mysql/connector/cursor.py 2010-05-28 13:28:30 +0000
355@@ -1,5 +1,5 @@
356 # MySQL Connector/Python - MySQL driver written in Python.
357-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
358+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
359 # Use is subject to license terms. (See COPYING)
360
361 # This program is free software; you can redistribute it and/or modify
362@@ -605,4 +605,4 @@
363 return res
364
365
366-
367\ No newline at end of file
368+
369
370=== modified file 'python2/mysql/connector/dbapi.py'
371--- python2/mysql/connector/dbapi.py 2009-11-26 16:14:48 +0000
372+++ python2/mysql/connector/dbapi.py 2010-05-28 13:28:30 +0000
373@@ -1,5 +1,5 @@
374 # MySQL Connector/Python - MySQL driver written in Python.
375-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
376+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
377 # Use is subject to license terms. (See COPYING)
378
379 # This program is free software; you can redistribute it and/or modify
380
381=== modified file 'python2/mysql/connector/errors.py'
382--- python2/mysql/connector/errors.py 2010-05-23 12:16:35 +0000
383+++ python2/mysql/connector/errors.py 2010-05-28 13:28:30 +0000
384@@ -1,5 +1,9 @@
385 # MySQL Connector/Python - MySQL driver written in Python.
386+<<<<<<< TREE
387 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
388+=======
389+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
390+>>>>>>> MERGE-SOURCE
391 # Use is subject to license terms. (See COPYING)
392
393 # This program is free software; you can redistribute it and/or modify
394
395=== modified file 'python2/mysql/connector/mysql.py'
396--- python2/mysql/connector/mysql.py 2010-05-20 09:43:47 +0000
397+++ python2/mysql/connector/mysql.py 2010-05-28 13:28:30 +0000
398@@ -1,5 +1,5 @@
399 # MySQL Connector/Python - MySQL driver written in Python.
400-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
401+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
402 # Use is subject to license terms. (See COPYING)
403
404 # This program is free software; you can redistribute it and/or modify
405
406=== modified file 'python2/mysql/connector/protocol.py'
407--- python2/mysql/connector/protocol.py 2010-05-23 11:15:53 +0000
408+++ python2/mysql/connector/protocol.py 2010-05-28 13:28:30 +0000
409@@ -1,5 +1,5 @@
410 # MySQL Connector/Python - MySQL driver written in Python.
411-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
412+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
413 # Use is subject to license terms. (See COPYING)
414
415 # This program is free software; you can redistribute it and/or modify
416
417=== modified file 'python2/mysql/connector/utils.py'
418--- python2/mysql/connector/utils.py 2010-05-05 13:27:52 +0000
419+++ python2/mysql/connector/utils.py 2010-05-28 13:28:30 +0000
420@@ -1,5 +1,5 @@
421 # MySQL Connector/Python - MySQL driver written in Python.
422-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
423+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
424 # Use is subject to license terms. (See COPYING)
425
426 # This program is free software; you can redistribute it and/or modify
427
428=== modified file 'python2/tests/__init__.py'
429--- python2/tests/__init__.py 2010-01-20 13:01:19 +0000
430+++ python2/tests/__init__.py 2010-05-28 13:28:30 +0000
431@@ -1,5 +1,5 @@
432 # MySQL Connector/Python - MySQL driver written in Python.
433-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
434+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
435 # Use is subject to license terms. (See COPYING)
436
437 # This program is free software; you can redistribute it and/or modify
438@@ -126,4 +126,4 @@
439
440 def printmsg(msg=None):
441 if msg is not None:
442- print(msg)
443\ No newline at end of file
444+ print(msg)
445
446=== modified file 'python2/tests/test_bugs.py'
447--- python2/tests/test_bugs.py 2010-05-23 10:34:51 +0000
448+++ python2/tests/test_bugs.py 2010-05-28 13:28:30 +0000
449@@ -1,5 +1,5 @@
450 # MySQL Connector/Python - MySQL driver written in Python.
451-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
452+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
453 # Use is subject to license terms. (See COPYING)
454
455 # This program is free software; you can redistribute it and/or modify
456@@ -505,3 +505,45 @@
457 self.assertEqual(exp,self.c.fetchall())
458 self.assertEqual(None,self.c.next_resultset())
459
460+class Bug551533and586003(tests.MySQLConnectorTests):
461+ """lp: 551533, 586003: impossible to retrive big result sets"""
462+
463+ def setUp(self):
464+ config = self.getMySQLConfig()
465+ config['connection_timeout'] = 2
466+ self.db = mysql.MySQL(**config)
467+ self.c = self.db.cursor()
468+
469+ self.tbl = 'Bug551533'
470+ self.c.execute("DROP TABLE IF EXISTS %s" % (self.tbl))
471+ self.c.execute("""CREATE TABLE %s (
472+ id INT AUTO_INCREMENT KEY,
473+ c1 VARCHAR(100) DEFAULT 'abcabcabcabcabcabcabcabcabcabc'
474+ )""" % (self.tbl))
475+
476+ def tearDown(self):
477+ try:
478+ self.c = db.cursor("DROP TABLE IF EXISTS %s" % (self.tbl))
479+ self.c.close()
480+ except:
481+ pass
482+ self.db.close()
483+
484+ def test_select(self):
485+ """lp: 551533, 586003: impossible to retrive big result sets"""
486+
487+ insert = "INSERT INTO %s VALUES ()" % (self.tbl)
488+ exp = 20000
489+ i = exp
490+ while i > 0:
491+ self.c.execute(insert)
492+ i -= 1
493+
494+ self.c.execute('SELECT * FROM %s LIMIT 20000' % (self.tbl))
495+ try:
496+ rows = self.c.fetchall()
497+ except:
498+ self.fail("Failed retrieving big result set")
499+ else:
500+ self.assertEqual(exp, self.c.rowcount)
501+
502
503=== modified file 'python2/tests/test_constants.py'
504--- python2/tests/test_constants.py 2010-05-14 11:41:54 +0000
505+++ python2/tests/test_constants.py 2010-05-28 13:28:30 +0000
506@@ -1,5 +1,5 @@
507 # MySQL Connector/Python - MySQL driver written in Python.
508-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
509+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
510 # Use is subject to license terms. (See COPYING)
511
512 # This program is free software; you can redistribute it and/or modify
513@@ -284,4 +284,4 @@
514
515 self.assertEqual(exp, constants.CharacterSet.get_supported())
516
517-
518\ No newline at end of file
519+
520
521=== modified file 'python2/tests/test_conversion.py'
522--- python2/tests/test_conversion.py 2010-01-22 14:47:52 +0000
523+++ python2/tests/test_conversion.py 2010-05-28 13:28:30 +0000
524@@ -1,6 +1,6 @@
525 # -*- coding: utf-8 -*-
526 # MySQL Connector/Python - MySQL driver written in Python.
527-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
528+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
529 # Use is subject to license terms. (See COPYING)
530
531 # This program is free software; you can redistribute it and/or modify
532@@ -429,4 +429,4 @@
533 res = self.cnv._BLOB_to_python(data,desc)
534
535 self.assertEqual(data,res)
536-
537\ No newline at end of file
538+
539
540=== modified file 'python2/tests/test_cursor.py'
541--- python2/tests/test_cursor.py 2010-05-05 14:08:47 +0000
542+++ python2/tests/test_cursor.py 2010-05-28 13:28:30 +0000
543@@ -1,5 +1,5 @@
544 # MySQL Connector/Python - MySQL driver written in Python.
545-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
546+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
547 # Use is subject to license terms. (See COPYING)
548
549 # This program is free software; you can redistribute it and/or modify
550@@ -821,4 +821,4 @@
551 pass
552 else:
553 self.fail("Did not get exception while raising warnings.")
554-
555\ No newline at end of file
556+
557
558=== modified file 'python2/tests/test_examples.py'
559--- python2/tests/test_examples.py 2010-05-05 14:08:47 +0000
560+++ python2/tests/test_examples.py 2010-05-28 13:28:30 +0000
561@@ -1,5 +1,5 @@
562 # MySQL Connector/Python - MySQL driver written in Python.
563-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
564+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
565 # Use is subject to license terms. (See COPYING)
566
567 # This program is free software; you can redistribute it and/or modify
568@@ -99,4 +99,4 @@
569 import examples.multi_resultsets as exp
570 except StandardError, e:
571 self.fail(e)
572- self._exec_main(exp)
573\ No newline at end of file
574+ self._exec_main(exp)
575
576=== modified file 'python2/tests/test_mysql_datatypes.py'
577--- python2/tests/test_mysql_datatypes.py 2010-04-24 16:53:06 +0000
578+++ python2/tests/test_mysql_datatypes.py 2010-05-28 13:28:30 +0000
579@@ -1,5 +1,5 @@
580 # MySQL Connector/Python - MySQL driver written in Python.
581-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
582+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
583 # Use is subject to license terms. (See COPYING)
584
585 # This program is free software; you can redistribute it and/or modify
586@@ -328,4 +328,4 @@
587 compare("%s (data[%d])" % (col,j),data[j][i],rows[j][i])
588
589 c.close()
590-
591\ No newline at end of file
592+
593
594=== modified file 'python2/tests/test_pep249.py'
595--- python2/tests/test_pep249.py 2010-04-24 16:53:06 +0000
596+++ python2/tests/test_pep249.py 2010-05-28 13:28:30 +0000
597@@ -1,5 +1,5 @@
598 # MySQL Connector/Python - MySQL driver written in Python.
599-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
600+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
601 # Use is subject to license terms. (See COPYING)
602
603 # This program is free software; you can redistribute it and/or modify
604
605=== modified file 'python2/tests/test_protocol.py'
606--- python2/tests/test_protocol.py 2010-05-23 11:15:53 +0000
607+++ python2/tests/test_protocol.py 2010-05-28 13:28:30 +0000
608@@ -1,5 +1,5 @@
609 # MySQL Connector/Python - MySQL driver written in Python.
610-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
611+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
612 # Use is subject to license terms. (See COPYING)
613
614 # This program is free software; you can redistribute it and/or modify
615
616=== modified file 'python2/tests/test_utils.py'
617--- python2/tests/test_utils.py 2010-02-18 16:33:28 +0000
618+++ python2/tests/test_utils.py 2010-05-28 13:28:30 +0000
619@@ -1,5 +1,5 @@
620 # MySQL Connector/Python - MySQL driver written in Python.
621-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
622+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
623 # Use is subject to license terms. (See COPYING)
624
625 # This program is free software; you can redistribute it and/or modify
626
627=== modified file 'python3/mysql/connector/__init__.py'
628--- python3/mysql/connector/__init__.py 2009-12-31 10:34:36 +0000
629+++ python3/mysql/connector/__init__.py 2010-05-28 13:28:30 +0000
630@@ -1,5 +1,5 @@
631 # MySQL Connector/Python - MySQL driver written in Python.
632-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
633+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
634 # Use is subject to license terms. (See COPYING)
635
636 # This program is free software; you can redistribute it and/or modify
637
638=== modified file 'python3/mysql/connector/_version.py'
639--- python3/mysql/connector/_version.py 2010-05-21 09:32:25 +0000
640+++ python3/mysql/connector/_version.py 2010-05-28 13:28:30 +0000
641@@ -1,5 +1,9 @@
642 # MySQL Connector/Python - MySQL driver written in Python.
643+<<<<<<< TREE
644 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
645+=======
646+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
647+>>>>>>> MERGE-SOURCE
648 # Use is subject to license terms. (See COPYING)
649
650 # This program is free software; you can redistribute it and/or modify
651
652=== modified file 'python3/mysql/connector/connection.py'
653--- python3/mysql/connector/connection.py 2010-05-23 12:16:35 +0000
654+++ python3/mysql/connector/connection.py 2010-05-28 13:28:30 +0000
655@@ -1,5 +1,9 @@
656 # MySQL Connector/Python - MySQL driver written in Python.
657+<<<<<<< TREE
658 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
659+=======
660+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
661+>>>>>>> MERGE-SOURCE
662 # Use is subject to license terms. (See COPYING)
663
664 # This program is free software; you can redistribute it and/or modify
665@@ -87,14 +91,14 @@
666 if pktnr == -1 and totalsize > 4:
667 pktsize = utils.intread(buf[0:3])
668 pktnr = utils.intread(buf[3])
669- if pktnr > -1 and totalsize >= pktsize:
670+ if pktnr > -1 and totalsize >= pktsize+4:
671 size = pktsize+4
672 self.buffer.append(buf[0:size])
673 buf = buf[size:]
674 pktnr = -1
675 if len(buf) == 0:
676 break
677- elif len(buf) < pktsize:
678+ elif len(buf) < pktsize+4:
679 buf += self.sock.recv(self.recvsize, self.socket_flags)
680 except socket.error as e:
681 raise errors.InterfaceError(errno=2055,
682
683=== modified file 'python3/mysql/connector/constants.py'
684--- python3/mysql/connector/constants.py 2010-05-14 11:41:54 +0000
685+++ python3/mysql/connector/constants.py 2010-05-28 13:28:30 +0000
686@@ -1,5 +1,5 @@
687 # MySQL Connector/Python - MySQL driver written in Python.
688-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
689+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
690 # Use is subject to license terms. (See COPYING)
691
692 # This program is free software; you can redistribute it and/or modify
693
694=== modified file 'python3/mysql/connector/conversion.py'
695--- python3/mysql/connector/conversion.py 2010-05-13 07:01:07 +0000
696+++ python3/mysql/connector/conversion.py 2010-05-28 13:28:30 +0000
697@@ -1,5 +1,5 @@
698 # MySQL Connector/Python - MySQL driver written in Python.
699-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
700+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
701 # Use is subject to license terms. (See COPYING)
702
703 # This program is free software; you can redistribute it and/or modify
704
705=== modified file 'python3/mysql/connector/cursor.py'
706--- python3/mysql/connector/cursor.py 2010-05-16 11:27:39 +0000
707+++ python3/mysql/connector/cursor.py 2010-05-28 13:28:30 +0000
708@@ -1,5 +1,5 @@
709 # MySQL Connector/Python - MySQL driver written in Python.
710-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
711+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
712 # Use is subject to license terms. (See COPYING)
713
714 # This program is free software; you can redistribute it and/or modify
715
716=== modified file 'python3/mysql/connector/dbapi.py'
717--- python3/mysql/connector/dbapi.py 2009-12-21 15:53:20 +0000
718+++ python3/mysql/connector/dbapi.py 2010-05-28 13:28:30 +0000
719@@ -1,5 +1,5 @@
720 # MySQL Connector/Python - MySQL driver written in Python.
721-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
722+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
723 # Use is subject to license terms. (See COPYING)
724
725 # This program is free software; you can redistribute it and/or modify
726
727=== modified file 'python3/mysql/connector/errors.py'
728--- python3/mysql/connector/errors.py 2010-05-23 12:16:35 +0000
729+++ python3/mysql/connector/errors.py 2010-05-28 13:28:30 +0000
730@@ -1,5 +1,5 @@
731 # MySQL Connector/Python - MySQL driver written in Python.
732-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
733+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
734 # Use is subject to license terms. (See COPYING)
735
736 # This program is free software; you can redistribute it and/or modify
737
738=== modified file 'python3/mysql/connector/mysql.py'
739--- python3/mysql/connector/mysql.py 2010-05-20 09:43:47 +0000
740+++ python3/mysql/connector/mysql.py 2010-05-28 13:28:30 +0000
741@@ -1,5 +1,5 @@
742 # MySQL Connector/Python - MySQL driver written in Python.
743-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
744+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
745 # Use is subject to license terms. (See COPYING)
746
747 # This program is free software; you can redistribute it and/or modify
748
749=== modified file 'python3/mysql/connector/protocol.py'
750--- python3/mysql/connector/protocol.py 2010-05-23 11:15:53 +0000
751+++ python3/mysql/connector/protocol.py 2010-05-28 13:28:30 +0000
752@@ -1,5 +1,5 @@
753 # MySQL Connector/Python - MySQL driver written in Python.
754-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
755+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
756 # Use is subject to license terms. (See COPYING)
757
758 # This program is free software; you can redistribute it and/or modify
759
760=== modified file 'python3/mysql/connector/utils.py'
761--- python3/mysql/connector/utils.py 2010-05-05 13:27:52 +0000
762+++ python3/mysql/connector/utils.py 2010-05-28 13:28:30 +0000
763@@ -1,5 +1,5 @@
764 # MySQL Connector/Python - MySQL driver written in Python.
765-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
766+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
767 # Use is subject to license terms. (See COPYING)
768
769 # This program is free software; you can redistribute it and/or modify
770
771=== modified file 'python3/tests/__init__.py'
772--- python3/tests/__init__.py 2010-01-20 13:01:19 +0000
773+++ python3/tests/__init__.py 2010-05-28 13:28:30 +0000
774@@ -1,5 +1,5 @@
775 # MySQL Connector/Python - MySQL driver written in Python.
776-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
777+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
778 # Use is subject to license terms. (See COPYING)
779
780 # This program is free software; you can redistribute it and/or modify
781
782=== modified file 'python3/tests/test_bugs.py'
783--- python3/tests/test_bugs.py 2010-05-23 10:34:51 +0000
784+++ python3/tests/test_bugs.py 2010-05-28 13:28:30 +0000
785@@ -1,5 +1,5 @@
786 # MySQL Connector/Python - MySQL driver written in Python.
787-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
788+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
789 # Use is subject to license terms. (See COPYING)
790
791 # This program is free software; you can redistribute it and/or modify
792@@ -520,3 +520,45 @@
793 exp = [(1, 10), (2, 20)]
794 self.assertEqual(exp,self.c.fetchall())
795 self.assertEqual(None,self.c.next_resultset())
796+
797+class Bug551533and586003(tests.MySQLConnectorTests):
798+ """lp: 551533, 586003: impossible to retrive big result sets"""
799+
800+ def setUp(self):
801+ config = self.getMySQLConfig()
802+ config['connection_timeout'] = 2
803+ self.db = mysql.MySQL(**config)
804+ self.c = self.db.cursor()
805+
806+ self.tbl = 'Bug551533'
807+ self.c.execute("DROP TABLE IF EXISTS %s" % (self.tbl))
808+ self.c.execute("""CREATE TABLE %s (
809+ id INT AUTO_INCREMENT KEY,
810+ c1 VARCHAR(100) DEFAULT 'abcabcabcabcabcabcabcabcabcabc'
811+ )""" % (self.tbl))
812+
813+ def tearDown(self):
814+ try:
815+ self.c = db.cursor("DROP TABLE IF EXISTS %s" % (self.tbl))
816+ self.c.close()
817+ except:
818+ pass
819+ self.db.close()
820+
821+ def test_select(self):
822+ """lp: 551533, 586003: impossible to retrive big result sets"""
823+
824+ insert = "INSERT INTO %s VALUES ()" % (self.tbl)
825+ exp = 20000
826+ i = exp
827+ while i > 0:
828+ self.c.execute(insert)
829+ i -= 1
830+
831+ self.c.execute('SELECT * FROM %s LIMIT 20000' % (self.tbl))
832+ try:
833+ rows = self.c.fetchall()
834+ except:
835+ self.fail("Failed retrieving big result set")
836+ else:
837+ self.assertEqual(exp, self.c.rowcount)
838
839=== modified file 'python3/tests/test_constants.py'
840--- python3/tests/test_constants.py 2010-05-14 11:41:54 +0000
841+++ python3/tests/test_constants.py 2010-05-28 13:28:30 +0000
842@@ -1,5 +1,5 @@
843 # MySQL Connector/Python - MySQL driver written in Python.
844-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
845+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
846 # Use is subject to license terms. (See COPYING)
847
848 # This program is free software; you can redistribute it and/or modify
849@@ -283,4 +283,4 @@
850
851 self.assertEqual(exp, constants.CharacterSet.get_supported())
852
853-
854\ No newline at end of file
855+
856
857=== modified file 'python3/tests/test_conversion.py'
858--- python3/tests/test_conversion.py 2010-01-22 14:47:52 +0000
859+++ python3/tests/test_conversion.py 2010-05-28 13:28:30 +0000
860@@ -1,6 +1,6 @@
861 # -*- coding: utf-8 -*-
862 # MySQL Connector/Python - MySQL driver written in Python.
863-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
864+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
865 # Use is subject to license terms. (See COPYING)
866
867 # This program is free software; you can redistribute it and/or modify
868@@ -426,4 +426,4 @@
869 desc = ('foo', constants.FieldType.BLOB, 2, 3, 4, 5, 6, constants.FieldFlag.BINARY)
870 res = self.cnv._BLOB_to_python(data,desc)
871
872- self.assertEqual(data,res)
873\ No newline at end of file
874+ self.assertEqual(data,res)
875
876=== modified file 'python3/tests/test_cursor.py'
877--- python3/tests/test_cursor.py 2010-05-05 14:08:47 +0000
878+++ python3/tests/test_cursor.py 2010-05-28 13:28:30 +0000
879@@ -1,5 +1,5 @@
880 # MySQL Connector/Python - MySQL driver written in Python.
881-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
882+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
883 # Use is subject to license terms. (See COPYING)
884
885 # This program is free software; you can redistribute it and/or modify
886
887=== modified file 'python3/tests/test_examples.py'
888--- python3/tests/test_examples.py 2010-05-21 13:52:17 +0000
889+++ python3/tests/test_examples.py 2010-05-28 13:28:30 +0000
890@@ -1,5 +1,5 @@
891 # MySQL Connector/Python - MySQL driver written in Python.
892-# Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
893+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
894 # Use is subject to license terms. (See COPYING)
895
896 # This program is free software; you can redistribute it and/or modify
897@@ -99,4 +99,4 @@
898 except StandardError as e:
899 self.fail(e)
900 self._exec_main(exp)
901-
902\ No newline at end of file
903+
904
905=== modified file 'python3/tests/test_mysql_datatypes.py'
906--- python3/tests/test_mysql_datatypes.py 2010-04-24 16:53:06 +0000
907+++ python3/tests/test_mysql_datatypes.py 2010-05-28 13:28:30 +0000
908@@ -1,5 +1,5 @@
909 # MySQL Connector/Python - MySQL driver written in Python.
910-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
911+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
912 # Use is subject to license terms. (See COPYING)
913
914 # This program is free software; you can redistribute it and/or modify
915
916=== modified file 'python3/tests/test_pep249.py'
917--- python3/tests/test_pep249.py 2010-04-24 16:53:06 +0000
918+++ python3/tests/test_pep249.py 2010-05-28 13:28:30 +0000
919@@ -1,5 +1,5 @@
920 # MySQL Connector/Python - MySQL driver written in Python.
921-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
922+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
923 # Use is subject to license terms. (See COPYING)
924
925 # This program is free software; you can redistribute it and/or modify
926
927=== modified file 'python3/tests/test_protocol.py'
928--- python3/tests/test_protocol.py 2010-05-23 11:15:53 +0000
929+++ python3/tests/test_protocol.py 2010-05-28 13:28:30 +0000
930@@ -1,5 +1,5 @@
931 # MySQL Connector/Python - MySQL driver written in Python.
932-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
933+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
934 # Use is subject to license terms. (See COPYING)
935
936 # This program is free software; you can redistribute it and/or modify
937
938=== modified file 'python3/tests/test_utils.py'
939--- python3/tests/test_utils.py 2010-02-18 16:33:28 +0000
940+++ python3/tests/test_utils.py 2010-05-28 13:28:30 +0000
941@@ -1,5 +1,5 @@
942 # MySQL Connector/Python - MySQL driver written in Python.
943-# Copyright 2009 Sun Microsystems, Inc. All rights reserved
944+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
945 # Use is subject to license terms. (See COPYING)
946
947 # This program is free software; you can redistribute it and/or modify
948
949=== modified file 'setup.py' (properties changed: +x to -x)
950--- setup.py 2010-05-21 13:52:17 +0000
951+++ setup.py 2010-05-28 13:28:30 +0000
952@@ -1,7 +1,11 @@
953 #!/usr/bin/env python
954 # -*- coding: utf-8 -*-
955 # MySQL Connector/Python - MySQL driver written in Python.
956+<<<<<<< TREE
957 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
958+=======
959+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
960+>>>>>>> MERGE-SOURCE
961 # Use is subject to license terms. (See COPYING)
962
963 # This program is free software; you can redistribute it and/or modify
964
965=== modified file 'unittests.py' (properties changed: +x to -x)
966--- unittests.py 2010-05-21 13:52:17 +0000
967+++ unittests.py 2010-05-28 13:28:30 +0000
968@@ -1,7 +1,11 @@
969 #!/usr/bin/env python
970 # -*- coding: utf-8 -*-
971 # MySQL Connector/Python - MySQL driver written in Python.
972+<<<<<<< TREE
973 # Copryright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
974+=======
975+# Copyright (c) 2009,2010, Oracle and/or its affiliates. All rights reserved.
976+>>>>>>> MERGE-SOURCE
977 # Use is subject to license terms. (See COPYING)
978
979 # This program is free software; you can redistribute it and/or modify

Subscribers

People subscribed via source and target branches