Commit Graph

169 Commits

Author SHA1 Message Date
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
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
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
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
Piotr Przybylski
3c9ef40d1e Add table alias in PMA_DBI_get_tables_full to avoid ambiguous field names in filtered queries (broken by join with TABLE_CACHE) 2011-05-22 15:03:30 +02:00
Piotr Przybylski
e69c721789 Try to get AVG_ROW_LENGTH from table cache 2011-05-22 14:25:51 +02:00
Piotr Przybylski
05c8dbee77 Try to get table size from table cache 2011-05-22 14:20:04 +02:00
Piotr Przybylski
fe53e42d1d Remove deprecated function PMA_DBI_get_fields 2011-05-20 23:12:58 +02:00
Piotr Przybylski
b9d37f27d2 Replace broken ANSI string concatenation with concat() function 2011-05-19 15:37:55 +02:00
Piotr Przybylski
4e090e1647 Read precision and scale for numeric columns, read enum definition for enums 2011-05-19 15:26:22 +02:00
Piotr Przybylski
ee72f556aa Code formatting 2011-05-19 15:08:55 +02:00
Piotr Przybylski
3c20076785 Make PMA_DBI_get_columns work with Drizzle 2011-05-18 22:19:26 +02:00
Piotr Przybylski
9c17051117 Remove deprecated function PMA_DBI_get_fields 2011-05-18 20:49:04 +02:00
Piotr Przybylski
4700907a5b Join with InnoDB stats only where InnoDB is provided by innobase library
Fix notice
2011-05-17 23:23:40 +02:00
Piotr Przybylski
b4bfa7f155 Use lowercase comparisons for Drizzle database names 2011-05-11 12:56:43 +02:00
Piotr Przybylski
423b45f6b2 PMA_DBI_get_tables_full - row counts for InnoDB tables in Drizzle 2011-05-09 19:46:35 +02:00
Piotr Przybylski
ddcc470320 Make PMA_DBI_get_tables_full work with Drizzle 2011-05-09 19:46:29 +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