/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
*
- * This library 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
- * Lesser General Public License for more details.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * * The names of its contributors may not be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-#include <config.h>
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <libtest/drizzled.h>
#endif
#if defined(HAVE_LIBDRIZZLE) && HAVE_LIBDRIZZLE
-#include <libdrizzle-1.0/drizzle_client.h>
+# include <libdrizzle-5.1/drizzle_client.h>
#endif
using namespace libtest;
namespace libtest {
bool ping_drizzled(const in_port_t _port)
{
+ (void)(_port);
#if defined(HAVE_LIBDRIZZLE) && HAVE_LIBDRIZZLE
+ if (HAVE_LIBDRIZZLE)
{
- drizzle_st *drizzle= drizzle_create(NULL);
+ drizzle_st *drizzle= drizzle_create_tcp(getenv("MYSQL_SERVER"),
+ getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+ getenv("MYSQL_USER"),
+ getenv("MYSQL_PASSWORD"),
+ getenv("MYSQL_SCHEMA"), drizzle_options_t());
if (drizzle == NULL)
{
return false;
}
- drizzle_con_st *con;
-
- if ((con= drizzle_con_create(drizzle, NULL)) == NULL)
- {
- drizzle_free(drizzle);
- return false;
- }
-
- drizzle_con_set_tcp(con, "localhost", _port);
- drizzle_con_set_auth(con, "root", 0);
-
bool success= false;
drizzle_return_t rc;
- if ((rc= drizzle_con_connect(con)) == DRIZZLE_RETURN_OK)
+ if ((rc= drizzle_connect(drizzle)) == DRIZZLE_RETURN_OK)
{
- drizzle_result_st *result= drizzle_ping(con, NULL, &rc);
+ drizzle_result_st *result= drizzle_ping(drizzle, &rc);
success= bool(result);
drizzle_result_free(result);
}
Error << drizzle_error(drizzle) << " localhost:" << _port;
}
- drizzle_con_free(con);
- drizzle_free(drizzle);
+ drizzle_quit(drizzle);
return success;
}
return "drizzled";
};
- void log_file_option(Application& app, const std::string& arg)
+ void log_file_option(Application&, const std::string&)
{
}
{
if (arg > 0)
{
- char buffer[1024];
- snprintf(buffer, sizeof(buffer), "--drizzle-protocol.port=%d", int(arg));
- app.add_option(buffer);
+ libtest::vchar_t buffer;
+ buffer.resize(1024);
+ snprintf(&buffer[1024], buffer.size(), "--drizzle-protocol.port=%d", int(arg));
+ app.add_option(&buffer[1024]);
}
}
- bool build(size_t argc, const char *argv[]);
+ bool build();
};
-bool Drizzle::build(size_t argc, const char *argv[])
+bool Drizzle::build()
{
if (getuid() == 0 or geteuid() == 0)
{
add_option("--datadir=var/drizzle");
#endif
- for (size_t x= 0 ; x < argc ; x++)
- {
- add_option(argv[x]);
- }
-
return true;
}