Commit Graph

102734 Commits

Author SHA1 Message Date
Michal Čihař
8742209c63 Fix single quote export for servers in ANSI_QUOTES mode
It is possible to escape ' inside '' as both '' and \'. However using ''
is MySQL extension and does not work in ANSI mode. We need to generate
compatible exports in this case, so sticking with \' is safer.

Fixes #11721

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-07 15:33:37 +01:00
Weblate
39c97184e8 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-07 06:59:54 +01:00
Yong Kim
5f0c55da4a Translated using Weblate (Korean)
Currently translated at 77.9% (2503 of 3211 strings)

[CI skip]
2015-12-07 06:59:53 +01:00
Madhura Jayaratne
0375802fc0 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5
Conflicts:
	ChangeLog
2015-12-07 16:59:22 +11:00
Madhura Jayaratne
dade3fa2e4 Fix #11706 Database export template not saving compression option
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-07 16:56:18 +11:00
Marc Delisle
23a70525ae This was related to the previous SQL parser. If someone still needs it
to decode an old bug report, he/she can still get this script from
an older branch.

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-06 08:07:52 -05:00
Weblate
ca32b9f51a Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-04 12:14:58 +01:00
Burak Yavuz
5f02ec86f3 Translated using Weblate (Turkish)
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
2015-12-04 12:14:57 +01:00
Giovanni Sora
af95b43554 Translated using Weblate (Interlingua)
Currently translated at 72.5% (2329 of 3211 strings)

[CI skip]
2015-12-04 12:14:56 +01:00
Michal Čihař
17930c26df Properly report error on connecting
The $link can be false at this point and DBI backends handle this
correctly to get global error. This usually happens on connecting.

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-04 12:13:47 +01:00
Madhura Jayaratne
d33af6a721 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-12-02 10:36:12 +11:00
Madhura Jayaratne
fcc89aa203 Fix - exclude db name in SQL when relations are made between table in the same db
To prevent replication from breaking when replicating to a db with different name

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-02 10:35:49 +11:00
Weblate
e1081d1431 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-01 00:43:14 +01:00
Kristjan Räts
dc05a0e2a9 Translated using Weblate (Estonian)
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
2015-12-01 00:43:12 +01:00
Madhura Jayaratne
cb867b8d94 issue #11701 Show create procedure SQL
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-01 10:42:51 +11:00
Marc Delisle
7f9339105c ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-27 08:32:33 -05:00
Bert-Jan de Lange
bc89aabdf9 Fix for not being able to create users on Percona Server
Inspired by the patch 9bf88cbd32.patch

Signed-off-by: Bert-Jan de Lange <info@bert-jan.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-27 08:30:58 -05:00
Marc Delisle
25bd0b56e2 Fixes #11695 PMA_getDataForDeleteUsers() warning
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-26 11:55:01 -05:00
Deven Bansod
83672ac65c Changelog entry for #11691
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-11-26 19:43:21 +05:30
Deven Bansod
68555d3584 Merge pull request #11692 from devenbansod/fix_11691
Fixes #11691 : Query was empty on creating User in 4.5.2
2015-11-26 14:10:51 +05:30
Deven Bansod
8eb712579d Fixes #11693 : Flush privileges overusage - related to issue 11597
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-11-26 19:25:18 +05:30
Deven Bansod
31001963d2 Changelog entry for #11684
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-11-26 19:20:04 +05:30
Deven Bansod
0a4fd5d87b Fixes issue 11691
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-11-26 15:13:29 +05:30
Deven Bansod
fa36f00198 Merge pull request #11686 from devenbansod/fix_11684
Fix issue #11684
2015-11-26 08:56:05 +05:30
Weblate
060884139c Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-25 15:43:24 +01:00
Jader Teixeira
67b9ab471a Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.6% (2974 of 3211 strings)

[CI skip]
2015-11-25 15:43:23 +01:00
Marc Delisle
2217a47934 With this fix, the generated SQL still gives on-screen warnings on semicolons
but this will require a fix in the parser.

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-25 09:41:58 -05:00
Deven Bansod
d55abcd5ff Fix issue 11684
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-11-24 15:46:50 +05:30
Marc Delisle
43fc833a5d 4.5.2 release date
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-23 07:22:38 -05:00
Weblate
7aa3c47a2f Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-23 12:27:55 +01:00
CV. Gavitha Rantama
e9e9999469 Translated using Weblate (Indonesian)
Currently translated at 69.5% (2233 of 3211 strings)

[CI skip]
2015-11-23 12:27:53 +01:00
Marc Delisle
9b34d380b1 Fixes #11685 Warning: Invalid argument supplied for foreach()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-22 17:43:25 -05:00
Weblate
d4a5fbb59e Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-22 03:08:20 +01:00
Burak Yavuz
b63731a093 Translated using Weblate (Turkish)
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
2015-11-22 03:08:20 +01:00
Victor Volkov
9caf350032 Translated using Weblate (Russian)
Currently translated at 97.8% (3143 of 3211 strings)

[CI skip]
2015-11-22 03:08:20 +01:00
Dana Akram
030422afb4 Translated using Weblate (Kurdish Sorani)
Currently translated at 18.3% (589 of 3211 strings)

[CI skip]
2015-11-22 03:08:19 +01:00
Hauke Henningsen
0b0d4da02a Translated using Weblate (German)
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
2015-11-22 03:08:18 +01:00
Marc Delisle
1defe1a68a Merge branch 'MAINT_4_5_2' into QA_4_5 2015-11-21 21:07:08 -05:00
Marc Delisle
348c7d734a Fix incorrect message calling
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-21 21:06:31 -05:00
Michal Čihař
565e4eb077 Translated using Weblate (Persian)
Currently translated at 25.3% (814 of 3211 strings)

[CI skip]
2015-11-21 11:45:37 +01:00
mh
20e4a590c7 Translated using Weblate (Persian)
Currently translated at 25.4% (816 of 3211 strings)

[CI skip]
2015-11-20 23:24:45 +01:00
Marc Delisle
dae52aa67b Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-11-19 11:41:36 -05:00
Marc Delisle
d89ba29b21 Incorrect script name in include
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-19 11:41:28 -05:00
Weblate
b43c8abfa1 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-19 17:27:13 +01:00
Giovanni Sora
c5b69b770c Translated using Weblate (Interlingua)
Currently translated at 72.2% (2320 of 3211 strings)

[CI skip]
2015-11-19 17:27:12 +01:00
disorderman
cfd3e1a121 Translated using Weblate (Chinese (China))
Currently translated at 89.5% (2876 of 3211 strings)

[CI skip]
2015-11-19 17:27:12 +01:00
Marc Delisle
d37b26a1e9 Undefined index: SendErrorReports
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-19 11:27:01 -05:00
Dan Ungureanu
2502bfde14 Added ChangeLog entries.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-11-17 22:27:23 +02:00
Dan Ungureanu
0d5bf185ee Fixes #11664. Online syntax verifier bug - "IF" on SELECT statement
Fixes #11665. Format breaks query with COUNT()
Update sql-parser to udan11/sql-parser@5621792c48 (v3.0.7).

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-11-17 22:26:47 +02:00
Weblate
633d6fde00 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-16 13:25:14 +01:00