Commit Graph

5509 Commits

Author SHA1 Message Date
Piotr Przybylski
dfec5a4732 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-01 18:05:53 +02:00
Piotr Przybylski
997a5ea14c Comment change 2011-08-01 18:03:33 +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
0a4ddb3f67 Remove unused function: PMA_lang_link_replace 2011-07-31 20:41:03 +02:00
Piotr Przybylski
878cff0205 Comments 2011-07-31 20:41:03 +02:00
Piotr Przybylski
d7bea4d4ee Merge remote-tracking branch 'origin/master' into drizzle 2011-07-31 17:26:18 +02:00
Piotr Przybylski
8824da9ed8 Fix links in messages shown by setup script 2011-07-31 17:23:34 +02:00
Piotr Przybylski
9b01642c95 Fix test_db_connection() for connections via socket 2011-07-31 15:16:07 +02:00
Piotr Przybylski
6a54e26318 Remove information about PHP 4.3, the minimal supported version is now 5.2 2011-07-31 15:07:09 +02:00
Piotr Przybylski
e1799393f3 Validation for drizzle module in setup script
Untested and currently unused, it's too unsafe to allow users to choose it
2011-07-31 00:50:58 +02:00
Piotr Przybylski
b57fda5b3d Merge remote-tracking branch 'origin/master' into drizzle 2011-07-31 00:46:49 +02:00
Piotr Przybylski
e3b91b7a0b PMA_DBI_fetch_value, PMA_DBI_fetch_single_row and PMA_DBI_fetch_result don't need to cache affected rows because there are none 2011-07-31 00:44:42 +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
eb18aeeeb2 Remove debug code 2011-07-29 17:14:22 +02:00
Madhura Jayaratne
808447af1e Merge branch 'QA_3_4' 2011-07-29 06:39:58 +05:30
Madhura Jayaratne
11ad4fd992 bug #3313235 [interface] Error div misplaced 2011-07-29 06:38:07 +05:30
Piotr Przybylski
4e22743b37 A few bugfixes for drizzle dbi 2011-07-28 22:46:40 +02:00
Piotr Przybylski
abdf808dee Correctly detect drizzle extension 2011-07-28 22:46:19 +02:00
Piotr Przybylski
11a8690541 database interface files for drizzle PHP extension 2011-07-28 19:21:18 +02:00
Piotr Przybylski
f06cabeca7 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-28 13:33:44 +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
0eca09ffff Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/dbi/mysqli.dbi.lib.php
2011-07-27 20:10:38 +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
Piotr Przybylski
f2935d56d9 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	js/server_status.js
	server_status.php
2011-07-25 21:55:16 +02:00
Marc Delisle
871aaa9b64 3.4.5-dev 2011-07-25 10:12:37 -04:00
Michal Čihař
3638bbd345 Fix typo 2011-07-25 14:46:33 +02:00
Michal Čihař
ffe203b099 Simplify definition of new valid links 2011-07-25 14:38:05 +02:00
Michal Čihař
765d823bbd Better function names 2011-07-25 14:35:52 +02:00
Michal Čihař
2cc790bad2 Coding style 2011-07-25 14:34:44 +02:00
Michal Čihař
c44b0eacec Fix docblocks 2011-07-25 14:32:09 +02:00
Michal Čihař
8d589ed83e Fix matching of tags without target 2011-07-25 14:12:22 +02:00
Michal Čihař
0c57cb20e2 Use preg_replace_callback for interpreting [a@...]
This way we need to evaluate regullar expression only once and can
convert all correct links rather than replacing none in case one string
is broken.
2011-07-25 14:05:57 +02:00
Michal Čihař
55c6412e6c Add documentation 2011-07-25 13:56:19 +02:00
Michal Čihař
a4807a8e7c Improve check for valid links 2011-07-25 13:54:09 +02:00
Michal Čihař
17cd1ebe2b Use single function for bbcode implementation 2011-07-25 12:11:17 +02:00
Michal Čihař
c3daf8bc52 Wrap long lines and make it more readable 2011-07-25 11:53:02 +02:00
Michal Čihař
f34dfda0fe Merge remote-tracking branch 'tyron/master'
Conflicts:
	js/functions.js
	js/server_status.js
	js/sql.js
	libraries/common.lib.php
	server_status.php
	themes/pmahomme/css/theme_left.css.php
2011-07-25 11:32:22 +02:00
Marc Delisle
35a5f31283 Merge branch 'QA_3_4' 2011-07-24 08:08:51 -04:00