Commit Graph

412 Commits

Author SHA1 Message Date
Markus Fischer
945ccfa76a - Remove superfluous E_WARNING if mysql_connect() fails; there's already
an E_WARNING a few lines above.
2002-10-05 00:54:31 +00:00
Yasuo Ohgaki
1b675aa690 Rename pg_data_seek() to pg_result_seek().
Added mysql_result_seek() which is alias of mysql_data_seek().
2002-10-03 02:32:09 +00:00
Derick Rethans
c57b3c6533 - Un-deprecating mysql_escape_string
#- This will remove the annoying notices, while this function is used in
#  a lot of scripts. There is not reason why we should discontinue it's use
#  as it works perfect for about 99% of the time.
2002-09-11 21:06:52 +00:00
Georg Richter
a9c64d174b - renamed rollback function to _restore_connection_default
- in _restore_connection_default:
  - unset the selected database (thx to Paul DuBois)
  - set session variable autocommit to default (=1)
2002-09-09 15:53:05 +00:00
Georg Richter
0797d5f989 fixed typo 2002-09-06 12:11:30 +00:00
foobar
3bf7519210 @- Added --disable-all configure option. (Jani) 2002-09-04 18:47:28 +00:00
foobar
04bbf46957 Fix bug: #19159, mysql_field_count was available since 3.22.24 2002-08-29 01:17:24 +00:00
Yasuo Ohgaki
d23cb1686d Rename mysql_character_set_name() to mysql_client_encoding(). pg_client_encoding() is available from PHP4.0.3 and this function is available from PHP 4.3.0 2002-08-24 21:41:25 +00:00
Zeev Suraski
4b81d04210 Undeprecate mysql_db_query() 2002-08-24 13:15:35 +00:00
Georg Richter
11bd3c08b6 changed zend_error -> php_error_docref() 2002-08-24 10:53:40 +00:00
Georg Richter
3bd2a54064 changed error messages according to CODING_STANDARDS 2002-08-24 09:27:51 +00:00
Georg Richter
6650761f9b fixed bug #18643 2002-08-23 15:56:34 +00:00
Georg Richter
0c386174db fixed bug #19016
SSL is only available for MYSQL_VERSION_ID >= 40000
2002-08-23 14:10:27 +00:00
Georg Richter
8153dfc877 fixed bug #16965 2002-08-23 10:16:19 +00:00
Derick Rethans
ccf51590b3 - Proper format for CREDITS files 2002-08-21 05:41:49 +00:00
Georg Richter
0019a842b4 forgot to remove another LOCAL_INFILE opion call 2002-08-09 21:13:00 +00:00
Georg Richter
34b166579c fixed bug #18815 2002-08-09 20:38:12 +00:00
Georg Richter
f9e5ba3446 Ups, forgot to remove load_infile tests. Thx to Brad Bulgar 2002-08-08 08:17:24 +00:00
Georg Richter
8f7792a769 added zend_error messages for deprecated functions
inserted zak and me in author list/credits
2002-08-07 22:02:11 +00:00
Georg Richter
f4b4797aa8 removed unsued constants (MYSQL_USE_RESULT and MYSQL_STORE_RESULT) 2002-08-07 21:21:46 +00:00
Georg Richter
cbcdae7002 removed changes for mysql_select_db (optional parameter)
Why:
1) Its not the common way to add additionally functionality for functions or
features which are already implemented in SQL. Therefore also a lot of
mysql functions are marked as deprecated (and will be removed in near future)

2) The implemented workaround works only when mysql_select_db was called
before (fetching the databasename from mysql->conn.db). It returns invalid
or inconsistent results e.g.:

- when "USE databasename" via mysql_query was used
- when database was dropped or grant privileges had changed.

In conjunction with persistent connection, there are also some inconsistencies,
cause mysql_select_db returns the databasename from an old connection.

To determine the database name just use the SQL command "SELECT DATABASE()"
2002-07-21 21:36:10 +00:00
Georg Richter
96276bf8a0 fixed bug in mysql_real_escape_string:
allocated 1 more byte for '\0' terminating character
2002-07-21 20:16:03 +00:00
foobar
dcb0523894 fix protos 2002-07-16 19:26:23 +00:00
Georg Richter
950a576f73 Added support for php.ini parameter "mysql.connect_timeout" 2002-07-16 13:53:54 +00:00
Anantha Kesari H Y
44bbec7acb mysql_create_db and mysql_drop_db disabled for NetWare 2002-07-15 11:14:18 +00:00
foobar
5d001a9ab6 Partially reverted the netware related commit. 2002-07-12 23:25:30 +00:00
foobar
20a735db2c Beauify a bit.. 2002-07-12 22:59:35 +00:00
foobar
21245bcbeb Some ws fixes. And removed the problems causing typedef for ushort. 2002-07-12 22:57:19 +00:00
Anantha Kesari H Y
2af885d467 Added NetWare changes 2002-07-12 12:55:56 +00:00
Georg Richter
05007b0cbb 1) New constants:
MYSQL_CLIENT_SSL for ssl connections
MYSQL_CLIENT_COMPRESS for compressed protocol
MYSQL_CLIENT_IGNORE_SPACES for spaces after function names
MYSQL_CLIENT_INTERACTIVE for closing connections after timeout_interactive seconds

