Stanislav Malyshev
a3322f8927
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
andrey
dec56ca1e3
Merge branch 'PHP-5.4'
2012-05-16 16:00:17 +02:00
andrey
4d2d8e8717
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/mysqlnd/mysqlnd_ps.c
merge fix for bug#62046
2012-05-16 15:59:39 +02:00
andrey
d4afbd487a
Fix for bug#62046
...
Bug#62046 mysqli@mysqlnd can't iterate over stored sets after call to
mysqli_stmt_reset().
Stmt's state was changed to STMT_PREPARED and leads the driver to think
that the stmt was just prepared. Because result set exist also for only
prepared but not executed sets, the check for stmt->result isn't any good.
There is a result set, because as response for COM_PREPARE the server sends
metadata and metadata is part of a result set. After COM_EXECUTE the server
sends metadata again, which could be different and in this case more correct.
2012-05-16 14:28:55 +02:00
zoe slattery
129c830562
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Changes to remaining two tests, #62022
2012-05-15 14:40:49 +01:00
zoe slattery
63401268db
Changes to remaining two tests, #62022
2012-05-15 14:39:51 +01:00
andrey
b850fa14e0
phoenix from the ashes
2012-05-03 13:34:26 +02:00
andrey
522595086b
Remove support for local infile handler in mysqli from 5.5
...
This removes the following functions from the API:
mysqli_set_local_infile_default()
mysqli_set_local_infile_handler()
Using these functions is known to be lead to stability problems in
mysqli. It was only enabled when compiling against libmysql. mysqlnd
doesn't have this support for local infile. However, with mysqlnd it can
be emulated by using stream handlers like in:
$c->query("LOAD DATA LOCAL INFILE "http://example.com/import.csv " INTO ...")
All available protocols, as well as user implemented ones can be added.
2012-05-03 12:55:03 +02:00
andrey
57f7bd0d85
remove dead and unused for more than 8 years code
2012-05-03 12:22:25 +02:00
Ulf Wendel
8665e02ccd
Test for MySQL version.Variable is deprecated in MySQL 5.6.
2012-03-14 14:55:09 +00:00
Ulf Wendel
18a4e93877
Test for MySQL version.Variable is deprecated in MySQL 5.6.
2012-03-14 14:55:09 +00:00
Ulf Wendel
0fde9acd12
Test for MySQL version.Variable is deprecated in MySQL 5.6.
2012-03-14 14:55:09 +00:00
Johannes Schlüter
ecf87a96b9
Use correct property ctor, should fix threading issue in bug #55334
...
# The code was refactored in 5_4/trunk, no need to merge
2012-03-08 12:52:12 +00:00
Johannes Schlüter
512fdb4cc2
Fix bug #61003 mysql_stat() require a valid connection
2012-03-06 00:15:40 +00:00
Johannes Schlüter
0aa45f4a2a
Fix bug #61003 mysql_stat() require a valid connection
2012-03-06 00:15:40 +00:00
Johannes Schlüter
a845e7bc08
Fix bug #61003 mysql_stat() require a valid connection
2012-03-06 00:15:40 +00:00
Xinchen Hui
19a663d02d
unnecessay slash
2012-01-17 14:32:01 +00:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Andrey Hristov
4dfd69e84b
fix for 5.5.19
2011-12-14 19:29:45 +00:00
Andrey Hristov
e385335db2
fix for 5.5.19
2011-12-14 19:29:45 +00:00
Andrey Hristov
2f0d084ab8
fix for 5.5.19
2011-12-14 19:29:45 +00:00
Andrey Hristov
9e14665237
another fix
2011-12-14 19:28:41 +00:00
Andrey Hristov
d671f26c46
another fix
2011-12-14 19:28:41 +00:00
Andrey Hristov
f16c10898b
another fix
2011-12-14 19:28:41 +00:00
Andrey Hristov
b8697d07f8
fix test
2011-12-14 18:37:49 +00:00
Andrey Hristov
7512b84a20
fix test
2011-12-14 18:37:49 +00:00
Andrey Hristov
536e675bfa
fix test
2011-12-14 18:37:49 +00:00
Andrey Hristov
3ef71f9726
fix test
2011-12-14 18:36:04 +00:00
Andrey Hristov
727731cf98
fix test
2011-12-14 18:36:04 +00:00
Andrey Hristov
63ded0f5e9
fix test
2011-12-14 18:36:04 +00:00
Andrey Hristov
9033d60caf
fix typo
2011-12-14 17:59:11 +00:00
Andrey Hristov
0d2af0c3ee
fix typo
2011-12-14 17:59:11 +00:00
Andrey Hristov
8a65304a01
fix typo
2011-12-14 17:59:11 +00:00
Andrey Hristov
e38daffe60
fix test
2011-12-14 16:27:52 +00:00
Andrey Hristov
141905ce54
fix test
2011-12-14 16:27:52 +00:00
Andrey Hristov
e82bbe91c5
fix test
2011-12-14 16:27:52 +00:00
Ulf Wendel
0f799cc410
Good to fix something, but don't forget to update tests
2011-11-23 17:30:59 +00:00
Ulf Wendel
1d1d88bec0
Good to fix something, but don't forget to update tests
2011-11-23 17:23:57 +00:00
Ulf Wendel
2bfd24071b
Always good to fix something, but don't forget to update tests
2011-11-23 17:01:09 +00:00
Ulf Wendel
87a1c1bf47
Fix test
2011-11-23 16:47:22 +00:00
Ulf Wendel
77025b71e1
Fix test
2011-11-23 16:47:22 +00:00
Ulf Wendel
b5054a7c7b
Fix test
2011-11-23 16:47:22 +00:00
Ulf Wendel
9475362f99
Message can vary depending on server version
2011-11-23 16:38:50 +00:00
Ulf Wendel
785b68a109
Message can vary depending on server version
2011-11-23 16:38:50 +00:00
Ulf Wendel
6c1f4e58ce
Message can vary depending on server version
2011-11-23 16:38:50 +00:00
Ulf Wendel
a6502de5d0
Skipping with libmysql. If a documentation points to more or less unmaintained wiki contents, I take it as a request to stop testing a feature. Can't tell if I get false positive, hit a bug or not. This is not libmysql testing. Its PHP MySQL API testing.
2011-11-22 16:52:42 +00:00
Ulf Wendel
09a9df8d59
Skipping with libmysql. If a documentation points to more or less unmaintained wiki contents, I take it as a request to stop testing a feature. Can't tell if I get false positive, hit a bug or not. This is not libmysql testing. Its PHP MySQL API testing.
2011-11-22 16:52:42 +00:00
