Commit Graph

174 Commits

Author SHA1 Message Date
Sander Roobol
68b18b05fe Fix typo in proto. 2002-03-24 18:01:41 +00:00
Derick Rethans
a9439b7072 - Fix proto 2002-03-24 17:59:39 +00:00
Georg Richter
c47244cd8a changed prototype for mysql_real_escape_string 2002-03-24 17:57:32 +00:00
Zak Greant
fa4bd7ab32 Added mysql_ping() function. 2002-03-24 17:34:20 +00:00
Georg Richter
e15bb45a1e a) ws fixed
b) changed mysql_list_processes, mysql_stat (zend_parse_parameters)
c) New functions:
	1) mysql_real_escape_string	this function is similar to mysql_escape_string (deprecated).
					it needs a mysql-connection to escape a string according to the
					current character set

	2) mysql_character_set_name	returns the current character set for the connection

	3) mysql_thread_id		return the pid for the current connection. This function is usefull
					when using mysql_list_processes
2002-03-24 17:19:19 +00:00
Zak Greant
28de0b545e (PHP mysql_list_processes) Returns a pointer to a result set containing
information on the processes running in the
                           MySQL server.
(PHP mysql_stat) Returns a string containing information on the status
                 of the MySQL server.
@- Added two new functions: mysql_list_processes and mysql_stat (Georg)
@- mysql_list_processes() fetches information on the processes running on
@  the MySQL server.
@- mysql_stat() returns status information for a MySQL server.
#  Committed for Georg by Zak
2002-03-24 10:57:40 +00:00
foobar
00929ff9ac - Fixed bug: #16139 (compile failure with Mysql 4.0.1)
- Some tests were only run when compiling with the bundled libs.
  (caused some compile warnings with external mysql libs)
