Commit Graph

87958 Commits

Author SHA1 Message Date
Martyn Dale
30d9af4789 Fix performance issue with many databases (when only_db is defined) 2013-11-21 13:00:43 -05:00
Marc Delisle
5945c9d4b9 ChangeLog entry for fix of bug #4153 2013-11-21 07:17:25 -05:00
Marc Delisle
ca053deb24 Merge pull request #765 from slimtim/bug_4153
When importing a SQL file convert \r line-endings to \n
2013-11-21 04:16:11 -08:00
Marc Delisle
088b0f7818 Fix coding style 2013-11-21 06:51:52 -05:00
slimtim
f604be8bd2 When importing a SQL file convert carriage return (\r) line-endings to line feeds (\n) otherwise all queries in the file may not get executed on some platforms (e.g. Linux) 2013-11-20 21:44:48 -05:00
Marc Delisle
eeaab14137 Translated using Weblate (French)
Currently translated at 100.0% (2741 of 2741)
2013-11-21 01:59:48 +01:00
Marc Delisle
a50cc18cf6 ChangeLog entry for fix of bug #4133 2013-11-20 19:55:49 -05:00
Marc Delisle
240d37e3f1 Merge pull request #763 from slimtim/bug_4133
When importing a CSV file force a trailing new line at EOF (bug #4133)
2013-11-20 16:52:52 -08:00
Weblate
0ce072a353 Merge remote-tracking branch 'origin/master' 2013-11-21 01:36:01 +01:00
Han Velthuis
7d58b07218 Translated using Weblate (Dutch)
Currently translated at 100.0% (2741 of 2741)
2013-11-21 01:35:53 +01:00
Marc Delisle
08cfb24250 Merge pull request #764 from ptarjan/master
Make unit tests friendlier to running independently
2013-11-20 16:35:30 -08:00
ptarjan
840f7b1215 Make unit tests friendlier to running independently 2013-11-20 14:43:55 -08:00
slimtim
2e7c024df6 When importing a CSV file force a trailing new line at EOF to prevent parsing problems. (bug #4133) 2013-11-20 16:43:01 -05:00
Weblate
7a6c258a50 Merge remote-tracking branch 'origin/master' 2013-11-20 13:58:36 +01:00
Han Velthuis
04577b7f97 Translated using Weblate (Dutch)
Currently translated at 100.0% (2741 of 2741)
2013-11-20 13:58:32 +01:00
Marc Delisle
034886e620 Revert 32b8a06a53 2013-11-20 07:58:01 -05:00
Marc Delisle
f06bbe9902 Revert "bug fix #4096"
This reverts commit e72342f10a.
2013-11-20 07:47:09 -05:00
Marc Delisle
dfe32aacb4 Update po files 2013-11-20 06:16:17 -05:00
Marc Delisle
ebc5e9a5c7 We do not need a separate ErrorReporting directive 2013-11-20 06:14:53 -05:00
Marc Delisle
ea6b5818ae An error can happen here, when error_report.js is not loaded (if error reporting is deactivated) 2013-11-20 05:56:38 -05:00
Michal Čihař
b06e2e06ee Always define pma_config_loading (issue #760) 2013-11-20 10:28:32 +01:00
Weblate
0a06521abf Merge remote-tracking branch 'origin/master' 2013-11-20 10:25:58 +01:00
U2B3K ali
0f3a6e7ca3 Translated using Weblate (Uzbek)
Currently translated at 46.1% (1265 of 2743)
2013-11-20 10:25:52 +01:00
Michal Čihař
44c130c178 Merge remote-tracking branch 'origin/QA_4_0' 2013-11-20 10:25:25 +01:00
Marc Delisle
73da1e324b Fix merge conflicts 2013-11-19 13:00:29 -05:00
Weblate
96e410db97 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-11-19 18:56:37 +01:00
Gottlieb Gauche
bddda069a7 Translated using Weblate (Afrikaans)
Currently translated at 12.5% (329 of 2614)
2013-11-19 18:56:31 +01:00
Marc Delisle
7641abc832 Merge commit '66690fe' 2013-11-19 12:56:30 -05:00
Marc Delisle
9048df8eb6 bug #4083 row deleting isn't binlogs friendly 2013-11-19 12:55:56 -05:00
Marc Delisle
76a57d7611 Fix coding style 2013-11-19 07:22:26 -05:00
Marc Delisle
15bbe72ca2 Clarify the reason for having two directives (ErrorReporting and SendErrorReports) 2013-11-19 07:14:18 -05:00
Michal Čihař
7f89974e2d Merge remote-tracking branch 'weblate/master'
Conflicts:
	po/de.po
2013-11-19 11:42:13 +01:00
Ramona Hapke
33a0fefa48 Translated using Weblate (German)
Currently translated at 93.5% (2566 of 2743)
2013-11-19 11:36:15 +01:00
Michal Čihař
80ef99c0a4 Fix format string 2013-11-19 11:35:58 +01:00
Christian Nagelmeier
8254e5a3ac Translated using Weblate (German)
Currently translated at 93.5% (2566 of 2743)
2013-11-19 10:34:45 +01:00
Ramona Hapke
50aa7b1384 Translated using Weblate (German)
Currently translated at 93.5% (2566 of 2743)
2013-11-19 10:33:57 +01:00
Patrik Kernstock
2b33f4e29e Translated using Weblate (German)
Currently translated at 93.5% (2566 of 2743)
2013-11-19 10:33:27 +01:00
Christian Nagelmeier
da8e5e86fb Translated using Weblate (German)
Currently translated at 93.5% (2565 of 2743)
2013-11-19 10:32:32 +01:00
Weblate
6bf7ecbdd3 Merge remote-tracking branch 'origin/master' 2013-11-19 09:26:37 +01:00
Patrik Kernstock
96f7e10c37 Translated using Weblate (German)
Currently translated at 93.4% (2564 of 2743)
2013-11-19 09:26:32 +01:00
Gottlieb Gauche
b3795f64bd Translated using Weblate (Afrikaans)
Currently translated at 12.1% (332 of 2743)

Poligoon
2013-11-19 09:26:29 +01:00
Michal Čihař
8075bd0dd3 These tests can take longer, give them more time 2013-11-19 09:26:04 +01:00
Christian Nagelmeier
f5e0cb2c2f Translated using Weblate (German)
Currently translated at 93.4% (2562 of 2743)
2013-11-19 09:11:12 +01:00
Marc Delisle
3d9e591389 Merge pull request #759 from roccivic/4117
Fixes bug #4117
2013-11-18 14:19:19 -08:00
Rouslan Placella
0e7a724f84 Dropped unused function 2013-11-18 20:52:37 +00:00
Rouslan Placella
7c0a63a4a0 Fixed bug #4117 2013-11-18 20:52:37 +00:00
Domen
ef39376580 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2743 of 2743)
2013-11-18 20:39:27 +01:00
Panagiotis Papazoglou
655bfa1431 Translated using Weblate (Greek)
Currently translated at 100.0% (2743 of 2743)
2013-11-18 17:27:04 +01:00
Helder Santana
6a02dca749 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2743 of 2743)
2013-11-18 16:45:30 +01:00
Michal Čihař
a8bd9e5b9f Set Content-Type in request 2013-11-18 15:03:37 +01:00