2) Optional parameter client_flags for mysql_connect and mysql_pconnect
For parameter desctiption see 1.
This also should fix bug #13589

3) New internal function _rollback_mysql_transactions, which is called via
PHP_RSHUTDOWN_FUNCTION
This fixes bug #12513
2002-07-10 13:16:24 +00:00
foobar
df9fc2bb51 Fix shared build and made the logic of finding the socket location better. 2002-07-08 15:31:01 +00:00
foobar
316a8b0b4f - Fix annoying redefine warning..
# ZAK! Heads up and fix this in Mysql CVS too.
2002-06-28 08:34:34 +00:00
Derick Rethans
7d4a78bad5 Unify error messages 2002-06-26 08:07:59 +00:00
foobar
73f2ab9951 - Reverted last bogus commit and fixed the credits in NEWS.
# STIG! Do a 'cvs update' before you commit anything!!
2002-06-11 00:18:34 +00:00
Stig Bakken
a4ecce0cd9 @Add --with-mysql-sock option (James Cox) 2002-06-10 21:35:26 +00:00
Markus Fischer
cac49284b4 - Fix win32/mysql.
- Revert cryptic WS commit on php4dllts.dsp.
2002-06-10 15:53:26 +00:00
Harald Radi
d63056b10b fix the build
# these files were blank, i suppose this happened by accident
2002-06-10 13:09:46 +00:00
James Cox
210744928f dont test for the socket -- enables installs over NFS etc.
# my previous commit was the revision before the fixed one (ie, i had the fix) so apologies for that.
2002-06-09 11:43:50 +00:00
Sander Roobol
2f6c2a9b18 Fixed configure stuff
# It didn't work for me... hope it works for everybody now...
2002-06-09 10:46:13 +00:00
foobar
c8bacb7a06 Cleaned up the mess. Now it actually works too.
# TEST BEFORE COMMIT!!
2002-06-09 00:50:46 +00:00
James Cox
00779e5fa3 @ added support for --with-mysql-sock so people can specify it (eg, NFS compiles, etc)
changed the default mysql.sock location to use the one from the RPM. Added /usr/local
  locations to the search list. (imajes)
2002-06-08 11:37:20 +00:00
Zak Greant
9daec6d227 Updating embedded libmysql to version 3.23.48 2002-06-07 15:07:55 +00:00
Zak Greant
4128739695 Minor improvement to error message for mysql_data_seek 2002-05-08 07:38:09 +00:00
foobar
80f9fdf3c7 @- Added optional 3rd parameter to mysql_select_db() which makes it return
@  the previously selected database name. (Jani)
2002-04-28 06:38:12 +00:00
foobar
305260ce4a kill a compile warning 2002-04-28 05:36:05 +00:00
foobar
6147e1e720 Fix bug: #16743 2002-04-27 01:02:52 +00:00
Edin Kadribasic
54440c8bfd Some systems have mysql socket in /var/run/mysql 2002-04-25 21:07:36 +00:00
foobar
e46f57b6fb - Fixed a typo..
# not related to the localhost.localdomain thing..
2002-04-24 18:00:39 +00:00
Sebastian Bergmann
c57ab20ac8 Make use of HAVE_MYSQL. Reviewed by: Sterling. 2002-04-18 16:48:03 +00:00
Andi Gutmans
35befd3eb3 - Fix build with Visual Studio .NET. The MySQL team said they'll commit
- their fix a long time ago and never did. One day they'll update the
- whole MySQL client library.
2002-04-07 20:49:10 +00:00
foobar
a0e3bd8f0e WS fix 2002-03-29 12:56:25 +00:00
Jan Lehnardt
bc19dd6900 - add mysql_info function 2002-03-29 12:47:02 +00:00
Georg Richter
6a0bf08ce3 fixed prototype for mysql_ping 2002-03-25 12:09:38 +00:00
Sterling Hughes
7ae1dd662f more zend_parse_parameters fixup 2002-03-25 01:19:59 +00:00
Sterling Hughes
3c3ae850a2 Fix-up the last fix a bit
Clean up mysql_list_processes
2002-03-25 01:14:30 +00:00
Sterling Hughes
05475d809b clean up mysql_real_escape_string() a bit
# I really think we should just add a database handle
# parameter to mysql_escape_string()
2002-03-25 01:07:23 +00:00
Zak Greant
3fae05b014 Added mysql_table_name() alias for mysql_tablename()
Improved logic of parameter parsing code for mysql_ping
 - made test for no arguments more explicit
 - combined to if blocks into one if/else if block
