adodb PHP Database Abstraction Layer https://git.rdm1.uk/adodb/.git/atom?h=v5.22.11-lsc 2023-05-22T13:00:19Z 2023-05-22T13:00:19Z Damien Regad dregad@mantisbt.org 2023-05-22T11:43:31Z urn:sha1:e631bd9cef081f7e235bb90b9db17440e20d4f58 2022-01-16T17:23:45Z Damien Regad dregad@mantisbt.org 2021-10-25T17:05:43Z urn:sha1:c89ce556bd5f60a9dc337a3c809163c20c4208a9 2021-08-23T07:08:14Z peterdd ddpm@liscovius.de 2021-08-23T07:08:14Z urn:sha1:a0bd81882d65eb9ccd40dcbe53b63a6e0bf15b96 2021-08-16T22:48:04Z Damien Regad dregad@mantisbt.org 2021-08-16T22:48:04Z urn:sha1:d558d101c514beeb8c91f65ae61d106b201dc472 Try to do it right this time... # Conflicts: # adodb-memcache.lib.inc.php Fixes #751 2021-08-16T22:31:23Z Damien Regad dregad@mantisbt.org 2021-08-16T22:31:23Z urn:sha1:eea4fc59246a14083e07949e4d54ac806ebbacce Fixes #751 2021-08-16T22:30:04Z Damien Regad dregad@mantisbt.org 2021-08-16T22:30:04Z urn:sha1:507466ef798b18a3a8830230cfcd51bb488513cf The conflicts resolution applied when merging the Standardized file headers (commit e9dcce3df24912ad869d0193f0b419f2309101fc) was seriously messed up, actually overwriting a number of changes in the master branch. Rather than trying to go and fix things one by one which has a high risk of messing things further, it's easier to redo the merge from a clean slate, so this commit reverts the following: - "Merge branch 'hotfix/5.21' Standardized file headers", e9dcce3df24912ad869d0193f0b419f2309101fc - "Merge tag 'v5.21.1'", 5f437df3104159d5d659f60e31bef8d33c34995f - "Reset version to 5.22.0-dev" af9234a525c3255af051a330164486d73be4c63a - "Fix incorrect resolution of merge conflicts" a6733f61b0165b366c8d2c70d9af82edc3881951. - "Fix syntax error in toexport.inc.php" 20b01e83cb61b6b2460f64c7d1277c5f4cc28574. Fixes #751 2021-08-15T11:39:44Z Damien Regad dregad@mantisbt.org 2021-08-15T11:39:44Z urn:sha1:e9dcce3df24912ad869d0193f0b419f2309101fc # Conflicts: # adodb-active-record.inc.php # adodb-active-recordx.inc.php # adodb-csvlib.inc.php # adodb-datadict.inc.php # adodb-error.inc.php # adodb-errorhandler.inc.php # adodb-errorpear.inc.php # adodb-exceptions.inc.php # adodb-iterator.inc.php # adodb-loadbalancer.inc.php # adodb-memcache.lib.inc.php # adodb-pager.inc.php # adodb-pear.inc.php # adodb-perf.inc.php # adodb-php4.inc.php # adodb-time.inc.php # adodb.inc.php # datadict/datadict-access.inc.php # datadict/datadict-db2.inc.php # datadict/datadict-firebird.inc.php # datadict/datadict-generic.inc.php # datadict/datadict-ibase.inc.php # datadict/datadict-informix.inc.php # datadict/datadict-mssql.inc.php # datadict/datadict-mssqlnative.inc.php # datadict/datadict-mysql.inc.php # datadict/datadict-oci8.inc.php # datadict/datadict-postgres.inc.php # datadict/datadict-sapdb.inc.php # datadict/datadict-sqlite.inc.php # datadict/datadict-sybase.inc.php # drivers/adodb-access.inc.php # drivers/adodb-ado.inc.php # drivers/adodb-ado5.inc.php # drivers/adodb-ado_access.inc.php # drivers/adodb-ado_mssql.inc.php # drivers/adodb-borland_ibase.inc.php # drivers/adodb-csv.inc.php # drivers/adodb-db2.inc.php # drivers/adodb-db2oci.inc.php # drivers/adodb-db2ora.inc.php # drivers/adodb-fbsql.inc.php # drivers/adodb-firebird.inc.php # drivers/adodb-ibase.inc.php # drivers/adodb-informix.inc.php # drivers/adodb-informix72.inc.php # drivers/adodb-ldap.inc.php # drivers/adodb-mssql.inc.php # drivers/adodb-mssqlnative.inc.php # drivers/adodb-mssqlpo.inc.php # drivers/adodb-mysql.inc.php # drivers/adodb-mysqli.inc.php # drivers/adodb-mysqlpo.inc.php # drivers/adodb-mysqlt.inc.php # drivers/adodb-netezza.inc.php # drivers/adodb-oci8.inc.php # drivers/adodb-oci805.inc.php # drivers/adodb-oci8po.inc.php # drivers/adodb-oci8quercus.inc.php # drivers/adodb-odbc.inc.php # drivers/adodb-odbc_db2.inc.php # drivers/adodb-odbc_mssql.inc.php # drivers/adodb-odbc_oracle.inc.php # drivers/adodb-odbtp.inc.php # drivers/adodb-odbtp_unicode.inc.php # drivers/adodb-oracle.inc.php # drivers/adodb-pdo.inc.php # drivers/adodb-pdo_dblib.inc.php # drivers/adodb-pdo_firebird.inc.php # drivers/adodb-pdo_mssql.inc.php # drivers/adodb-pdo_mysql.inc.php # drivers/adodb-pdo_oci.inc.php # drivers/adodb-pdo_pgsql.inc.php # drivers/adodb-pdo_sqlite.inc.php # drivers/adodb-postgres.inc.php # drivers/adodb-postgres64.inc.php # drivers/adodb-postgres7.inc.php # drivers/adodb-postgres8.inc.php # drivers/adodb-postgres9.inc.php # drivers/adodb-proxy.inc.php # drivers/adodb-sapdb.inc.php # drivers/adodb-sqlanywhere.inc.php # drivers/adodb-sqlite3.inc.php # drivers/adodb-sqlitepo.inc.php # drivers/adodb-sybase.inc.php # drivers/adodb-sybase_ase.inc.php # drivers/adodb-text.inc.php # drivers/adodb-vfp.inc.php # pear/Auth/Container/ADOdb.php # perf/perf-db2.inc.php # perf/perf-informix.inc.php # perf/perf-mssql.inc.php # perf/perf-mssqlnative.inc.php # perf/perf-mysql.inc.php # perf/perf-oci8.inc.php # perf/perf-postgres.inc.php # pivottable.inc.php # rsfilter.inc.php # server.php # session/adodb-compress-bzip2.php # session/adodb-compress-gzip.php # session/adodb-cryptsession.php # session/adodb-cryptsession2.php # session/adodb-encrypt-mcrypt.php # session/adodb-encrypt-md5.php # session/adodb-encrypt-secret.php # session/adodb-session-clob.php # session/adodb-session-clob2.php # session/adodb-session.php # session/adodb-session2.php # session/old/adodb-cryptsession.php # session/old/adodb-session-clob.php # session/old/adodb-session.php # tests/benchmark.php # tests/client.php # tests/test-datadict.php # tests/test-php5.php # tests/test.php # tests/test3.php # tests/test4.php # tests/test5.php # tests/testcache.php # tests/testdatabases.inc.php # tests/testmssql.php # tests/testoci8.php # tests/testoci8cursor.php # tests/testpaging.php # tests/testpear.php # toexport.inc.php # tohtml.inc.php 2021-08-14T11:09:23Z Damien Regad dregad@mantisbt.org 2021-04-30T17:20:12Z urn:sha1:466a86580025ff840414715c137adadfbd7b9070 2021-03-08T17:38:28Z Damien Regad dregad@mantisbt.org 2021-03-08T17:38:28Z urn:sha1:27a03b4aa9f01924741c77d8fbe0df3d44374cef 2021-02-27T11:38:53Z Damien Regad dregad@mantisbt.org 2021-02-27T11:38:53Z urn:sha1:199391f639a0b3346a80d66c00c87230fa3e6a07