- Another try to fix the zlib issue..(uncompress)
2002-03-20 01:31:22 +00:00
Andi Gutmans
c8e7db984c - Allow duality between Engine 1 & 2 using ZEND_STANDARD_CLASS_DEF_PTR 2002-03-12 20:18:01 +00:00
Sebastian Bergmann
90613d2282 Maintain headers. 2002-02-28 08:29:35 +00:00
Zak Greant
3ac1646ef2 Corrected bug in php_mysql_fetch_hash() that prevented columns with NULL values from having both numeric and associative indexes. (Bug 14291) 2001-12-30 10:00:26 +00:00
Alex Waugh
57d2cec170 Check for ushort 2001-12-23 14:37:24 +00:00
Zeev Suraski
9590c5173c Fix bug #13456 - I'm unable to actually test it 2001-12-15 17:09:37 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
Zeev Suraski
990e2612cc Work around a quirk in the MySQL client library to fix unbuffered queries 2001-12-06 15:04:23 +00:00
Markus Fischer
2b615c3ba4 - Prototype new parameter which forces the creation of new links. 2001-12-06 09:56:24 +00:00
Derick Rethans
983e41b7be - Reverse slight mistake (patch by Markus Fischer) 2001-11-23 11:46:01 +00:00
Derick Rethans
2d6842b103 - Added a parameter to mysql_connect to force a new database link to be
created. (patch by Markus Fischer <mfischer@guru.josefine.at>)
@- Added a parameter to mysql_connect to force a new database link to be
@  created. (Markus, Derick)
2001-11-22 07:58:37 +00:00
Egon Schmid
4396a984a8 More protos fixed. 2001-11-08 22:05:56 +00:00
Derick Rethans
ea83d64507 - prototypes
#- Thanks to Zak for pointing this out during his talk
2001-11-08 20:23:33 +00:00
foobar
5a81882c03 This was conditionally included if HAVE_MYSQL_REAL_CONNECT was defined. 2001-11-02 07:08:48 +00:00
foobar
9ba2c90e16 Make the extension work with MySQL 4.0 2001-11-02 06:42:12 +00:00
Stig Bakken
689252082c * zend_module_entry change: apino, debug and zts are moved first,
see README.EXTENSIONS file for upgrade help.
@Introduced extension version numbers (Stig)
2001-10-11 23:33:59 +00:00
Derick Rethans
009b8470eb - Fix for bug #13592 (Patch by Markus Fischer <mfischer@guru.josefine.at>) 2001-10-08 06:28:16 +00:00
Jeroen van Wolffelaar
6cfba2a3ea 2nd phase in back-substitution those macro's
I've got pretty much everything now...
2001-09-25 22:49:04 +00:00
Jeroen van Wolffelaar
c033288573 Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know. 2001-09-25 21:58:48 +00:00
Derick Rethans
78747bd2df - Don't wrap lines... this is annoying while coding. 2001-09-09 13:29:31 +00:00
Jeroen van Wolffelaar
d14b3a86cf Proto fix 2001-08-20 20:50:54 +00:00
Andi Gutmans
ed9c36c1b8 - Make mysql_fetch_object() work w/ Engine 2 2001-08-11 18:27:48 +00:00
Zeev Suraski
f6f6c4d7e6 Whitespace 2001-08-11 16:39:07 +00:00
Sascha Schumann
23b9300fd1 more tsrm cleanup 2001-08-06 03:50:52 +00:00
Zeev Suraski
aa1772ca72 More TSRMLS_FETCH annihilation 2001-07-31 05:44:11 +00:00
Zeev Suraski
c43806f415 Zend compatibility patch 2001-07-30 08:24:42 +00:00
Zeev Suraski
797a079a95 More TSRMLS_FETCH work, and a bit of cleanup 2001-07-30 06:18:13 +00:00
Andi Gutmans
a0f5b7495e - More object macro work 2001-07-28 19:02:53 +00:00
Zeev Suraski
d87cc976e1 Redesigned thread safety mechanism - nua nua 2001-07-28 11:36:37 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Jason Greene
14afcf724d Fix Non-terminated comment 2001-06-05 16:06:31 +00:00
Rasmus Lerdorf
25c3a3a39d vim-6 does folding - clean up a bunch of missing folding tags plus
some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 13:12:10 +00:00
Stig Bakken
1beda9ee1e * include "config.h" if HAVE_CONFIG_H is defined (for standalone dso build) 2001-05-24 10:07:29 +00:00
Wez Furlong
63b3fa262c Reverse my earlier patch for mysql_db_query() & emit an E_NOTICE of it's
deprecated status.
# Should it be a warning or a notice?
2001-05-09 22:28:16 +00:00
Wez Furlong
21ec6e2993 Enabled optional result_mode param in mysql_db_query() to make it behave
as mysql_unbuffered_query (can be either MYSQL_USE_RESULT or
MYSQL_STORE_RESULT)
2001-05-07 11:02:31 +00:00
Sascha Schumann
d998ae4e5b Fix broken ZTS build. 2001-05-05 11:11:32 +00:00
Zeev Suraski
52ba317606 emalloc()'d strings must be freed before the request shutdown;
Rule of the thumb:  initialize in RINIT, clean in RSHUTDOWN
2001-05-05 01:42:15 +00:00
Jason Greene
bb131011a7 Fixed bug in my previous patch, forgot to reset connect error globals
on request startup.
2001-05-04 18:27:15 +00:00
Jason Greene
8405c36815 @ Added connection error support to mysql_error() and mysql_errno() (Jason)
This should work correctly without causing compatibility issues with previous
scripts. Someone might want to double check this change, just in case.
2001-05-04 01:14:26 +00:00
foobar
d4e64925d5 Possible Fix for #10570, #10585, #10539 and maybe others. 2001-05-02 00:21:25 +00:00
Zeev Suraski
c8a768a2fb whitespace fix 2001-04-29 11:37:03 +00:00
Matt McClanahan
cb9db291c7 Enforce the right number of params for mysql_fetch_*() functions, related to bug 9839. 2001-04-26 08:22:12 +00:00
Zeev Suraski
e6f3fb39cb Implement mysql_unbuffered_query() - uses mysql_use_result() instead of
mysql_store_result()
2001-03-13 22:52:53 +00:00
Zeev Suraski
fdf21452ed Centralize query code 2001-03-13 21:42:43 +00:00
Zeev Suraski
f5ddc2826d Use a container struct instead of MYSQL directly 2001-03-13 21:13:19 +00:00
Sean Bright
48caa74c20 Fixed prototype. 2001-03-12 15:14:38 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Shane Caraveo
6e31987376 Initalize some of the global vars. Crashed under ms debugger without having them initialized. 2001-02-21 23:57:28 +00:00
Egon Schmid
a297dbd6f3 Typos in protos. 2001-02-18 16:59:18 +00:00
Stig Bakken
e07eda31ed did someone poop in the code? :-) 2001-02-01 09:36:52 +00:00
Egon Schmid
0c450fa966 Only two lines are allowed here. 2001-01-31 23:35:37 +00:00
Sean Bright
31c8104dc6 Added the mysql_get_*_info() functions.
# If anyone knows of a version of mysql lower then 3.20.32 that implements
# all 3 of these functions, please change the conditionals.
@- Added mysql_get_client_info(), mysql_get_server_info(),
@  mysql_get_proto_info(), and mysql_get_host_info() functions. (Sean)
2001-01-31 22:04:30 +00:00
Andi Gutmans
0611acb910 - Change unset() functions to null(). unset() is legacy 2001-01-31 21:53:30 +00:00
Sean Bright
b940c97233 Fixed conditional.
# Woops!
2001-01-31 01:14:54 +00:00
Sean Bright
4086ba9773 Fix for bug #8991. mysql_field_type() now returns "year" for columns of
type YEAR.
2001-01-31 00:55:28 +00:00
Zeev Suraski
27afea5c6d Don't fetch numeric indices in mysql_fetch_object() 2001-01-14 09:30:17 +00:00
Rasmus Lerdorf
69d16ee1f9 Fix for bug 6073 from Sean R. Bright <elixer@erols.com> 2001-01-12 08:03:24 +00:00
Zeev Suraski
cbb2379b5b - Get the MySQL module a bit uptodate.
- Fix a bug in mysql_do_connect() - it would corrupt the host argument, if it contained a port
  (or could corrupt the INI value, so that the port argument would work only the first time
  around)
