Commit Graph

191 Commits

Author SHA1 Message Date
Dieter Adriaenssens
8078441519 typo 2011-12-30 19:53:11 +01:00
Marc Delisle
3142c0caf1 See bug #3418579. In commit f2fe4db5f1
this global definition was removed, causing the bug.
2011-11-12 11:00:37 -05:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Madhura Jayaratne
299da6d047 More style errors fixed 2011-09-23 11:36:14 +05:30
Marc Delisle
47463352c4 Not field but column 2011-09-13 12:28:29 -04:00
Piotr Przybylski
3e0af18434 Fix indentation broken by past merges 2011-08-24 13:24:21 +02:00
Piotr Przybylski
f578d0dadc Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 19:58:16 +02:00
Piotr Przybylski
5cd731b232 Make this usage of $sql_backquotes less cryptic 2011-08-16 19:33:09 +02:00
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
2011-08-05 17:17:47 +02:00
Michal Čihař
81aadb883f Better error message 2011-08-05 10:49:49 +02:00
Piotr Przybylski
ce7e6feaf5 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/export/htmlword.php
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/sql.php
	libraries/export/texytext.php
	libraries/export/xml.php
2011-08-03 00:25:43 +02:00
Michal Čihař
7e7be00f84 Forgot to reindent this one 2011-08-02 15:50:44 +02:00
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
2011-07-22 11:07:04 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Piotr Przybylski
a28beb9c1f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/server_synchronize.lib.php
	server_status.php
2011-07-21 15:25:52 +02:00
Michal Čihař
dd641ef164 Wrap some long lines 2011-07-21 14:49:25 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Piotr Przybylski
f7591dd563 Fix SQL export 2011-07-14 00:57:19 +02:00
Piotr Przybylski
dd6f936731 Make PMA_DBI_get_triggers aware that Drizzle doesn't have triggers 2011-07-13 20:57:05 +02:00
Piotr Przybylski
480fe9f78c Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 17:37:50 +02:00
Michal Čihař
ae780330e8 Add missing semicolon 2011-07-13 17:05:34 +02:00
Piotr Przybylski
7801d55018 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 14:05:24 +02:00
Piotr Przybylski
e7a4453406 More code formatting changes 2011-07-13 14:02:43 +02:00
Piotr Przybylski
bf9469ec18 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 12:25:06 +02:00
Piotr Przybylski
2c0d2aca16 Use PMA_MYSQL_STR_VERSION instead of reconstructing it from PMA_MYSQL_INT_VERSION 2011-07-12 18:16:01 +02:00
Piotr Przybylski
f14a4e567f Unify comments for export plugins 2011-07-12 17:50:46 +02:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02:00
Michal Čihař
12348ee826 Fix escaping on LIKE queries
All these need special variant of PMA_sqlAddSlashes.
2011-06-27 14:50:16 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Piotr Przybylski
c734e1fd14 Workaround for brokwn ROW_FORMAT in SHOW CREATE TABLE (Drizzle) 2011-06-26 21:26:49 +02:00
Piotr Przybylski
3eaff6afb6 A few Drizzle-related changes to db operations tab 2011-06-26 18:38:36 +02:00
Michal Čihař
76d4046858 Use subpackages for export formats 2011-06-21 11:39:21 +02:00
Michal Čihař
f2fe4db5f1 Remove not used code 2011-06-06 14:12:58 +02:00
Michal Čihař
d14e49f827 Simplify code 2011-06-06 13:47:00 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false.
At least this seems to be the coding standard, so make all files
compliant.
2011-06-06 11:55:09 +02:00
Michal Čihař
754cc88c39 Wrap a bit long lines 2011-06-06 11:31:27 +02:00
Michal Čihař
bbbf2c49ed Drop $GLOBALS['charset'].
It was anyway always set to utf-8 so it does not make sense to keep it
as a variable.
2011-06-03 14:04:29 +02:00
Marc Delisle
ae0af9e5c6 Remove author name 2011-05-28 08:29:38 -04:00
Rouslan Placella
6adfdb3b44 Feature Request #3163355 - Skip dumping data comment if table is empty. 2011-03-28 14:18:10 +02:00
Marc Delisle
1484ca6c00 Procedures and functions should be exported also when entering Export on a single db 2011-02-13 14:00:14 -05:00
Marc Delisle
708638e1dd Bug #3179715 Procedure and functions are not exported in Server export mode 2011-02-13 08:03:36 -05:00
Dieter Adriaenssens
eee76d640b Merge branch 'QA_3_3' 2010-12-22 16:01:02 +01:00
Aamir Khan
1ceccbd50c fix typo 2010-12-22 15:59:44 +01:00
Dieter Adriaenssens
1fe6e59d73 Merge branch 'QA_3_3' 2010-09-28 20:07:00 +02:00
Dieter Adriaenssens
c0d1c7a2ae export/copy procedures and routines before tables 2010-09-28 19:37:03 +02:00
Marc Delisle
598d3b898d functions, procedures and events are missing from the export 2010-09-19 08:55:54 -04:00
Michal Čihař
dd2861350f Better description. 2010-09-15 15:07:49 +02:00
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30