Rouslan Placella
1bbb2ea37e
Merge branch 'master' into rte
2011-07-04 15:36:27 +01:00
Piotr Przybylski
e6b1d479cf
Move PMA_DBI_get_column_values and PMA_DBI_get_table_indexes to server_synchronize.lib.php
...
They are used only there, no need to parse 1,5 KB of code on every page load
2011-07-02 00:45:08 +02:00
Piotr Przybylski
5021bae02f
Remove unused PMA_DBI_get_table_data
2011-07-02 00:34:25 +02:00
Piotr Przybylski
d5dd8a2d37
Fix PMA_DBI_get_columns
2011-07-01 20:37:58 +02:00
Rouslan Placella
cf61fb1270
Prototype integration of Triggers editor.
2011-06-30 13:12:26 +01:00
Rouslan Placella
b4b56ed461
Merge branch 'master' into rte
...
Conflicts:
db_routines.php
libraries/db_events.inc.php
libraries/rte/rte_routines.lib.php
2011-06-30 11:42:16 +01:00
Michal Čihař
c9c9fdf49d
Consistent capitalisation of PMA_sqlAddSlashes
2011-06-27 14:48:15 +02:00
Michal Čihař
6a422caf52
Proper escaping while checking for table (bug#3323066)
2011-06-27 14:46:04 +02:00
Michal Čihař
e57f27e50b
Remove @uses tags from docblocks
2011-06-27 11:20:20 +02:00
Michal Čihař
c6ec73963f
Use PMA_sqlAddSlashes for database queries instead of addslashes.
...
Should fix bug#3323066
2011-06-21 17:41:47 +02:00
Rouslan Placella
61329e5c87
Merge branch 'master' into rte
2011-06-20 18:26:50 +01:00
Piotr Przybylski
18513b3e5d
Fix comments
2011-06-19 23:34:02 +02:00
Piotr Przybylski
04dd50ac5d
Properly escape names in PMA_isView
2011-06-19 23:34:01 +02:00
Rouslan Placella
0189a62776
Merge branch 'master' into rte
2011-06-06 17:18:35 +01:00
Michal Čihař
4603ca7001
Factor out common code for PMA_DBI_try_query.
...
PMA_DBI_try_query is now shared for mysql and mysqli as the only
difference there was real call to the database, the rest was same
(timing, tracking, debugging,..).
2011-06-06 14:03:13 +02:00
Rouslan Placella
c27b2e776b
Merge branch 'master' into rte
2011-06-06 12:44:15 +01: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
Rouslan Placella
35454870e5
Merge branch 'master' into rte
2011-06-04 20:26:11 +01: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
Rouslan
aac4d59508
Support retreiving Triggers on a per-database basis.
2011-05-21 17:41:30 +01:00
Piotr Przybylski
fe53e42d1d
Remove deprecated function PMA_DBI_get_fields
2011-05-20 23:12:58 +02:00
Marc Delisle
13b31956ae
For easier reading, replace "!isset" with "! isset"
2011-05-09 12:49:05 -04:00
Piotr Przybylski
56476bc74d
Make sure $limit is initialized
2011-05-03 14:26:55 +02:00
Piotr Przybylski
5c39c5511f
Comments formatting and PHPDoc fixes
2011-05-02 20:50:16 +02:00
Piotr Przybylski
4c957837eb
Introduce PMA_DRIZZLE constant
2011-04-06 15:40:58 +02:00
Piotr Przybylski
dcf0e4235a
remove unused variable
2011-02-17 02:46:05 +01:00
Marc Delisle
45eb47fe14
Merge branch 'QA_3_3'
2011-01-08 13:45:40 -05:00
Marc Delisle
8244589813
Bug #3153409 [core] 0 row(s) affected
2011-01-08 13:44:28 -05:00
Madhura Jayaratne
066b746bef
patch #3150164 [structure] Ordering by size gives incorrect results
2011-01-03 08:10:49 -05:00
Marc Delisle
cfca67f422
Merge branch 'QA_3_3'
2011-01-03 08:03:41 -05:00
Madhura Jayaratne
55cd2fd898
patch #3150164 [structure] Ordering by size gives incorrect results
2011-01-03 08:02:28 -05:00
Michal Čihař
ae7a20607d
Do not set charset for Drizzle.
2010-10-21 10:04:37 +02:00
Michal Čihař
2c7161c7a3
Remember also MySQL major version.
2010-10-21 10:04:15 +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
c9253c0a0e
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
Michal Čihař
862e3ca2a7
Merge branch 'QA_3_3'
...
Conflicts:
libraries/core.lib.php
server_databases.php
server_privileges.php
2010-08-20 13:40:37 +02:00
Michal Čihař
41145feb12
Merge branch 'MAINT_3_3_5' into QA_3_3
...
Conflicts:
ChangeLog
libraries/common.lib.php
2010-08-20 13:36:49 +02:00
Michal Čihař
533e102135
Fix handling of unknown sort order.
2010-08-18 11:30:19 +02:00
ninadsp
a458147969
Merge from upstream. Resolved a conflict in js/functions.js
2010-08-05 23:51:14 +05:30
Marc Delisle
887e2be664
fix merge conflicts
2010-08-01 06:20:10 -04:00
Marc Delisle
fd1d214d35
bug #3036132 [core] Triggers not fetched if dbname has an hyphen
2010-08-01 06:17:03 -04:00
ninadsp
a2f78a6d38
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
Michal Čihař
3910ce6121
Remove explicit inclusion of Table.class.php as it is included in common.inc anyway.
2010-07-26 16:35:52 +02:00
ninadsp
e646a2760c
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650
Drop @version tag from docblocks.
2010-07-20 13:59:17 +02:00
ninadsp
bed1948d04
testing git setup - no major change made in code yet
...
only added a few comments
2010-05-23 01:22:01 +05:30
Michal Čihař
40388d4fe0
Simplify MySQL modules warnings by using standard functions.
2010-05-05 11:36:33 +02:00
Marc Delisle
2182098af6
strings to gettext, second batch
2010-05-04 20:07:19 -04:00
Marc Delisle
bd31cbb260
bug 2953050 export VIEW as SQL includes INSERT statement
2010-02-27 16:39:41 +00:00
Marc Delisle
760ac0cd98
bug 2953050 export VIEW as SQL includes INSERT statement
2010-02-27 16:39:41 +00:00
