124018 2013-11-07 15:42:01 -0800 Enhance SQL journal_mode setting code to be less likely to log an error 2013-11-07 22:06:47 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson commit-queue oldest_to_newest 948448 0 beidson 2013-11-07 15:42:01 -0800 Enhance SQL journal_mode setting code to be less likely to log an error Even though the docs says SQLITE_ROW will always be returned, apparently SQLITE_OK is sometimes returned. Change the code to handle that. 948451 1 beidson 2013-11-07 15:43:47 -0800 In radar as <rdar://problem/15418577> 948453 2 216339 beidson 2013-11-07 15:44:07 -0800 Created attachment 216339 Patch v1 948547 3 216339 commit-queue 2013-11-07 22:06:45 -0800 Comment on attachment 216339 Patch v1 Clearing flags on attachment: 216339 Committed r158906: <http://trac.webkit.org/changeset/158906> 948548 4 commit-queue 2013-11-07 22:06:47 -0800 All reviewed patches have been landed. Closing bug. 216339 2013-11-07 15:44:07 -0800 2013-11-07 22:06:45 -0800 Patch v1 patch text/plain 2087 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4ZTYzOTY2Li4wNjE3ZjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTMtMTEtMDcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIEVuaGFuY2UgU1FMIGpvdXJuYWxfbW9kZSBzZXR0aW5nIGNvZGUgdG8gYmUgbGVzcyBsaWtl bHkgdG8gbG9nIGFuIGVycm9yLgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTU0MTg1Nzc+IGFu ZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0MDE4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXZlbiB0aG91Z2ggdGhl IGRvY3Mgc2F5cyBTUUxJVEVfUk9XIHdpbGwgYWx3YXlzIGJlIHJldHVybmVkLCBhcHBhcmVudGx5 IFNRTElURV9PSyBpcyBzb21ldGltZXMgcmV0dXJuZWQuCisgICAgICAgIENoYW5nZSB0aGUgY29k ZSB0byBoYW5kbGUgdGhhdC4KKworICAgICAgICAqIHBsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFz ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxpdGVEYXRhYmFzZTo6b3Blbik6IFNhdmUgdGhl IHN0YXRlbWVudCByZXN1bHQgdmFsdWUsIGFuZCBhY2NlcHQgU1FMSVRFX09LIGFzIGEgbm9uLWVy cm9yIGNvbmRpdGlvbi4KKwogMjAxMy0xMS0wNyAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29u QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgbnByLm9yZyBzcGVjaWZpYyBoYWNrIGluIEhU TUxNZWRpYUVsZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9T UUxpdGVEYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRGF0 YWJhc2UuY3BwCmluZGV4IDE3MTQ4MTguLmEyZTU3YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcApAQCAtOTksMTMgKzk5LDE2IEBAIGJvb2wg U1FMaXRlRGF0YWJhc2U6Om9wZW4oY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgYm9vbCBmb3JXZWJT UUxEYXRhYmFzZSkKICAgICAgICAgTE9HX0VSUk9SKCJTUUxpdGUgZGF0YWJhc2UgY291bGQgbm90 IHNldCB0ZW1wX3N0b3JlIHRvIG1lbW9yeSIpOwogCiAgICAgU1FMaXRlU3RhdGVtZW50IHdhbFN0 YXRlbWVudCgqdGhpcywgQVNDSUlMaXRlcmFsKCJQUkFHTUEgam91cm5hbF9tb2RlPVdBTDsiKSk7 Ci0gICAgaWYgKHdhbFN0YXRlbWVudC5zdGVwKCkgIT0gU1FMSVRFX1JPVykKKyAgICBpbnQgcmVz dWx0ID0gd2FsU3RhdGVtZW50LnN0ZXAoKTsKKyAgICBpZiAocmVzdWx0ICE9IFNRTElURV9PSyAm JiByZXN1bHQgIT0gU1FMSVRFX1JPVykKICAgICAgICAgTE9HX0VSUk9SKCJTUUxpdGUgZGF0YWJh c2UgZmFpbGVkIHRvIHNldCBqb3VybmFsX21vZGUgdG8gV0FMLCBlcnJvcjogJXMiLCAgbGFzdEVy cm9yTXNnKCkpOwogCiAjaWZuZGVmIE5ERUJVRwotICAgIFN0cmluZyBtb2RlID0gd2FsU3RhdGVt ZW50LmdldENvbHVtblRleHQoMCk7Ci0gICAgaWYgKCFlcXVhbElnbm9yaW5nQ2FzZShtb2RlLCAi d2FsIikpCi0gICAgICAgIExPR19FUlJPUigiam91cm5hbF9tb2RlIG9mIGRhdGFiYXNlIHNob3Vs ZCBiZSAnd2FsJywgYnV0IGlzICclcyciLCBtb2RlLnV0ZjgoKS5kYXRhKCkpOworICAgIGlmIChy ZXN1bHQgPT0gU1FMSVRFX1JPVykgeworICAgICAgICBTdHJpbmcgbW9kZSA9IHdhbFN0YXRlbWVu dC5nZXRDb2x1bW5UZXh0KDApOworICAgICAgICBpZiAoIWVxdWFsSWdub3JpbmdDYXNlKG1vZGUs ICJ3YWwiKSkKKyAgICAgICAgICAgIExPR19FUlJPUigiam91cm5hbF9tb2RlIG9mIGRhdGFiYXNl IHNob3VsZCBiZSAnd2FsJywgYnV0IGlzICclcyciLCBtb2RlLnV0ZjgoKS5kYXRhKCkpOworICAg IH0KICNlbmRpZgogCiAgICAgcmV0dXJuIGlzT3BlbigpOwo=