gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,243 Commits 12 Branches 481 Tags 2.4 GiB
da63d2cb13
Commit Graph

5147 Commits

Author SHA1 Message Date
Piotr Przybylski
da63d2cb13 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/database_interface.lib.php
 2011-07-01 20:52:25 +02:00
Piotr Przybylski
d5dd8a2d37 Fix PMA_DBI_get_columns 2011-07-01 20:37:58 +02:00
Piotr Przybylski
a28d43abf3 Updated MySQL function list 2011-07-01 20:37:57 +02:00
Piotr Przybylski
56d4b081a0 Remove STDDEV_* and VAR_* 
Standard deviation and variance make no sense when called with one argument
 2011-07-01 20:37:56 +02:00
Madhura Jayaratne
9fde1b5b23 Merge branch 'QA_3_4' 2011-07-01 23:00:57 +05:30
Madhura Jayaratne
4d1540cc1c bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option 2011-07-01 22:58:35 +05:30
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
Piotr Przybylski
7ef98dc9a2 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-30 00:52:01 +02:00
Piotr Przybylski
cbf00bca6c Remove unused variables 2011-06-30 00:50:42 +02:00
Piotr Przybylski
00946276e7 Fix column ordering when query has LIMIT, PROCEDURE, FOR UPDATE or LOCK IN SHARE MODE and contains newline 2011-06-30 00:50:41 +02: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
eb8caa4b77 Removed dead and incorrect code 
(In static context $this makes no sense)
 2011-06-28 22:42:04 +02:00
Piotr Przybylski
2a8dee495a Fix/unify comments 2011-06-28 22:42:04 +02:00
Piotr Przybylski
02fef2c5af Proper check for TIMESTAMP 2011-06-28 22:42:03 +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ř
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
Michal Čihař
6a422caf52 Proper escaping while checking for table (bug#3323066) 2011-06-27 14:46:04 +02:00
Michal Čihař
78ee628312 Use cache to skip blobstreaming check if server does not support it 2011-06-27 14:35:34 +02:00
Michal Čihař
a01662dd4a Revemo empty @license tags 2011-06-27 11:22:10 +02:00
Michal Čihař
4af40a31d5 Remove empty @copyright tags 2011-06-27 11:21:54 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +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
28ae930a71 sql_mode doesn't exist in Drizzle 2011-06-26 21:25:24 +02:00
Piotr Przybylski
14ab81248c Don't offer MyISAM engine in Drizzle 
It can be used only for temporary tables
 2011-06-26 20:46:30 +02:00
Piotr Przybylski
b00eb8f29c Show storage engine list in db/table operations (Drizzle) 2011-06-26 20:10:49 +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
d4d647e169 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-26 18:32:20 +02:00
Piotr Przybylski
3c55511e5c Use Create_time instead of CREATE_TIME 2011-06-26 18:28:35 +02:00
Marc Delisle
7322e858f0 Incorrect comment for return param 2011-06-26 09:05:19 -04:00
Marc Delisle
a04169f97d "Add a new" is redundant" 2011-06-26 07:33:09 -04:00
Piotr Przybylski
7d99d57cca Merge remote-tracking branch 'origin/master' into drizzle 2011-06-25 01:00:00 +02:00
Piotr Przybylski
d5eba48036 Remove unused PMA_STR_rPos, add PMA_strtolower 2011-06-23 23:28:06 +02:00
Piotr Przybylski
2399c8a784 Remove PMA_MULTIBYTE_ENCODING constant 2011-06-23 23:28:05 +02:00
Piotr Przybylski
b0496eb204 Fix comments 2011-06-23 23:28:05 +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
Marc Delisle
929cb3d63f Typo 2011-06-23 06:33:39 -04:00
Marc Delisle
c911e891a1 Typo 2011-06-23 06:32:09 -04:00
Piotr Przybylski
5661c3e14c Don't offer PERFORMANCE_SCHEMA engine in table creation dialog and Operations tab 2011-06-23 00:49:01 +02:00
Piotr Przybylski
3b0f465ba9 Fix StorageEngine::getStorageEngines() so it can properly cache data 2011-06-23 00:44:42 +02:00
Michal Čihař
4aa470e27e Indentation fixes 2011-06-22 11:03:38 +02:00
Michal Čihař
e0c7147806 This is a fatal error rather than place for warning 
It is not necessary to translate as this really should not happen.
 2011-06-22 11:02:15 +02:00
Michal Čihař
568a0e03de Show mcrypt waring only on main page and not on every page 2011-06-22 11:00:45 +02:00
Michal Čihař
3d74915b4e Better messages for event scheduler disabling/enabling 2011-06-22 10:25:50 +02:00
Michal Čihař
ee0b2fee37 Better error message when config file can not be parsed 
- shorter text
- directly show errors in iframe instead saying user to load other page
 2011-06-22 09:29:14 +02:00