Commit Graph

6406 Commits

Author SHA1 Message Date
Marc Delisle
b36fb9e8bf Fix merge conflicts 2010-12-11 08:19:42 -05:00
Marc Delisle
b6f717a602 bug #3125606 [parser] Query for table "level" causes strange display 2010-12-11 08:03:50 -05:00
Marc Delisle
1f5896a88b Avoid bug entries that relate to a version not yet released 2010-12-11 07:48:30 -05:00
Adnan
c871141236 bug #3112614 [pdf schema] Scratchboard for PDF pages not working 2010-12-09 08:03:59 -05:00
Adnan
2ba852dc5c bug #3112614 [pdf schema] Scratchboard for PDF pages not working 2010-12-09 08:01:51 -05:00
Dieter Adriaenssens
e69bbb4ec1 Use less noisy message and remove disable link on database statistics 2010-12-08 20:21:51 +01:00
Dieter Adriaenssens
7dcd159da6 bug #3119882, Display query chart on demand 2010-12-04 15:12:45 +01:00
Dieter Adriaenssens
d370730eff bug #3119874, Show integers without decimals on status page 2010-12-04 14:13:51 +01:00
Michal Čihař
89f03ef81b bug #3123433 [interface] Avoid double escaping of MySQL errors.
The PMA_DBI_getError function already does escaping, so there is no need
to escape that string again on displaying.
2010-12-02 17:14:59 +01:00
Marc Delisle
a93399b8a4 the goal of master is currently to stabilize 3.4.0 2010-12-02 07:37:12 -05:00
Marc Delisle
ad1468c8a2 Merge branch 'QA_3_4' 2010-11-29 13:03:29 -05:00
Marc Delisle
0593112674 Merge branch 'MAINT_3_4_0' into QA_3_4 2010-11-29 13:03:10 -05:00
Marc Delisle
dff18d6af8 3.3.8.1 correct release date and PMASA ref 2010-11-29 13:02:51 -05:00
Marc Delisle
bc0b9fa744 3.3.8.1 correct release date and PMASA ref 2010-11-29 13:01:59 -05:00
Michal Čihař
86f566ce7b Merge branch 'QA_3_4' 2010-11-28 18:12:10 +01:00
Michal Čihař
adaa0ab3a5 Merge branch 'MAINT_3_4_0' into QA_3_4
Conflicts:
	ChangeLog
2010-11-28 18:12:01 +01:00
Marc Delisle
1199f7a3db Merge branch 'QA_3_4' 2010-11-28 08:16:37 -05:00
Marc Delisle
ae764b973f fix merge conflicts 2010-11-28 08:15:53 -05:00
garas
a3ae93f776 patch #3112792 [navi] Left panel table grouping incorrect 2010-11-28 08:12:22 -05:00
Herman van Rink
fff3afc08e bug #3115519: Prevent long queries from being shown in confirmation popup 2010-11-26 20:55:58 +01:00
Marc Delisle
87fa9bd524 ChangeLog for XSS fix 2010-11-26 09:12:18 -05:00
Marc Delisle
968a8d2ad7 ChangeLog for XSS fix 2010-11-26 09:10:47 -05:00
Marc Delisle
3f12de1746 ChangeLog for XSS fix 2010-11-26 09:08:51 -05:00
Marc Delisle
b1103e2db9 fix merge conflicts 2010-11-26 09:07:19 -05:00
Dieter Adriaenssens
468d08f975 Merge branch 'QA_3_4' 2010-11-24 16:59:12 +01:00
Dieter Adriaenssens
4e6a1bb0a9 Merge branch 'MAINT_3_4_0' into QA_3_4 2010-11-24 16:58:58 +01:00
Dieter Adriaenssens
d1a6f043e2 Merge branch 'QA_3_3' into MAINT_3_4_0 2010-11-24 16:58:06 +01:00
Craig Duncan
d6a7bd40fa patch #3117535, replication : Add quotes to database in initial statement 2010-11-24 16:56:32 +01:00
Marc Delisle
782beabb6a 3.4.1-dev 2010-11-22 13:26:56 -05:00
Marc Delisle
9c8514fb97 3.5.0-dev 2010-11-22 13:23:08 -05:00
Marc Delisle
3b74d9ba01 credits 2010-11-19 13:07:49 -05:00
Marc Delisle
b2d7a78012 rfe #3111455 [interface] Column highlighting and marking in table view 2010-11-18 17:11:04 -05:00
Dieter Adriaenssens
65fcab4122 Merge branch 'QA_3_3' 2010-11-14 21:08:28 +01:00
Dieter Adriaenssens
63aec5b328 bug #1762306, Copy database with view of a view 2010-11-14 21:03:13 +01:00
Dieter Adriaenssens
57c5abf579 Merge branch 'QA_3_3' 2010-11-14 18:28:10 +01:00
Dieter Adriaenssens
8277c92e25 bug #3077463, Events were not copied when copying/renaming database 2010-11-14 18:27:10 +01:00
Marc Delisle
5f4604c9bb bug #3103853 [js] Double quotes were not escaped in generated js; I think this only applies to 3.3.x 2010-11-06 07:51:06 -04:00
Marc Delisle
e93a16f5a3 fix merge conflicts 2010-11-04 06:35:35 -04:00
jirand
81a338db80 patch #3101490 Default function for TIMESTAMP 2010-11-04 06:27:31 -04:00
Marc Delisle
fff8f28a53 Merge branch 'QA_3_3' 2010-10-29 05:39:02 -04:00
Marc Delisle
540cd447a3 bug [doc] Fix references to MySQL doc 2010-10-29 05:38:12 -04:00
Marc Delisle
f734c4c1ac 3.3.8 release 2010-10-25 12:20:34 -04:00
Marc Delisle
60e468cd18 3.3.8 release 2010-10-25 12:19:24 -04:00
Michal Čihař
10bbd76fc1 bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character. 2010-10-21 11:32:49 +02:00
Marc Delisle
61851eb80d 3.3.9-dev 2010-10-18 06:11:12 -04:00
Marc Delisle
266b8e3aaf 3.3.9-dev 2010-10-18 06:09:38 -04:00
Marc Delisle
7cbdcd6be1 fix merge conflicts 2010-10-09 06:37:30 -04:00
Marc Delisle
2d4b9e2aea support ARIA storage engine as well as its previous name MARIA 2010-10-09 06:35:06 -04:00
Dieter Adriaenssens
90c48f8696 Merge branch 'QA_3_3' 2010-10-07 20:51:08 +02:00
Dieter Adriaenssens
8c34269e52 bug #3062454, Display routines/events also when no tables are defined 2010-10-07 20:32:07 +02:00