2002-03-24 23:33:07 +00:00
Sander Roobol
f12dfba7e0 Fixed tiny mistake in proto (tnx to Egon for spotting it). 2002-03-24 18:19:31 +00:00
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
Sascha Schumann
c8ec0fa4bd Fix building mysql client library
Run client lib specific checks only when clientlib is used
Remove second invocation of MYSQL_SOCK
2002-03-20 12:40:27 +00:00
foobar
4597486984 - Fixed (hope so :) like Sascha said. 2002-03-20 12:00:26 +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
jim winstead
d3400b2b5f the 'setup' script was removed more than two years ago.
these can be safely removed from the 4.2 branch, too.
2002-03-16 00:21:40 +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
Sascha Schumann
5b3a5f1e13 nuke old makefiles 2002-03-12 16:54:26 +00:00
Sascha Schumann
9d9d39a0de Please welcome the new build system.
If you encounter any problems, please make sure to email sas@php.net
directly.

An introduction can be found on

http://schumann.cx/buildv5.txt
2002-03-07 14:20:02 +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
Alex Waugh
3b09117535 Cache results of check for int8 2001-12-23 00:41:27 +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
foobar
f1397d5339 Unified the configure messages. 2001-11-30 19:00:13 +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
MySQL Team
e982012daf (PHP mysql_connect) Removed warning message regarding NONEXISTENT character
set, when the server's default character set != latin1.
@- Removed a warning message about a NONEXISTENT character set from
@  mysql_connect(), when the server's default character set != latin1.
2001-11-06 16:59:07 +00:00
Alex Waugh
0bdd62c8ac Make sure uint et al are undefined before typedefing them 2001-11-04 12:38:33 +00:00
Derick Rethans
0f20565919 - Fix for bug #13918 2001-11-03 20:27:09 +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
foobar
ab94fecde3 This propably fixes couple of problems with compiling with external libs. 2001-11-02 01:32:33 +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
Zeev Suraski
1c25b8dd53 Avoid TSRMLS_FETCH()'s, and clean up a bit of stale extern's and layout on the way 2001-07-30 01:56:43 +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
foobar
f61eac29ad Make it possible to build mysql extension as shared module. 2001-06-22 15:03:10 +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
MySQL Team
e8cbbc0637 Upgrade ext/mysql/libmysql to version 3.23.39. No major changes -
portability fixes.

Also add configure test for HAVE_INT_8_16_32 which should solve
compilation problems on AIX.
2001-06-01 20:07:26 +00:00
foobar
56c24c3309 This should finally get rid of those zlib problems. And this is safe too. 2001-05-29 11:59:33 +00:00
foobar
6686f83799 Oops. 2001-05-28 03:18:44 +00:00
foobar
d98f65085b Adding libnsl here causes problems on some systems. 2001-05-28 00:12:29 +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
Sascha Schumann
afdaee9e47 Nuke more quotes 2001-05-12 11:09:05 +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
foobar
da0162a9de Fix the build.
# I promise not to commit if I'm tired.. :(
2001-05-08 11:08:08 +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
foobar
a3c90853a0 Fix bugs: #10642, #10612 2001-05-04 17:57:58 +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
foobar
8a26918ed1 Renamed the AC_ prefixed macros defined in acinclude.m4 to PHP_* prefixes.
# Heads up people! I tested this before committing but you never know..
2001-03-27 20:35:04 +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
foobar
3db6f55748 This should fix the problems with not including -lz. 2001-03-10 17:33:33 +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
Sebastian Bergmann
f703c4e178 Added my_winthread.c. Thanks to Thimble Smith. 2001-01-24 21:08:12 +00:00
MySQL Team
5073b97ffb Don't #define HAVE_COMPRESS on windows. 2001-01-24 18:11:25 +00:00
MySQL Team
800f555b70 Upgrade ext/mysql/libmysql to version 3.23.32. One notable bug fix is
that the client can now connect to a server which is using a default
charset other than latin1.
2001-01-23 16:48:50 +00:00
Rasmus Lerdorf
83cf6629ec @BeOS patch from svanegmond@bang.dhs.org modified somewhat by Rasmus
BeOS patch from svanegmond@bang.dhs.org modified somewhat by Rasmus
2001-01-21 17:29:15 +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
a697d076bc Add Release_TSDbg support. This mode compiles PHP with the release C runtime,
but with optimizations disabled and with debug info.  Some crashes can only
be debugged using this mode.
2000-12-26 22:15:32 +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
foobar
358731195f Fix bug #7034 2000-11-21 11:07:50 +00:00