diff --git a/.bzrignore b/.bzrignore new file mode 100644 index 0000000..582f778 --- /dev/null +++ b/.bzrignore @@ -0,0 +1,20 @@ +mydumper +myloader +*~ +*.dSYM +export +CMakeCache.txt +CMakeFiles/ +Makefile +cmake_install.cmake +config.h +docs/CMakeFiles/ +docs/Makefile +docs/_doctrees/ +docs/_sources/ +docs/cmake_install.cmake +docs/html/ +docs/man/ +docs/_build/conf.py +docs/_build/sources.cmake +.project diff --git a/CMakeLists.txt b/CMakeLists.txt index 5da3828..6c99943 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) project(mydumper) -set(VERSION 0.9.1) +set(VERSION 0.9.5) set(ARCHIVE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}") #Required packages @@ -17,6 +17,7 @@ if (BUILD_DOCS) endif (BUILD_DOCS) option(WITH_BINLOG "Build binlog dump options" OFF) +option(WITH_SSL "Build SSL support" ON) set(CMAKE_C_FLAGS "-Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -Werror -O3 -g ${MYSQL_CFLAGS}") @@ -31,15 +32,16 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DI if (WITH_BINLOG) - add_executable(mydumper mydumper.c binlog.c server_detect.c g_unix_signal.c) + + add_executable(mydumper mydumper.c binlog.c server_detect.c g_unix_signal.c connection.c getPassword.c) else (WITH_BINLOG) - add_executable(mydumper mydumper.c server_detect.c g_unix_signal.c) + add_executable(mydumper mydumper.c server_detect.c g_unix_signal.c connection.c getPassword.c) endif (WITH_BINLOG) -target_link_libraries(mydumper ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES}) +target_link_libraries(mydumper ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES} stdc++) -add_executable(myloader myloader.c) -target_link_libraries(myloader ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES}) +add_executable(myloader myloader.c connection.c getPassword.c) +target_link_libraries(myloader ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES} stdc++) INSTALL(TARGETS mydumper myloader RUNTIME DESTINATION bin diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9cecc1d --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README b/README.md similarity index 68% rename from README rename to README.md index 38104c2..a032440 100644 --- a/README +++ b/README.md @@ -1,15 +1,35 @@ -== What is mydumper? Why? == +# What is mydumper? Why? * Parallelism (hence, speed) and performance (avoids expensive character set conversion routines, efficient code overall) * Easier to manage output (separate files for tables, dump metadata, etc, easy to view/parse data) * Consistency - maintains snapshot across all threads, provides accurate master and slave log positions, etc * Manageability - supports PCRE for specifying database and tables inclusions and exclusions -== How to build it? == +## How to install mydumper/myloader? + +First get the correct url from the [releases section](https://github.com/maxbube/mydumper/releases) then: + +### RedHat / Centos + +```bash +yum install https://github.com/maxbube/mydumper/releases/download/v0.9.5/mydumper-0.9.5-1.el7.x86_64.rpm +``` + +### Ubuntu / Debian + +```bash +wget https://github.com/maxbube/mydumper/releases/download/v0.9.5/mydumper_0.9.5-1.xenial_amd64.deb +dpkg -i mydumper_0.9.5-1.xenial_amd64.deb +``` + +## How to build it? Run: - cmake . - make + +```bash +cmake . +make +``` One needs to install development versions of required libaries (MySQL, GLib, ZLib, PCRE): NOTE: you must use the correspondent mysql devel package. @@ -24,7 +44,9 @@ One has to make sure, that pkg-config, mysql_config, pcre-config are all in $PAT Binlog dump is disabled by default to compile with it you need to add -DWITH_BINLOG=ON to cmake options -== How does consistent snapshot work? == +To build against mysql libs < 5.7 you need to disable SSL adding -DWITH_SSL=OFF + +## How does consistent snapshot work? This is all done following best MySQL practices and traditions: @@ -37,11 +59,25 @@ This is all done following best MySQL practices and traditions: This for now does not provide consistent snapshots for non-transactional engines - support for that is expected in 0.2 :) -== How to exclude (or include) databases? == +## How to exclude (or include) databases? Once can use --regex functionality, for example not to dump mysql and test databases: - mydumper --regex '^(?!(mysql|test))' +```bash + mydumper --regex '^(?!(mysql\.|test\.))' +``` + +To dump only mysql and test databases: + +```bash + mydumper --regex '^(mysql\.|test\.)' +``` + +To not dump all databases starting with test: + +```bash + mydumper --regex '^(?!(test))' +``` Of course, regex functionality can be used to describe pretty much any list of tables. diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake index ef64646..23470a8 100644 --- a/cmake/modules/FindMySQL.cmake +++ b/cmake/modules/FindMySQL.cmake @@ -84,7 +84,7 @@ find_path(MYSQL_INCLUDE_DIR mysql.h ) set(TMP_MYSQL_LIBRARIES "") -set(CMAKE_FIND_LIBRARY_SUFFIXES .so .a .lib) +set(CMAKE_FIND_LIBRARY_SUFFIXES .so .a .lib .so.1) foreach(MY_LIB ${MYSQL_ADD_LIBRARIES}) find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB} HINTS diff --git a/common.h b/common.h index 63528a5..4664f50 100644 --- a/common.h +++ b/common.h @@ -22,23 +22,44 @@ char *username=NULL; char *password=NULL; char *socket_path=NULL; char *db=NULL; -guint port=3306; +char *defaults_file=NULL; +#ifdef WITH_SSL +char *key=NULL; +char *cert=NULL; +char *ca=NULL; +char *capath=NULL; +char *cipher=NULL; +#endif + +gboolean askPassword=FALSE; +guint port=0; guint num_threads= 4; guint verbose=2; +gboolean ssl= FALSE; gboolean compress_protocol= FALSE; gboolean program_version= FALSE; GOptionEntry common_entries[] = { { "host", 'h', 0, G_OPTION_ARG_STRING, &hostname, "The host to connect to", NULL }, - { "user", 'u', 0, G_OPTION_ARG_STRING, &username, "Username with privileges to run the dump", NULL }, + { "user", 'u', 0, G_OPTION_ARG_STRING, &username, "Username with the necessary privileges", NULL }, { "password", 'p', 0, G_OPTION_ARG_STRING, &password, "User password", NULL }, + { "ask-password", 'a', 0, G_OPTION_ARG_NONE, &askPassword, "Prompt For User password", NULL }, { "port", 'P', 0, G_OPTION_ARG_INT, &port, "TCP/IP port to connect to", NULL }, { "socket", 'S', 0, G_OPTION_ARG_STRING, &socket_path, "UNIX domain socket file to use for connection", NULL }, { "threads", 't', 0, G_OPTION_ARG_INT, &num_threads, "Number of threads to use, default 4", NULL }, { "compress-protocol", 'C', 0, G_OPTION_ARG_NONE, &compress_protocol, "Use compression on the MySQL connection", NULL }, - { "version", 'V', 0, G_OPTION_ARG_NONE, &program_version, "Show the program version and exit", NULL }, - { "verbose", 'v', 0, G_OPTION_ARG_INT, &verbose, "Verbosity of output, 0 = silent, 1 = errors, 2 = warnings, 3 = info, default 2", NULL }, + { "version", 'V', 0, G_OPTION_ARG_NONE, &program_version, "Show the program version and exit", NULL }, + { "verbose", 'v', 0, G_OPTION_ARG_INT, &verbose, "Verbosity of output, 0 = silent, 1 = errors, 2 = warnings, 3 = info, default 2", NULL }, + { "defaults-file", 0, 0, G_OPTION_ARG_FILENAME, &defaults_file, "Use a specific defaults file", NULL }, +#ifdef WITH_SSL + { "ssl", 0, 0, G_OPTION_ARG_NONE, &ssl, "Connect using SSL", NULL}, + { "key", 0, 0, G_OPTION_ARG_STRING, &key, "The path name to the key file", NULL }, + { "cert", 0, 0, G_OPTION_ARG_STRING, &cert, "The path name to the certificate file", NULL }, + { "ca", 0, 0, G_OPTION_ARG_STRING, &ca, "The path name to the certificate authority file", NULL }, + { "capath", 0, 0, G_OPTION_ARG_STRING, &capath, "The path name to a directory that contains trusted SSL CA certificates in PEM format", NULL }, + { "cipher", 0, 0, G_OPTION_ARG_STRING, &cipher, "A list of permissible ciphers to use for SSL encryption", NULL }, +#endif { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL } }; diff --git a/config.h.in b/config.h.in index 0c76528..5fc2629 100644 --- a/config.h.in +++ b/config.h.in @@ -4,4 +4,14 @@ #cmakedefine VERSION "@VERSION@" #cmakedefine WITH_BINLOG +#if defined(LIBMYSQL_VERSION) +#define MYSQL_VERSION_STR LIBMYSQL_VERSION +#elif defined(MARIADB_CLIENT_VERSION_STR) +#define MYSQL_VERSION_STR MARIADB_CLIENT_VERSION_STR +#elif defined(MYSQL_VERSION_NUMBER) +#define MYSQL_VERSION_STR MYSQL_VERSION_NUMBER +#else +#define MYSQL_VERSION_STR MYSQL_SERVER_VERSION +#endif + #endif diff --git a/connection.c b/connection.c new file mode 100644 index 0000000..85f67f3 --- /dev/null +++ b/connection.c @@ -0,0 +1,54 @@ +/* + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Authors: Aaron Brady, Shopify (insom) +*/ + +#include +#include +#include +#include "connection.h" + +extern char *defaults_file; +#ifdef WITH_SSL +extern char *key; +extern char *cert; +extern char *ca; +extern char *capath; +extern char *cipher; +extern gboolean ssl; +#endif +extern guint compress_protocol; + +void configure_connection(MYSQL *conn, const char *name) { + if (defaults_file != NULL) { + mysql_options(conn,MYSQL_READ_DEFAULT_FILE,defaults_file); + } + mysql_options(conn, MYSQL_READ_DEFAULT_GROUP, name); + + if (compress_protocol) + mysql_options(conn, MYSQL_OPT_COMPRESS, NULL); + +#ifdef WITH_SSL + unsigned int i; + if (ssl) { + i = SSL_MODE_REQUIRED; + } else { + i = SSL_MODE_DISABLED; + } + + mysql_ssl_set(conn,key,cert,ca,capath,cipher); + mysql_options(conn,MYSQL_OPT_SSL_MODE,&i); +#endif +} diff --git a/connection.h b/connection.h new file mode 100644 index 0000000..b3b2c68 --- /dev/null +++ b/connection.h @@ -0,0 +1,22 @@ +/* + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Authors: Aaron Brady, Shopify (insom) +*/ +#ifndef _connection_h +#define _connection_h +#include + +void configure_connection(MYSQL *conn, const char* name); +#endif diff --git a/docs/examples.rst b/docs/examples.rst index 14f74ef..e955a94 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -13,7 +13,7 @@ To use :program:`mydumper`'s regex feature simply use the :option:`--regex ` option. In the following example mydumper will ignore the ``test`` and ``mysql`` databases:: - mydumper --regex '^(?!(mysql|test))' + mydumper --regex '^(?!(mysql\.|test\.))' Restoring a dump ---------------- diff --git a/docs/mydumper_usage.rst b/docs/mydumper_usage.rst index fa35287..ce6e3af 100644 --- a/docs/mydumper_usage.rst +++ b/docs/mydumper_usage.rst @@ -32,6 +32,10 @@ The :program:`mydumper` tool has several available options: Show help text +.. option:: --defaults-file + + Use the given option file. If the file does not exist or is otherwise inaccessible, no failure occurs + .. option:: --host, -h Hostname of MySQL server to connect to (default localhost) @@ -101,6 +105,11 @@ The :program:`mydumper` tool has several available options: A regular expression to match against database and table +.. option:: --omit-from-file, -O + + File containing a list of database.table entries to skip, one per line; the + skipped entries have precedence over patterns specified by the regex option + .. option:: --ignore-engines, -i Comma separated list of storage engines to ignore @@ -125,6 +134,10 @@ The :program:`mydumper` tool has several available options: Dump stored procedures and functions +.. option:: --no-views, -W + + Do not dump views + .. option:: --long-query-guard, -l Timeout for long query execution in seconds, default 60 @@ -168,6 +181,10 @@ The :program:`mydumper` tool has several available options: This will cause inconsistent backups. +.. option:: --no-backup-locks + + Do not use Percona Backup Locks + .. option:: --[skip-]tz-utc SET TIME_ZONE='+00:00' at top of dump to allow dumping of TIMESTAMP data @@ -191,3 +208,7 @@ The :program:`mydumper` tool has several available options: .. option:: --use-savepoints Use savepoints to reduce metadata locking issues, needs SUPER privilege + +.. option:: --complete-insert + + Use complete INSERT statements that include column names. diff --git a/docs/myloader_usage.rst b/docs/myloader_usage.rst index 286eedd..2b8c633 100644 --- a/docs/myloader_usage.rst +++ b/docs/myloader_usage.rst @@ -25,6 +25,10 @@ The :program:`myloader` tool has several available options: Show help text +.. option:: --defaults-file + + Use the given option file. If the file does not exist or is otherwise inaccessible, no failure occurs + .. option:: --host, -h Hostname of MySQL server to connect to (default localhost) diff --git a/getPassword.c b/getPassword.c new file mode 100644 index 0000000..9c8324e --- /dev/null +++ b/getPassword.c @@ -0,0 +1,10 @@ +#include +#include +#include "getPassword.h" + +char* passwordPrompt(void) { + char *password; + password = getpass("Enter MySQL Password: "); + + return password; +} diff --git a/getPassword.h b/getPassword.h new file mode 100644 index 0000000..b539280 --- /dev/null +++ b/getPassword.h @@ -0,0 +1,4 @@ +#ifndef GET_PASSWORD_PROMPT + #define GET_PASSWORD_PROMPT + char* passwordPrompt(void); +#endif diff --git a/mydumper.c b/mydumper.c index 7d282d9..0f4303b 100644 --- a/mydumper.c +++ b/mydumper.c @@ -22,6 +22,11 @@ #define _FILE_OFFSET_BITS 64 #include + +#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION + #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR +#endif + #include #include #include @@ -41,9 +46,11 @@ #include "mydumper.h" #endif #include "server_detect.h" +#include "connection.h" #include "common.h" #include "g_unix_signal.h" #include +#include "getPassword.h" char *regexstring=NULL; @@ -53,6 +60,11 @@ const char BINLOG_DIRECTORY[]= "binlog_snapshot"; const char DAEMON_BINLOGS[]= "binlogs"; #endif +/* Some earlier versions of MySQL do not yet define MYSQL_TYPE_JSON */ +#ifndef MYSQL_TYPE_JSON +#define MYSQL_TYPE_JSON 245 +#endif + static GMutex * init_mutex = NULL; /* Program options */ @@ -77,6 +89,8 @@ gchar *ignore_engines= NULL; char **ignore= NULL; gchar *tables_list= NULL; +GSequence *tables_skiplist= NULL; +gchar *tables_skiplist_file= NULL; char **tables= NULL; GList *no_updated_tables=NULL; @@ -95,9 +109,13 @@ gboolean no_locks= FALSE; gboolean dump_triggers= FALSE; gboolean dump_events= FALSE; gboolean dump_routines= FALSE; +gboolean no_dump_views= FALSE; gboolean less_locking = FALSE; gboolean use_savepoints = FALSE; gboolean success_on_1146 = FALSE; +gboolean no_backup_locks = FALSE; +gboolean insert_ignore = FALSE; + GList *innodb_tables= NULL; GList *non_innodb_table= NULL; @@ -109,6 +127,7 @@ gint non_innodb_done= 0; guint less_locking_threads = 0; guint updated_since = 0; guint trx_consistency_only = 0; +guint complete_insert = 0; // For daemon mode, 0 or 1 guint dump_number= 0; @@ -125,6 +144,7 @@ static GOptionEntry entries[] = { { "database", 'B', 0, G_OPTION_ARG_STRING, &db, "Database to dump", NULL }, { "tables-list", 'T', 0, G_OPTION_ARG_STRING, &tables_list, "Comma delimited table list to dump (does not exclude regex option)", NULL }, + { "omit-from-file", 'O', 0, G_OPTION_ARG_STRING, &tables_skiplist_file, "File containing a list of database.table entries to skip, one per line (skips before applying regex option)", NULL }, { "outputdir", 'o', 0, G_OPTION_ARG_FILENAME, &output_directory, "Directory to output files to", NULL }, { "statement-size", 's', 0, G_OPTION_ARG_INT, &statement_size, "Attempted size of INSERT statement in bytes, default 1000000", NULL}, { "rows", 'r', 0, G_OPTION_ARG_INT, &rows_per_file, "Try to split tables into chunks of this many rows. This option turns off --chunk-filesize", NULL}, @@ -133,12 +153,15 @@ static GOptionEntry entries[] = { "build-empty-files", 'e', 0, G_OPTION_ARG_NONE, &build_empty_files, "Build dump files even if no data available from table", NULL}, { "regex", 'x', 0, G_OPTION_ARG_STRING, ®exstring, "Regular expression for 'db.table' matching", NULL}, { "ignore-engines", 'i', 0, G_OPTION_ARG_STRING, &ignore_engines, "Comma delimited list of storage engines to ignore", NULL }, + { "insert-ignore", 'N', 0, G_OPTION_ARG_NONE, &insert_ignore, "Dump rows with INSERT IGNORE", NULL }, { "no-schemas", 'm', 0, G_OPTION_ARG_NONE, &no_schemas, "Do not dump table schemas with the data", NULL }, { "no-data", 'd', 0, G_OPTION_ARG_NONE, &no_data, "Do not dump table data", NULL }, { "triggers", 'G', 0, G_OPTION_ARG_NONE, &dump_triggers, "Dump triggers", NULL }, { "events", 'E', 0, G_OPTION_ARG_NONE, &dump_events, "Dump events", NULL }, { "routines", 'R', 0, G_OPTION_ARG_NONE, &dump_routines, "Dump stored procedures and functions", NULL }, + { "no-views", 'W', 0, G_OPTION_ARG_NONE, &no_dump_views, "Do not dump VIEWs", NULL }, { "no-locks", 'k', 0, G_OPTION_ARG_NONE, &no_locks, "Do not execute the temporary shared read lock. WARNING: This will cause inconsistent backups", NULL }, + { "no-backup-locks", 0, 0, G_OPTION_ARG_NONE, &no_backup_locks, "Do not use Percona backup locks", NULL}, { "less-locking", 0, 0, G_OPTION_ARG_NONE, &less_locking, "Minimize locking time on InnoDB tables.", NULL}, { "long-query-guard", 'l', 0, G_OPTION_ARG_INT, &longquery, "Set long query timer in seconds, default 60", NULL }, { "kill-long-queries", 'K', 0, G_OPTION_ARG_NONE, &killqueries, "Kill long running queries (instead of aborting)", NULL }, @@ -148,13 +171,14 @@ static GOptionEntry entries[] = { "daemon", 'D', 0, G_OPTION_ARG_NONE, &daemon_mode, "Enable daemon mode", NULL }, { "snapshot-interval", 'I', 0, G_OPTION_ARG_INT, &snapshot_interval, "Interval between each dump snapshot (in minutes), requires --daemon, default 60", NULL }, { "logfile", 'L', 0, G_OPTION_ARG_FILENAME, &logfile, "Log file name to use, by default stdout is used", NULL }, - { "tz-utc", 0, 0, G_OPTION_ARG_NONE, NULL, "SET TIME_ZONE='+00:00' at top of dump to allow dumping of TIMESTAMP data when a server has data in different time zones or data is being moved between servers with different time zones, defaults to on use --skip-tz-utc to disable.", NULL }, + { "tz-utc", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &skip_tz, "SET TIME_ZONE='+00:00' at top of dump to allow dumping of TIMESTAMP data when a server has data in different time zones or data is being moved between servers with different time zones, defaults to on use --skip-tz-utc to disable.", NULL }, { "skip-tz-utc", 0, 0, G_OPTION_ARG_NONE, &skip_tz, "", NULL }, { "use-savepoints", 0, 0, G_OPTION_ARG_NONE, &use_savepoints, "Use savepoints to reduce metadata locking issues, needs SUPER privilege", NULL }, { "success-on-1146", 0, 0, G_OPTION_ARG_NONE, &success_on_1146, "Not increment error count and Warning instead of Critical in case of table doesn't exist", NULL}, { "lock-all-tables", 0, 0, G_OPTION_ARG_NONE, &lock_all_tables, "Use LOCK TABLE for all, instead of FTWRL", NULL}, { "updated-since", 'U', 0, G_OPTION_ARG_INT, &updated_since, "Use Update_time to dump only tables updated in the last U days", NULL}, { "trx-consistency-only", 0, 0, G_OPTION_ARG_NONE, &trx_consistency_only, "Transactional consistency only", NULL}, + { "complete-insert", 0, 0, G_OPTION_ARG_NONE, &complete_insert, "Use complete INSERT statements that include column names", NULL}, { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL } }; @@ -182,6 +206,9 @@ void dump_table_data_file(MYSQL *conn, char *database, char *table, char *where, void create_backup_dir(char *directory); gboolean write_data(FILE *,GString*); gboolean check_regex(char *database, char *table); +gboolean check_skiplist(char *database, char *table); +int tables_skiplist_cmp(gconstpointer a, gconstpointer b, gpointer user_data); +void read_tables_skiplist(const gchar * filename); void no_log(const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data); void set_verbose(guint verbosity); #ifdef WITH_BINLOG @@ -304,6 +331,68 @@ gboolean check_regex(char *database, char *table) { return (rc>0)?TRUE:FALSE; } +/* Check database.table string against skip list; returns TRUE if found */ + +gboolean check_skiplist(char *database, char *table) { + if (g_sequence_lookup( + tables_skiplist, + g_strdup_printf("%s.%s", database, table), + tables_skiplist_cmp, + NULL + )) { + return TRUE; + } + else { + return FALSE; + }; +} + +/* Comparison function for skiplist sort and lookup */ + +int tables_skiplist_cmp(gconstpointer a, gconstpointer b, gpointer user_data) { + /* Not using user_data, but needed for function prototype, shutting up + * compiler warnings about unused variable */ + (void)user_data; + /* Any sorting function would work, as long as its usage is consistent + * between sort and lookup. strcmp should be one of the fastest. */ + return strcmp(a, b); +}; + +/* Read the list of tables to skip from the given filename, and prepares them + * for future lookups. */ + +void read_tables_skiplist(const gchar * filename) { + GIOChannel * tables_skiplist_channel = NULL; + gchar * buf = NULL; + GError * error = NULL; + /* Create skiplist if it does not exist */ + if (!tables_skiplist) { + tables_skiplist = g_sequence_new(NULL); + }; + tables_skiplist_channel = g_io_channel_new_file(filename, "r", &error); + + /* Error opening/reading the file? bail out. */ + if (!tables_skiplist_channel) { + g_critical("cannot read/open file %s, %s\n", filename, error->message); + errors++; + return; + }; + + /* Read lines, push them to the list */ + do { + g_io_channel_read_line(tables_skiplist_channel, &buf, NULL, NULL, NULL); + if (buf) { + g_strchomp(buf); + g_sequence_append(tables_skiplist, buf); + }; + } while (buf); + g_io_channel_shutdown(tables_skiplist_channel, FALSE, NULL); + /* Sort the list, so that lookups work */ + g_sequence_sort(tables_skiplist, tables_skiplist_cmp, NULL); + g_message("Omit list file contains %d tables to skip\n", g_sequence_get_length(tables_skiplist)); + return; +}; + /* Write some stuff we know about snapshot, before it changes */ void write_snapshot_info(MYSQL *conn, FILE *file) { MYSQL_RES *master=NULL, *slave=NULL, *mdb=NULL; @@ -332,7 +421,8 @@ void write_snapshot_info(MYSQL *conn, FILE *file) { mastergtid=row[4]; } else { /* Let's try with MariaDB 10.x */ - mysql_query(conn, "SELECT @@gtid_current_pos"); + /* Use gtid_binlog_pos due to issue with gtid_current_pos with galera cluster, gtid_binlog_pos works as well with normal mariadb server https://jira.mariadb.org/browse/MDEV-10279 */ + mysql_query(conn, "SELECT @@gtid_binlog_pos"); mdb=mysql_store_result(conn); if (mdb && (row=mysql_fetch_row(mdb))) { mastergtid=row[0]; @@ -399,11 +489,8 @@ void *process_queue(struct thread_data *td) { g_mutex_lock(init_mutex); MYSQL *thrconn = mysql_init(NULL); g_mutex_unlock(init_mutex); - - mysql_options(thrconn,MYSQL_READ_DEFAULT_GROUP,"mydumper"); - if (compress_protocol) - mysql_options(thrconn,MYSQL_OPT_COMPRESS,NULL); + configure_connection(thrconn,"mydumper"); if (!mysql_real_connect(thrconn, hostname, username, password, NULL, port, socket_path, 0)) { g_critical("Failed to connect to database: %s", mysql_error(thrconn)); @@ -420,11 +507,12 @@ void *process_queue(struct thread_data *td) { g_warning("Failed to increase wait_timeout: %s", mysql_error(thrconn)); } if (mysql_query(thrconn, "SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ")) { - g_warning("Failed to set isolation level: %s", mysql_error(thrconn)); + g_critical("Failed to set isolation level: %s", mysql_error(thrconn)); + exit(EXIT_FAILURE); } if (mysql_query(thrconn, "START TRANSACTION /*!40108 WITH CONSISTENT SNAPSHOT */")) { g_critical("Failed to start consistent snapshot: %s",mysql_error(thrconn)); - errors++; + exit(EXIT_FAILURE); } if(!skip_tz && mysql_query(thrconn, "/*!40103 SET TIME_ZONE='+00:00' */")){ g_critical("Failed to set time zone: %s",mysql_error(thrconn)); @@ -599,11 +687,8 @@ void *process_queue_less_locking(struct thread_data *td) { g_mutex_lock(init_mutex); MYSQL *thrconn = mysql_init(NULL); g_mutex_unlock(init_mutex); - - mysql_options(thrconn,MYSQL_READ_DEFAULT_GROUP,"mydumper"); - if (compress_protocol) - mysql_options(thrconn,MYSQL_OPT_COMPRESS,NULL); + configure_connection(thrconn,"mydumper"); if (!mysql_real_connect(thrconn, hostname, username, password, NULL, port, socket_path, 0)) { g_critical("Failed to connect to database: %s", mysql_error(thrconn)); @@ -773,12 +858,12 @@ MYSQL *reconnect_for_binlog(MYSQL *thrconn) { thrconn= mysql_init(NULL); g_mutex_unlock(init_mutex); - if (compress_protocol) - mysql_options(thrconn,MYSQL_OPT_COMPRESS,NULL); + configure_connection(thrconn,"mydumper"); int timeout= 1; mysql_options(thrconn, MYSQL_OPT_READ_TIMEOUT, (const char*)&timeout); + if (!mysql_real_connect(thrconn, hostname, username, password, NULL, port, socket_path, 0)) { g_critical("Failed to re-connect to database: %s", mysql_error(thrconn)); exit(EXIT_FAILURE); @@ -786,6 +871,7 @@ MYSQL *reconnect_for_binlog(MYSQL *thrconn) { return thrconn; } #endif + int main(int argc, char *argv[]) { GError *error = NULL; @@ -807,9 +893,16 @@ int main(int argc, char *argv[]) exit (EXIT_FAILURE); } g_option_context_free(context); + + //prompt for password if it's NULL + if ( sizeof(password) == 0 || ( password == NULL && askPassword ) ){ + password = passwordPrompt(); + } + + //printf("your password is %s and the size is %d \n",password,sizeof(password)); if (program_version) { - g_print("mydumper %s, built against MySQL %s\n", VERSION, MYSQL_SERVER_VERSION); + g_print("mydumper %s, built against MySQL %s\n", VERSION, MYSQL_VERSION_STR); exit (EXIT_SUCCESS); } @@ -885,6 +978,10 @@ int main(int argc, char *argv[]) if (tables_list) tables = g_strsplit(tables_list, ",", 0); + /* Process list of tables to omit if specified */ + if (tables_skiplist_file) + read_tables_skiplist(tables_skiplist_file); + if (daemon_mode) { GError* terror; #ifdef WITH_BINLOG @@ -937,7 +1034,8 @@ MYSQL *create_main_connection() { MYSQL *conn; conn = mysql_init(NULL); - mysql_options(conn,MYSQL_READ_DEFAULT_GROUP,"mydumper"); + + configure_connection(conn,"mydumper"); if (!mysql_real_connect(conn, hostname, username, password, db, port, socket_path, 0)) { g_critical("Error connecting to database: %s", mysql_error(conn)); @@ -977,7 +1075,8 @@ void *exec_thread(void *data) { clear_dump_directory(); MYSQL *conn= create_main_connection(); start_dump(conn); - mysql_close(conn); + // start_dump already closes mysql + // mysql_close(conn); mysql_thread_end(); // Don't switch the symlink on shutdown because the dump is probably incomplete. @@ -1005,6 +1104,9 @@ void *binlog_thread(void *data) { MYSQL_ROW row; MYSQL *conn; conn = mysql_init(NULL); + if (defaults_file != NULL) { + mysql_options(thrconn,MYSQL_READ_DEFAULT_FILE,defaults_file); + } mysql_options(conn,MYSQL_READ_DEFAULT_GROUP,"mydumper"); if (!mysql_real_connect(conn, hostname, username, password, db, port, socket_path, 0)) { @@ -1052,6 +1154,7 @@ void start_dump(MYSQL *conn) struct schema_post *sp; guint n; FILE* nufile = NULL; + guint have_backup_locks = 0; for(n=0;nlongquery) { - if (killqueries) { - if (mysql_query(conn,p3=g_strdup_printf("KILL %lu",atol(row[icol])))) - g_warning("Could not KILL slow query: %s",mysql_error(conn)); - else - g_warning("Killed a query that was running for %ss",row[tcol]); - g_free(p3); - } else { - g_critical("There are queries in PROCESSLIST running longer than %us, aborting dump,\n\t" - "use --long-query-guard to change the guard value, kill queries (--kill-long-queries) or use \n\tdifferent server for dump", longquery); - exit(EXIT_FAILURE); + /* Just in case PROCESSLIST output column order changes */ + MYSQL_FIELD *fields = mysql_fetch_fields(res); + guint i; + int tcol=-1, ccol=-1, icol=-1; + for(i=0; ilongquery) { + if (killqueries) { + if (mysql_query(conn,p3=g_strdup_printf("KILL %lu",atol(row[icol])))) + g_warning("Could not KILL slow query: %s",mysql_error(conn)); + else + g_warning("Killed a query that was running for %ss",row[tcol]); + g_free(p3); + } else { + g_critical("There are queries in PROCESSLIST running longer than %us, aborting dump,\n\t" + "use --long-query-guard to change the guard value, kill queries (--kill-long-queries) or use \n\tdifferent server for dump", longquery); + exit(EXIT_FAILURE); + } } } + mysql_free_result(res); } - mysql_free_result(res); } if (!no_locks) { - if(lock_all_tables){ + // Percona Backup Locks + if(!no_backup_locks){ + mysql_query(conn,"SELECT @@have_backup_locks"); + MYSQL_RES *rest = mysql_store_result(conn); + if(rest != NULL && mysql_num_rows(rest)){ + mysql_free_result(rest); + g_message("Using Percona Backup Locks"); + have_backup_locks=1; + } + } + + if(have_backup_locks){ + if(mysql_query(conn, "LOCK TABLES FOR BACKUP")) { + g_critical("Couldn't acquire LOCK TABLES FOR BACKUP, snapshots will not be consistent: %s",mysql_error(conn)); + errors++; + } + + if(mysql_query(conn, "LOCK BINLOG FOR BACKUP")) { + g_critical("Couldn't acquire LOCK BINLOG FOR BACKUP, snapshots will not be consistent: %s",mysql_error(conn)); + errors++; + } + }else if(lock_all_tables){ // LOCK ALL TABLES GString *query= g_string_sized_new(16777216); gchar *dbtb = NULL; @@ -1170,6 +1296,8 @@ void start_dump(MYSQL *conn) if (!table_found) lock = 0; } + if (lock && tables_skiplist_file && check_skiplist(row[0],row[1])) + continue; if (lock && regexstring && !check_regex(row[0],row[1])) continue; @@ -1303,6 +1431,8 @@ void start_dump(MYSQL *conn) if (trx_consistency_only){ g_message("Transactions started, unlocking tables"); mysql_query(conn, "UNLOCK TABLES /* trx-only */"); + if(have_backup_locks) + mysql_query(conn, "UNLOCK BINLOG"); } if (db) { @@ -1416,6 +1546,8 @@ void start_dump(MYSQL *conn) g_async_queue_pop(conf.unlock_tables); g_message("Non-InnoDB dump complete, unlocking tables"); mysql_query(conn, "UNLOCK TABLES /* FTWRL */"); + if(have_backup_locks) + mysql_query(conn, "UNLOCK BINLOG"); } #ifdef WITH_BINLOG if (need_binlogs) { @@ -1535,6 +1667,52 @@ void get_not_updated(MYSQL *conn){ no_updated_tables = g_list_append(no_updated_tables, row[0]); } +gboolean detect_generated_fields(MYSQL *conn, char *database, char *table){ + MYSQL_RES *res=NULL; + MYSQL_ROW row; + + gboolean result = FALSE; + + gchar *query = g_strdup_printf("select COLUMN_NAME from information_schema.COLUMNS where TABLE_SCHEMA='%s' and TABLE_NAME='%s' and extra like '%%GENERATED%%'", database, table); + mysql_query(conn,query); + g_free(query); + + res = mysql_store_result(conn); + if((row = mysql_fetch_row(res))) { + result = TRUE; + } + mysql_free_result(res); + + return result; +} + + +GString * get_insertable_fields(MYSQL *conn, char *database, char *table){ + MYSQL_RES *res=NULL; + MYSQL_ROW row; + + GString *field_list = g_string_new(""); + + gchar *query = g_strdup_printf("select COLUMN_NAME from information_schema.COLUMNS where TABLE_SCHEMA='%s' and TABLE_NAME='%s' and extra not like '%%GENERATED%%'", database, table); + mysql_query(conn,query); + g_free(query); + + res = mysql_store_result(conn); + gboolean first = TRUE; + while ((row = mysql_fetch_row(res))) { + if(first) { + first = FALSE; + } else { + g_string_append(field_list, ","); + } + + g_string_append(field_list, row[0]); + } + mysql_free_result(res); + + return field_list; +} + /* Heuristic chunks building - based on estimates, produces list of ranges for datadumping WORK IN PROGRESS */ @@ -1602,6 +1780,11 @@ GList * get_chunks_for_table(MYSQL *conn, char *database, char *table, struct co row=mysql_fetch_row(minmax); MYSQL_FIELD * fields=mysql_fetch_fields(minmax); + + /* Check if all values are NULL */ + if (row[0] == NULL) + goto cleanup; + char *min=row[0]; char *max=row[1]; @@ -1742,6 +1925,7 @@ void dump_database(MYSQL * conn, char *database, FILE *file, struct configuratio if (mysql_query(conn, (query))) { g_critical("Error: DB: %s - Could not execute query: %s", database, mysql_error(conn)); errors++; + g_free(query); return; } @@ -1789,6 +1973,11 @@ void dump_database(MYSQL * conn, char *database, FILE *file, struct configuratio } } } + + /* Skip views */ + if (is_view && no_dump_views) + dump = 0; + if (!dump) continue; @@ -1814,6 +2003,10 @@ void dump_database(MYSQL * conn, char *database, FILE *file, struct configuratio continue; } + /* Checks skip list on 'database.table' string */ + if (tables_skiplist && check_skiplist(database,row[0])) + continue; + /* Checks PCRE expressions on 'database.table' string */ if (regexstring && !check_regex(database,row[0])) continue; @@ -1867,6 +2060,8 @@ void dump_database(MYSQL * conn, char *database, FILE *file, struct configuratio } } + mysql_free_result(result); + //Store Procedures and Events //As these are not attached to tables we need to define when we need to dump or not //Having regex filter make this hard because we dont now if a full schema is filtered or not @@ -1882,10 +2077,15 @@ void dump_database(MYSQL * conn, char *database, FILE *file, struct configuratio if (mysql_query(conn, (query))) { g_critical("Error: DB: %s - Could not execute query: %s", database, mysql_error(conn)); errors++; + g_free(query); return; } result = mysql_store_result(conn); while ((row = mysql_fetch_row(result)) && !post_dump){ + /* Checks skip list on 'database.sp' string */ + if (tables_skiplist && check_skiplist(database,row[1])) + continue; + /* Checks PCRE expressions on 'database.sp' string */ if (regexstring && !check_regex(database,row[1])) continue; @@ -1899,10 +2099,14 @@ void dump_database(MYSQL * conn, char *database, FILE *file, struct configuratio if (mysql_query(conn, (query))) { g_critical("Error: DB: %s - Could not execute query: %s", database, mysql_error(conn)); errors++; + g_free(query); return; } result = mysql_store_result(conn); while ((row = mysql_fetch_row(result)) && !post_dump){ + /* Checks skip list on 'database.sp' string */ + if (tables_skiplist_file && check_skiplist(database,row[1])) + continue; /* Checks PCRE expressions on 'database.sp' string */ if (regexstring && !check_regex(database,row[1])) continue; @@ -1910,6 +2114,7 @@ void dump_database(MYSQL * conn, char *database, FILE *file, struct configuratio post_dump = 1; } } + mysql_free_result(result); } if(dump_events && !post_dump){ @@ -1918,16 +2123,21 @@ void dump_database(MYSQL * conn, char *database, FILE *file, struct configuratio if (mysql_query(conn, (query))) { g_critical("Error: DB: %s - Could not execute query: %s", database, mysql_error(conn)); errors++; + g_free(query); return; } result = mysql_store_result(conn); while ((row = mysql_fetch_row(result)) && !post_dump){ + /* Checks skip list on 'database.sp' string */ + if (tables_skiplist_file && check_skiplist(database,row[1])) + continue; /* Checks PCRE expressions on 'database.sp' string */ if (regexstring && !check_regex(database,row[1])) continue; post_dump = 1; } + mysql_free_result(result); } if(post_dump){ @@ -1937,7 +2147,6 @@ void dump_database(MYSQL * conn, char *database, FILE *file, struct configuratio } g_free(query); - mysql_free_result(result); if(file) fflush(file); @@ -2288,6 +2497,9 @@ void dump_schema_data(MYSQL *conn, char *database, char *table, char *filename) if (detected_server == SERVER_TYPE_MYSQL) { g_string_printf(statement,"/*!40101 SET NAMES binary*/;\n"); g_string_append(statement,"/*!40014 SET FOREIGN_KEY_CHECKS=0*/;\n\n"); + if (!skip_tz) { + g_string_append(statement,"/*!40103 SET TIME_ZONE='+00:00' */;\n"); + } } else { g_string_printf(statement, "SET FOREIGN_KEY_CHECKS=0;\n"); } @@ -2659,13 +2871,23 @@ guint64 dump_table_data(MYSQL * conn, FILE *file, char *database, char *table, c g_free(split_filename); } + gboolean has_generated_fields = detect_generated_fields(conn, database, table); /* Ghm, not sure if this should be statement_size - but default isn't too big for now */ GString* statement = g_string_sized_new(statement_size); GString* statement_row = g_string_sized_new(0); + GString* select_fields; + + if (has_generated_fields) { + select_fields = get_insertable_fields(conn, database, table); + } else { + select_fields = g_string_new("*"); + } + /* Poor man's database code */ - query = g_strdup_printf("SELECT %s * FROM `%s`.`%s` %s %s", (detected_server == SERVER_TYPE_MYSQL) ? "/*!40001 SQL_NO_CACHE */" : "", database, table, where?"WHERE":"",where?where:""); + query = g_strdup_printf("SELECT %s %s FROM `%s`.`%s` %s %s", (detected_server == SERVER_TYPE_MYSQL) ? "/*!40001 SQL_NO_CACHE */" : "", select_fields->str, database, table, where?"WHERE":"", where?where:""); + g_string_free(select_fields, TRUE); if (mysql_query(conn, query) || !(result=mysql_use_result(conn))) { //ERROR 1146 if(success_on_1146 && mysql_errno(conn) == 1146){ @@ -2710,7 +2932,26 @@ guint64 dump_table_data(MYSQL * conn, FILE *file, char *database, char *table, c return num_rows; } } - g_string_printf(statement, "INSERT INTO `%s` VALUES", table); + if (complete_insert || has_generated_fields) { + if (insert_ignore) { + g_string_printf(statement, "INSERT IGNORE INTO `%s` (", table); + } else { + g_string_printf(statement, "INSERT INTO `%s` (", table); + } + for (i = 0; i < num_fields; ++i) { + if (i > 0) { + g_string_append_c(statement, ','); + } + g_string_append_printf(statement, "`%s`", fields[i].name); + } + g_string_append(statement, ") VALUES"); + } else { + if (insert_ignore) { + g_string_printf(statement, "INSERT IGNORE INTO `%s` VALUES", table); + } else { + g_string_printf(statement, "INSERT INTO `%s` VALUES", table); + } + } num_rows_st = 0; } @@ -2732,9 +2973,11 @@ guint64 dump_table_data(MYSQL * conn, FILE *file, char *database, char *table, c /* We reuse buffers for string escaping, growing is expensive just at the beginning */ g_string_set_size(escaped, lengths[i]*2+1); mysql_real_escape_string(conn, escaped->str, row[i], lengths[i]); + if (fields[i].type == MYSQL_TYPE_JSON) g_string_append(statement_row, "CONVERT("); g_string_append_c(statement_row,'\"'); g_string_append(statement_row,escaped->str); g_string_append_c(statement_row,'\"'); + if (fields[i].type == MYSQL_TYPE_JSON) g_string_append(statement_row, " USING UTF8MB4)"); } if (i < num_fields - 1) { g_string_append_c(statement_row,','); @@ -2790,7 +3033,26 @@ guint64 dump_table_data(MYSQL * conn, FILE *file, char *database, char *table, c g_string_append(statement, statement_row->str); } else { - g_string_printf(statement, "INSERT INTO `%s` VALUES", table); + if (complete_insert) { + if (insert_ignore) { + g_string_printf(statement, "INSERT IGNORE INTO `%s` (", table); + } else { + g_string_printf(statement, "INSERT INTO `%s` (", table); + } + for (i = 0; i < num_fields; ++i) { + if (i > 0) { + g_string_append_c(statement, ','); + } + g_string_append_printf(statement, "`%s`", fields[i].name); + } + g_string_append(statement, ") VALUES"); + } else { + if (insert_ignore) { + g_string_printf(statement, "INSERT IGNORE INTO `%s` VALUES", table); + } else { + g_string_printf(statement, "INSERT INTO `%s` VALUES", table); + } + } g_string_append(statement, statement_row->str); } } @@ -2809,6 +3071,7 @@ cleanup: g_string_free(escaped,TRUE); g_string_free(statement,TRUE); + g_string_free(statement_row,TRUE); if (result) { mysql_free_result(result); diff --git a/myloader.c b/myloader.c index 106a400..2a86a02 100644 --- a/myloader.c +++ b/myloader.c @@ -19,6 +19,11 @@ #define _FILE_OFFSET_BITS 64 #include + +#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION + #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR +#endif + #include #include #include @@ -30,7 +35,9 @@ #include #include "common.h" #include "myloader.h" +#include "connection.h" #include "config.h" +#include "getPassword.h" guint commit_count= 1000; gchar *directory= NULL; @@ -113,8 +120,13 @@ int main(int argc, char *argv[]) { } g_option_context_free(context); + //prompt for password if it's NULL + if ( sizeof(password) == 0 || ( password == NULL && askPassword ) ){ + password = passwordPrompt(); + } + if (program_version) { - g_print("myloader %s, built against MySQL %s\n", VERSION, MYSQL_SERVER_VERSION); + g_print("myloader %s, built against MySQL %s\n", VERSION, MYSQL_VERSION_STR); exit(EXIT_SUCCESS); } @@ -130,11 +142,10 @@ int main(int argc, char *argv[]) { exit(EXIT_FAILURE); } } - MYSQL *conn; conn= mysql_init(NULL); - mysql_options(conn, MYSQL_READ_DEFAULT_GROUP, "myloader"); + configure_connection(conn,"myloader"); if (!mysql_real_connect(conn, hostname, username, password, NULL, port, socket_path, 0)) { g_critical("Error connection to database: %s", mysql_error(conn)); exit(EXIT_FAILURE); @@ -328,10 +339,12 @@ void create_database(MYSQL *conn, gchar *database){ if((db == NULL && source_db == NULL) || (db != NULL && source_db != NULL && !g_ascii_strcasecmp(db, source_db))){ const gchar* filename= g_strdup_printf("%s-schema-create.sql", db ? db : database); const gchar* filenamegz= g_strdup_printf("%s-schema-create.sql.gz", db ? db : database); + const gchar* filepath= g_strdup_printf("%s/%s-schema-create.sql", directory, db ? db : database); + const gchar* filepathgz= g_strdup_printf("%s/%s-schema-create.sql.gz", directory, db ? db : database); - if (g_file_test (filename, G_FILE_TEST_EXISTS)){ + if (g_file_test (filepath, G_FILE_TEST_EXISTS)){ restore_data(conn, database, NULL, filename, TRUE, FALSE); - }else if (g_file_test (filenamegz, G_FILE_TEST_EXISTS)){ + }else if (g_file_test (filepathgz, G_FILE_TEST_EXISTS)){ restore_data(conn, database, NULL, filenamegz, TRUE, FALSE); }else{ query= g_strdup_printf("CREATE DATABASE `%s`", db ? db : database); @@ -405,10 +418,7 @@ void *process_queue(struct thread_data *td) { MYSQL *thrconn= mysql_init(NULL); g_mutex_unlock(init_mutex); - mysql_options(thrconn, MYSQL_READ_DEFAULT_GROUP, "myloader"); - - if (compress_protocol) - mysql_options(thrconn, MYSQL_OPT_COMPRESS, NULL); + configure_connection(thrconn,"myloader"); if (!mysql_real_connect(thrconn, hostname, username, password, NULL, port, socket_path, 0)) { g_critical("Failed to connect to MySQL server: %s", mysql_error(thrconn));