2000-12-02 17:27:11 +00:00
Zeev Suraski
905e41af5c Will work on a more thorough implementation for mysql_store_result() after 4.0.4 2000-11-08 08:27:27 +00:00
Stanislav Malyshev
ef8fb2767b Enable to use mysql_use_result in query functions.
You may need this if you use real big queries.
@- Allow user to use mysql_use_result in mysql queries (Stas)
2000-11-07 15:46:15 +00:00
Zeev Suraski
b20f8b39b9 Fixed mysql_close() - A bit more complicated than I originally thought 2000-11-03 01:56:47 +00:00
Zeev Suraski
6451d58455 Fix mysql_close() 2000-11-03 00:41:29 +00:00
Andrei Zmievski
f1dcb32c9f Use zend_register_list_destructors_ex() instead. 2000-10-25 17:44:02 +00:00
Andrei Zmievski
7b4983c8f8 Mega-patch to get better resource information for modules.
* Fixed a bug in zend_rsrc_list_get_rsrc_type()
  * Switched register_list_destructors() to use
    zend_register_list_destructors_ex() instead
  * Updated all relevant modules to provide the resource type name
    to register_list_destructors() call
  * Updated var_dump() to output resource type name instead of number

@- Made resource type names visible, e.g. var_dump() and
@  get_resource_type() display "file" for file resources. (Andrei)
2000-10-20 18:25:16 +00:00
Zeev Suraski
dea72ba6a4 Added mysql_escape_String() 2000-10-11 18:27:21 +00:00
Andi Gutmans
3f80efd660 - Cleanup output functions 2000-09-30 16:14:54 +00:00
Brian Moon
09e00183bd added mysql_fetch_assoc. Acts like mysql_fetch_array used to. 2000-09-20 21:43:57 +00:00
Zeev Suraski
37de6635b4 That's no bug, it's quite fine the way it is (if id is
set to -1, it's ignored, and the passed_id argument is used).

If you're experiencing trouble with mysql_close(), please give me a
reproducing script.  If there's a bug, it's not as simple as that.
2000-07-05 20:41:06 +00:00
Uwe Steinmann
46a9e6c23f - Discoverd possible bug. Could somebody have a look. 2000-07-05 19:48:24 +00:00
Zeev Suraski
f29eae1302 Move timeout code to Zend, allow Win32 timeouts
@- Implemented max_execution_time under Win32 (Zeev)
2000-06-16 01:53:35 +00:00
Zeev Suraski
02d2a5db3a Fix Windows .dsp's 2000-06-11 19:23:21 +00:00
Andi Gutmans
3701bc4207 - ARG_COUNT(ht) -> ZEND_NUM_ARGS() mega patch 2000-06-05 19:47:54 +00:00
Zeev Suraski
950fb739f8 Fix bug #4678 2000-05-29 18:53:42 +00:00
Sascha Schumann
4686a3b50e Use #ifdef COMPILE_DL_EXTNAME solely. 2000-05-23 09:33:51 +00:00
Zeev Suraski
e043439ff6 Update the license with the new clause 6 2000-05-18 15:34:45 +00:00
Andrei Zmievski
fe24b820be @- NULL values are now preserved in the return value of mysql_fetch_array()
@  and mysql_fetch_object(). (Andrei)
2000-05-15 13:46:37 +00:00
Sascha Schumann
fe50664d4d #if COMPILE_DL
becomes

    #if defined(COMPILE_DL) || defined(COMPILE_DL_EXTENSION_NAME)
2000-05-02 00:44:35 +00:00
Sascha Schumann
0d383d9373 Replace the various get_module() functions with a uniform
ZEND_GET_MODULE(name) macro.
2000-05-02 00:30:36 +00:00
Colin Viebrock
a7c8bfb9fb phpinfo() prettying 2000-04-06 21:07:44 +00:00
Colin Viebrock
6882044a46 phpinfo() prettying 2000-04-05 20:18:58 +00:00
Zeev Suraski
491a315c11 @- Made the IMAP and LDAP modules compilable under Windows and thread-safe (Zeev) 2000-04-01 16:23:39 +00:00
Zeev Suraski
a0f70aa618 @- Fix a data corruption bug in mysql_result(), if used in table.fieldname mode (Zeev)
Hopefully that settles this one.
2000-03-26 02:01:11 +00:00
Rasmus Lerdorf
49c32728af Make it possible to specify both a port and a socket in mysql_[p]connect
@ Make it possible to specify both a port and a socket in mysql_[p]connect
2000-03-20 07:40:56 +00:00
Stig Bakken
d02fe90b00 Change extension names in all extensions' zend_module_entry to their
directory name.
2000-03-06 18:44:01 +00:00
Zeev Suraski
bf5cb890b0 - Convert 'PHP3' to 'PHP'
- Avoid declaring crypt() related salt types twice
2000-02-26 03:20:55 +00:00
Zeev Suraski
e3f95d1c5f Win32 compile fix 2000-02-20 07:27:46 +00:00
Evan Klinger
7763337255 Eliminate compile errors relating to signals. 2000-02-20 05:32:51 +00:00
Zeev Suraski
ccaff4461b Win32 compile fix 2000-02-19 23:43:27 +00:00
Zeev Suraski
86fa2aade2 the pipe is breaking all the time 2000-02-19 23:41:32 +00:00
Zeev Suraski
bf25d1cec9 Restore the singal protection in the MySQL module 2000-02-19 22:41:53 +00:00
Andi Gutmans
bbb25255b0 - Update the C file to use PHP_WIN32 2000-02-12 19:47:49 +00:00
Zeev Suraski
6d0ab6166c SAPIfication, Episode VI: Return of the SAPI
Remove mostly all references to APACHE and CGI_BINARY from the code.

- Apache include files are no longer included by any PHP code, except for the Apache SAPI module.
- No server specific code is in any of the base PHP code.

Still left to be done:
- Eliminate any references to APACHE from the few remaining modules.
- Move request_info.c's logic to SAPI
- Modify the regex function names, and globals, so that we can always
  include them, without having to fear any interference with Apache;
  Always use the bundled regex library
2000-02-10 19:41:21 +00:00
Zeev Suraski
39cb8fe0ac Fix PostgreSQL startup routine in thread-safe mode 2000-02-05 17:26:35 +00:00
Zeev Suraski
c12aa454ff Compile fixes 2000-02-05 15:44:20 +00:00