Commit Graph

209 Commits

Author SHA1 Message Date
Piotr Przybylski
6dbcab261e Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	server_status.php
2011-07-20 18:23:21 +02:00
Piotr Przybylski
6deed1fd2e Change NULL to null 2011-07-20 18:08:04 +02:00
Piotr Przybylski
a0a4628b11 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/texytext.php
	libraries/export/xml.php
2011-07-14 22:38:20 +02:00
Piotr Przybylski
94b83dc3e9 Escape column name in PMA_DBI_get_columns_full 2011-07-14 21:31:45 +02:00
Piotr Przybylski
ab4cca24bc There are no triggers in Drizzle 2011-07-14 00:40:01 +02:00
Piotr Przybylski
beddd31ec3 Make PMA_DBI_getCompatibilities() aware of Drizzle - it doesn't have SQL_MODE 2011-07-13 17:00:42 +02:00
Piotr Przybylski
bf9469ec18 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 12:25:06 +02:00
Rouslan Placella
1bbb2ea37e Merge branch 'master' into rte 2011-07-04 15:36:27 +01:00
Piotr Przybylski
0266ddd7bd Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/database_interface.lib.php
2011-07-03 00:41:31 +02: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
Piotr Przybylski
e3a4f6d95a Fix PMA_DBI_get_columns when $column parameter is used and UNI key is promoted to PRI 2011-06-30 18:54:45 +02:00
Piotr Przybylski
29070219a9 Fix comments 2011-06-30 16:41:48 +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
Piotr Przybylski
7255ec2100 Change PMA_DBI_get_columns() to always return complex descriptions, never simple column list (it was needed for one case anyway)
Bugfixes
2011-06-30 00:48:19 +02:00
Piotr Przybylski
04fef01fd7 Properly compute 'Extra' in PMA_DBI_get_columns_sql (Drizzle) 2011-06-28 23:34:01 +02:00
Piotr Przybylski
96c5c6dbc6 Add $column parameter to PMA_DBI_get_columns 2011-06-28 23:11:58 +02:00
Piotr Przybylski
83117b18d7 Use PMA_sqlAddSlashes from recent merge 2011-06-27 23:59:04 +02:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02: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
Piotr Przybylski
3eaff6afb6 A few Drizzle-related changes to db operations tab 2011-06-26 18:38:36 +02:00
Piotr Przybylski
6553cdd663 Add information about query errors to debug output 2011-06-26 18:37:24 +02:00
Piotr Przybylski
e38b5cd4ff Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	db_structure.php
	libraries/common.lib.php
	libraries/database_interface.lib.php
	tbl_structure.php
2011-06-23 14:02:58 +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
3aaaf33afa Merge remote-tracking branch 'origin/master' into drizzle 2011-06-19 23:35:08 +02: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
Piotr Przybylski
2e01d01b32 Change all calls of SHOW KEYS/INDEX that use MySQL-specific fields to use query generation function 2011-06-18 00:15:43 +02:00
Piotr Przybylski
4273c602c8 Bugfix for new PMA_DBI_get_columns 2011-06-17 21:25:13 +02:00
Piotr Przybylski
30b85be0a2 Allow for null values in PMA_DBI_get_tables_full 2011-06-17 21:03:02 +02:00
Piotr Przybylski
12f70e8938 Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql()
Fix PMA_DBI_get_columns() in Drizzle when $full == false
2011-06-17 00:22:25 +02:00
Piotr Przybylski
f77886d1a0 Fix for I_S and D_D table data returned by PMA_DBI_get_tables_full 2011-06-08 00:37:31 +02:00
Rouslan Placella
0189a62776 Merge branch 'master' into rte 2011-06-06 17:18:35 +01:00
Piotr Przybylski
96f3b37fc1 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-06 16:42:04 +02: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
Piotr Przybylski
a56d77fb67 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-06 12:12:42 +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
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
Piotr Przybylski
33255a189c PMA_DBI_get_columns_full: works with Drizzle, uniform behavior with DisableIS true/false 2011-05-28 00:26:13 +02:00
Piotr Przybylski
9f59de6167 PMA_isSuperuser() and other privileges (Drizzle) 2011-05-27 20:18:00 +02:00
Piotr Przybylski
cafbefd518 PMA_DBI_get_columns - add "on update ..." to Extra when possible (Drizzle) 2011-05-25 19:43:44 +02:00
Piotr Przybylski
dd5324c05a Rewrite PMA_DBI_get_databases_full to work with Drizzle
For Drizzle the only extended stat that works are SCHEMA_TABLES (always) and SCHEMA_TABLE_ROWS (only for InnoDB/innobase tables)
2011-05-24 10:07:20 +02:00
Piotr Przybylski
539e8b26b3 Cast d_d.tables.auto_increment to NULL because currently (2011.03.13 GA) Drizzle doesn't provide correct value 2011-05-22 16:23:38 +02:00