Commit Graph

191 Commits

Author SHA1 Message Date
Michal Čihař
cdffe9fb97 Merge remote-tracking branch 'origin/QA_3_4'
Conflicts:
	libraries/dbi/mysql.dbi.lib.php
2011-12-14 10:06:36 +01:00
Michal Čihař
da62d86238 These are done and we do not seem to use decimals 2011-12-14 10:00:01 +01:00
Michal Čihař
91241f71d3 Fill orgtable and orgname attributes 2011-12-14 09:58:47 +01:00
Michal Čihař
cec8f1b094 Add actually some sane value to field flags 2011-12-14 09:56:02 +01:00
Michal Čihař
a074b4c6e2 Create fake flags field
The content is empty for now, but at least the code will not emit
warnings on every access to it (which is quite often). The proper value
calculation should be added later.
2011-12-14 09:49:51 +01:00
Michal Čihař
ea64f8f731 Whitespace cleanup 2011-12-14 09:49:35 +01: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
Michal Čihař
6d1bd82939 Factor out error message formatting 2011-10-24 17:42:07 +02:00
Michal Čihař
017ca0c22d Coding style improvements 2011-10-24 17:37:30 +02:00
Michal Čihař
97f89e63c4 Coding style improvements 2011-10-24 17:34:52 +02:00
Madhura Jayaratne
13adb5adf7 Use lower case for true, false and null 2011-09-23 11:11:41 +05:30
Piotr Przybylski
e9158da818 Add MYSQLI_TYPE_VARCHAR to mysqli dbi (required for Drizzle) 2011-08-20 00:36:41 +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ř
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Piotr Przybylski
3fa5e89bb2 Drizzle DBI: default to fully buffered query, like in mysql and mysqli 2011-08-04 14:14:05 +02:00
Piotr Przybylski
9ed5177320 Drizzle dbi - PMA_DBI_get_client_info should return Drizzle version it was built for 2011-08-01 13:35:30 +02:00
Piotr Przybylski
7897967c76 Drizzle dbi:
* fix PMA_DrizzleResult::fetchRow with FETCH_BOTH
* add method call logging
2011-07-30 22:38:46 +02:00
Piotr Przybylski
7bc8d8348d Drizzle dbi - segfault suddenly disappeared from there so use proper code 2011-07-30 21:51:14 +02:00
Piotr Przybylski
c7dd3244c6 Drizzle dbi - PMA_DBI_get_host_info - work around a segfault 2011-07-30 21:45:23 +02:00
Piotr Przybylski
c44f28a828 Fix affectedRows for drizzle dbi, circumvent a few drizzle module segfaults related to resource freeing 2011-07-30 18:49:47 +02:00
Piotr Przybylski
d35ec740a0 Marked drizzle dbi as experimental 2011-07-30 18:47:02 +02:00
Piotr Przybylski
f777dc3db5 Work around some segfaults in drizzle extension, still some segfaults left
Version 0.5 of PHP extension is definitely not production ready
2011-07-29 17:17:11 +02:00
Piotr Przybylski
4e22743b37 A few bugfixes for drizzle dbi 2011-07-28 22:46:40 +02:00
Piotr Przybylski
11a8690541 database interface files for drizzle PHP extension 2011-07-28 19:21:18 +02:00
Piotr Przybylski
c326cfeec4 Comments 2011-07-28 13:32:38 +02:00
Piotr Przybylski
5f8842739d Remove invalid usage of $php_errormsg 2011-07-27 21:26:28 +02:00
Piotr Przybylski
e82682d0e4 Simplify PMA_DBI_free_result
It was never used with multiple arguments
2011-07-27 19:59:49 +02:00
Piotr Przybylski
b9ff7b7ce2 Support persistent connections with mysqli extension (only PHP 5.3.0 and newer) 2011-07-27 19:59:49 +02:00
Piotr Przybylski
f43517efb5 mysql extension - remove 'persistent' parameter
Was named 'persistant' and never used/documented
2011-07-27 19:59:49 +02:00
Piotr Przybylski
46cd0f9a09 Comments 2011-07-27 19:59:49 +02:00
Piotr Przybylski
b0ce7c20c4 Improve readability 2011-07-27 19:59:48 +02:00
Piotr Przybylski
69ac509584 This should be checked in common, not in dbi library 2011-07-27 19:59:48 +02:00
Piotr Przybylski
2141b5fe81 Fix incorrect variable name
persistant > persistent
2011-07-27 19:59:48 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Rouslan Placella
0189a62776 Merge branch 'master' into rte 2011-06-06 17:18:35 +01:00
Rouslan Placella
48532dfad0 Fixed "Commands out of sync" error when executing stored Routines. 2011-06-06 17:18:24 +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
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
Piotr Przybylski
651b357f8a Whitespace cleanup 2011-02-15 17:38:08 +01:00
Marc Delisle
89552c74c4 Merge branch 'QA_3_3' 2011-01-12 08:05:40 -05:00
Marc Delisle
31cd4bdd6a bug #3155842 [core] Edit relational page and page number 2011-01-12 08:04:57 -05: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
Marc Delisle
d1bebc67f6 fix merge conflicts 2010-10-03 09:42:40 -04:00
Marc Delisle
1623c7e065 Browsing a table containing geometry columns 2010-10-03 09:20:32 -04: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
Michal Čihař
5c63cbd231 Merge branch 'QA_3_3'
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
2010-08-23 17:10:04 +02:00
Michal Čihař
a24e418527 Avoid PHP error when false is passed to PMA_DBI_getError.
This can be caused by controllink set to false.
2010-08-23 17:02:15 +02:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30