Removed:
branches/5.1/Driver/Source/ClientAPI.cs
branches/5.1/Driver/Source/ClientDriver.cs
branches/5.1/Driver/Source/EmbeddedAPI.cs
branches/5.1/Driver/Source/EmbeddedDriver.cs
Log:
these are not used in 5.1. this changeset should not be merged into 5.2 unless that version is not going to support embedded and client options
Deleted: branches/5.1/Driver/Source/ClientAPI.cs
===================================================================
--- branches/5.1/Driver/Source/ClientAPI.cs 2008-01-09 21:12:37 UTC (rev 1144)
+++ branches/5.1/Driver/Source/ClientAPI.cs 2008-01-09 21:13:17 UTC (rev 1145)
@@ -1,184 +0,0 @@
-// Copyright (C) 2004 MySQL AB
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation
-//
-// There are special exceptions to the terms and conditions of the GPL
-// as it is applied to this software. View the full text of the
-// exception in file EXCEPTIONS in the directory of this software
-// distribution.
-//
-// 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, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace MySql.Data.MySqlClient
-{
- internal enum ClientAPIOption
- {
- MYSQL_OPT_CONNECT_TIMEOUT,
- MYSQL_OPT_COMPRESS,
- MYSQL_OPT_NAMED_PIPE,
- MYSQL_INIT_COMMAND,
- MYSQL_READ_DEFAULT_FILE,
- MYSQL_READ_DEFAULT_GROUP,
- MYSQL_SET_CHARSET_DIR,
- MYSQL_SET_CHARSET_NAME,
- MYSQL_OPT_LOCAL_INFILE,
- MYSQL_OPT_PROTOCOL,
- MYSQL_SHARED_MEMORY_BASE_NAME,
- MYSQL_OPT_READ_TIMEOUT,
- MYSQL_OPT_WRITE_TIMEOUT,
- MYSQL_OPT_USE_RESULT,
- MYSQL_OPT_USE_REMOTE_CONNECTION,
- MYSQL_OPT_USE_EMBEDDED_CONNECTION,
- MYSQL_OPT_GUESS_CONNECTION,
- MYSQL_SET_CLIENT_IP,
- MYSQL_SECURE_AUTH
- };
-
- [StructLayout(LayoutKind.Sequential)]
- internal class ClientField
- {
- public string name; // Name of column
- public string org_name; // Original column name, if an alias
- public string table; // Table of column if column was a field
- public string org_table; // Org table name, if table was an alias
- public string db; // Database for table
- public string catalog; // Catalog for table
- public string def; // Default value (set by mysql_list_fields)
- public uint length; // Width of column (create length)
- public uint max_length; // Max width for selected set
- public uint name_length;
- public uint org_name_length;
- public uint table_length;
- public uint org_table_length;
- public uint db_length;
- public uint catalog_length;
- public uint def_length;
- public uint flags; // Div flags
- public uint decimals; // Number of decimals in field
- public uint charset; // Character set
- public MySqlDbType type; // Type of field. See mysql_com.h for types
- }
-
- [StructLayout(LayoutKind.Sequential)]
- internal class MySqlBind
- {
- IntPtr length; // output length pointer
- IntPtr is_null; // Pointer to null indicator
- byte[] buffer; // buffer to get/put data
- // set this if you want to track data truncations happened during fetch
- IntPtr error;
- Int32 buffer_type; /* buffer type */
- /* output buffer length, must be set when fetching str/binary */
- uint buffer_length;
- byte[] row_ptr; /* for the current data position */
- uint offset; /* offset position for char/binary fetch */
- uint length_value; /* Used if length is 0 */
- uint param_number; /* For null count and error messages */
- uint pack_length; /* Internal length for packed data */
- bool error_value; /* used if error is 0 */
- bool is_unsigned; /* set if integer type is unsigned */
- bool long_data_used; /* If used with mysql_send_long_data */
- bool is_null_value; /* Used if is_null is 0 */
- IntPtr store_param_func;
- IntPtr fetch_result;
- IntPtr skip_result;
- }
-
- /// <summary>
- /// Summary description for ClientAPI.
- /// </summary>
- internal class ClientAPI
- {
- [DllImport("libmysql", EntryPoint="mysql_init")]
- public static extern IntPtr Init(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint="mysql_real_connect")]
- public static extern IntPtr Connect(IntPtr mysql,
- string host, string user, string password, string db, uint port,
- string unix_socket, uint flag);
-
- [DllImport("libmysql", EntryPoint="mysql_close")]
- public static extern void Close(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint="mysql_ping")]
- public static extern int Ping(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint="mysql_select_db")]
- public static extern int SelectDatabase(IntPtr mysql, string dbName);
-
- [DllImport("libmysql", EntryPoint="mysql_real_query")]
- public static extern int Query(IntPtr mysql, byte[] query, uint len);
-
- [DllImport("libmysql", EntryPoint="mysql_error")]
- public static extern string ErrorMsg(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint="mysql_errno")]
- public static extern int ErrorNumber(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint="mysql_options")]
- public static extern int SetOptions(IntPtr mysql, ClientAPIOption option, ref object optionValue);
-
- [DllImport("libmysql", EntryPoint="mysql_use_result")]
- public static extern IntPtr UseResult(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint="mysql_more_results")]
- public static extern bool MoreResults(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint="mysql_next_result")]
- public static extern int NextResult(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint="mysql_free_result")]
- public static extern void FreeResult(IntPtr result);
-
- [DllImport("libmysql", EntryPoint="mysql_field_count")]
- public static extern int FieldCount(IntPtr resultSet);
-
- [DllImport("libmysql", EntryPoint="mysql_affected_rows")]
- public static extern ulong AffectedRows(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint="mysql_insert_id")]
- public static extern ulong LastInsertId(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint="mysql_fetch_field")]
- public static extern ClientField FetchField(IntPtr resultSet);
-
- [DllImport("libmysql", EntryPoint="mysql_fetch_row")]
- public static extern IntPtr FetchRow(IntPtr resultSet);
-
- [DllImport("libmysql", EntryPoint="mysql_fetch_lengths")]
- public static extern IntPtr FetchLengths(IntPtr resultSet);
-
- [DllImport("libmysql", EntryPoint="mysql_get_server_info")]
- public static extern string VersionString(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint="mysql_character_set_name")]
- public static extern string CharacterSetName(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint = "mysql_stmt_init")]
- public static extern IntPtr StatementInit(IntPtr mysql);
-
- [DllImport("libmysql", EntryPoint = "mysql_stmt_prepare")]
- public static extern int StatementPrepare(IntPtr mysql_statement, string query, uint length);
-
- [DllImport("libmysql", EntryPoint = "mysql_stmt_close")]
- public static extern bool StatementClose(IntPtr mysql_statement);
-
- [DllImport("libmysql", EntryPoint = "mysql_stmt_fetch")]
- public static extern int StatementFetch(IntPtr mysql_statement);
-
- [DllImport("libmysql", EntryPoint = "mysql_stmt_error")]
- public static extern string StatementError(IntPtr mysql_statement);
- }
-}
Deleted: branches/5.1/Driver/Source/ClientDriver.cs
===================================================================
--- branches/5.1/Driver/Source/ClientDriver.cs 2008-01-09 21:12:37 UTC (rev 1144)
+++ branches/5.1/Driver/Source/ClientDriver.cs 2008-01-09 21:13:17 UTC (rev 1145)
@@ -1,415 +0,0 @@
-// Copyright (C) 2004 MySQL AB
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation
-//
-// There are special exceptions to the terms and conditions of the GPL
-// as it is applied to this software. View the full text of the
-// exception in file EXCEPTIONS in the directory of this software
-// distribution.
-//
-// 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, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-#if FALSE
-
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-using MySql.Data.Types;
-
-namespace MySql.Data.MySqlClient
-{
-#if !PocketPC
- /// <summary>
- /// Summary description for ClientDriver.
- /// </summary>
- internal class ClientDriver : Driver
- {
- private IntPtr mysql;
- private IntPtr resultSet;
- private IntPtr currentRow;
- private uint[] currentLengths;
- private int resultsCount;
-
- public ClientDriver(MySqlConnectionStringBuilder settings) : base(settings)
- {
- resultSet = IntPtr.Zero;
- resultsCount = 0;
- }
-
- #region Properties
-
- public override bool SupportsBatch
- {
- get { return true; }
- }
-
-// public override bool HasMoreResults
-// {
-// get { return fieldCount > 0; }
-// }
-
-
- #endregion
-
- public override void Open()
- {
- base.Open ();
-
- mysql = Init(mysql);
-
- ClientFlags flags = ClientFlags.FOUND_ROWS | ClientFlags.MULTI_RESULTS |
- ClientFlags.MULTI_STATEMENTS | ClientFlags.LOCAL_FILES;
- if (connectionString.UseCompression)
- flags |= ClientFlags.COMPRESS;
- if (connectionString.UseSSL)
- flags |= ClientFlags.SSL;
-
- object timeout = connectionString.ConnectionTimeout;
- SetOptions(mysql, ClientAPIOption.MYSQL_OPT_CONNECT_TIMEOUT,
- ref timeout);
-
- //TODO: support charset, shared memory, named pipes
-
- IntPtr result = Connect(mysql, connectionString.Server, connectionString.UserID,
- connectionString.Password, connectionString.Database, connectionString.Port,
- null, (uint)flags);
- if (result == IntPtr.Zero)
- {
- throw new MySqlException(ErrorMsg(mysql), ErrorNumber(mysql));
- }
-
- version = MySql.Data.Common.DBVersion.Parse(VersionString(mysql));
- serverCharSet = CharacterSetName(mysql);
- }
-
- public override void Close()
- {
- Close(mysql);
- mysql = IntPtr.Zero;
-
- base.Close ();
- }
-
- public override bool Ping()
- {
- int val = Ping(mysql);
- if (val == 0) return true;
- isOpen = false;
- return false;
- }
-
- public override void Query(byte[] bytes, int length)
- {
- int result = Query(mysql, bytes, (uint)length);
- if (result != 0)
- throw new MySqlException(ErrorMsg(mysql), ErrorNumber(mysql));
-
- resultsCount = 0;
- }
-
- public override void SetDatabase(string dbName)
- {
- int result = SelectDatabase(mysql, dbName);
- if (result == 0) return;
-
- MySqlException e = new MySqlException(
- ErrorMsg(mysql), ErrorNumber(mysql));
- Logger.LogException(e);
- throw e;
- }
-
- public override void Reset()
- {
-
- }
-
-
- public override int PrepareStatement(string sql, ref MySqlField[] parameters)
- {
- IntPtr mysql_statement = StatementInit(mysql);
- if (mysql_statement == IntPtr.Zero)
- throw new MySqlException("Error initializing prepared statement");
- int result = StatementPrepare(mysql_statement, sql, (uint)sql.Length);
- if (result != 0)
- throw new MySqlException(StatementError(mysql_statement), result);
- return (int)mysql_statement;
- }
-
- public override long ReadResult(ref ulong affectedRows, ref long lastInsertId)
- {
- if (resultSet != IntPtr.Zero)
- {
- FreeResult(resultSet);
- resultSet = IntPtr.Zero;
- if (! version.isAtLeast(4,1,0)) return -1;
- }
-
- if (version.isAtLeast(4,1,0))
- {
- if (resultsCount > 0)
- {
- int result = NextResult(mysql);
- if (result == -1) return -1;
- if (result > 0)
- throw new MySqlException( ErrorMsg(mysql), ErrorNumber(mysql));
- }
- }
- else
- {
- if (resultsCount > 0) return 0;
- }
-
- long numfields = GetFieldCount(mysql);
- if (numfields > 0)
- {
- // now we use the resultset
- resultSet = UseResult(mysql);
- if (resultSet == IntPtr.Zero)
- throw new MySqlException(ErrorMsg(mysql), ErrorNumber(mysql));
- }
-
- if (numfields == 0)
- {
- affectedRows = AffectedRows(mysql);
- lastInsertId = (long)LastInsertId(mysql);
- }
- resultsCount++;
- return numfields;
- }
-
- public override void SkipColumnValue(MySql.Data.Types.IMySqlValue valObject)
- {
-
- }
-
- public override IMySqlValue ReadColumnValue(int index, MySqlField field, IMySqlValue value)
- {
- int dataPtr = (int)currentRow;
- for (int i=0; i < index; i++)
- dataPtr += 4;
-
- IntPtr fieldPtr = Marshal.ReadIntPtr((IntPtr)dataPtr);
- MySqlStreamReader reader = null;
- if (fieldPtr != IntPtr.Zero)
- {
- byte[] buf = new byte[currentLengths[index]];
- Marshal.Copy(fieldPtr, buf, 0, buf.Length);
- reader = new MySqlStreamReader(new MemoryStream(buf), encoding);
- }
-
- return value.ReadValue(reader, currentLengths[index], fieldPtr == IntPtr.Zero);
- }
-
- public override MySqlField[] ReadColumnMetadata(int count)
- {
- MySqlField[] fields = new MySqlField[count];
-
- for (int i=0; i < count; i++)
- {
- ClientField fieldDef = FetchField(resultSet);
- fields[i] = new MySqlField(this.Version);
- fields[i].CatalogName = fieldDef.catalog;
- fields[i].ColumnName = fieldDef.name;
- fields[i].DatabaseName = fieldDef.db;
- fields[i].OriginalColumnName = fieldDef.org_name;
- fields[i].RealTableName = fieldDef.org_table;
- fields[i].Type = fieldDef.type;
- fields[i].Flags = (ColumnFlags)fieldDef.flags;
- fields[i].ColumnLength = (int)fieldDef.length;
- fields[i].Precision = (byte)fieldDef.decimals;
- if (charSets != null && charSets.Count > 0)
- {
- string charSetName = (string)charSets[(int)fieldDef.charset];
- fields[i].Encoding = CharSetMap.GetEncoding(version, charSetName);
- }
- }
-
- currentLengths = new uint[count];
- return fields;
- }
-
-// public override bool ReadDataRow(int statementId, MySqlField[] fields, bool seq)
- // {
- // return false;
- // }
-
- public override bool SkipDataRow()
- {
- return false;
- }
-
- public override bool FetchDataRow(int statementId, int pageSize, int columns)
- {
- currentRow = FetchRow(resultSet);
- if (currentRow == IntPtr.Zero)
- {
- int err = ErrorNumber(mysql);
- if (err == 0)
- {
- //FreeResult(resultSet);
- resultSet = IntPtr.Zero;
- return false;
- }
- throw new MySqlException(ErrorMsg(mysql), err);
- }
-
- IntPtr lengths = FetchLengths(resultSet);
- for (int i=0; i < columns; i++)
- {
- currentLengths[i] = (uint)Marshal.ReadInt32(lengths);
- lengths = (IntPtr)((int)lengths + 4);
- }
-
- return true;
- }
-
- public override void ExecuteStatement(byte[] bytes)
- {
-
- //TODO
- }
-
- #region Interface methods
-
- protected virtual IntPtr Init(IntPtr mysql)
- {
- return ClientAPI.Init(mysql);
- }
-
- protected virtual IntPtr Connect(IntPtr mysql, string host, string user,
- string password, string db, uint port, string unix_socket, uint flag)
- {
- return ClientAPI.Connect(mysql, host, user, password, db, port, unix_socket, flag);
- }
-
- protected virtual int SetOptions(IntPtr mysql, ClientAPIOption option, ref object optionValue)
- {
- return ClientAPI.SetOptions(mysql, option, ref optionValue);
- }
-
- protected virtual void Close(IntPtr mysql)
- {
- ClientAPI.Close(mysql);
- }
-
- protected virtual int SelectDatabase(IntPtr mysql, string dbName)
- {
- return ClientAPI.SelectDatabase(mysql, dbName);
- }
-
- protected virtual int Query(IntPtr mysql, byte[] query, uint len)
- {
- return ClientAPI.Query(mysql, query, len);
- }
-
- protected virtual string ErrorMsg(IntPtr mysql)
- {
- return ClientAPI.ErrorMsg(mysql);
- }
-
- protected virtual int ErrorNumber(IntPtr mysql)
- {
- return ClientAPI.ErrorNumber(mysql);
- }
-
- protected virtual IntPtr UseResult(IntPtr mysql)
- {
- return ClientAPI.UseResult(mysql);
- }
-
- protected virtual bool MoreResults(IntPtr mysql)
- {
- return ClientAPI.MoreResults(mysql);
- }
-
- protected virtual int NextResult(IntPtr mysql)
- {
- return ClientAPI.NextResult(mysql);
- }
-
- protected virtual void FreeResult(IntPtr resultSet)
- {
- ClientAPI.FreeResult(resultSet);
- }
-
- protected virtual int GetFieldCount(IntPtr resultSet)
- {
- return ClientAPI.FieldCount(resultSet);
- }
-
- protected virtual ulong AffectedRows(IntPtr mysql)
- {
- return ClientAPI.AffectedRows(mysql);
- }
-
- protected virtual ulong LastInsertId(IntPtr mysql)
- {
- return ClientAPI.LastInsertId(mysql);
- }
-
- protected virtual ClientField FetchField(IntPtr resultSet)
- {
- return ClientAPI.FetchField(resultSet);
- }
-
- protected virtual IntPtr FetchRow(IntPtr resultSet)
- {
- return ClientAPI.FetchRow(resultSet);
- }
-
- protected virtual IntPtr FetchLengths(IntPtr resultSet)
- {
- return ClientAPI.FetchLengths(resultSet);
- }
-
- protected virtual int Ping(IntPtr mysql)
- {
- return ClientAPI.Ping(mysql);
- }
-
- protected virtual IntPtr StatementInit(IntPtr mysql)
- {
- return ClientAPI.StatementInit(mysql);
- }
-
- protected virtual int StatementPrepare(IntPtr mysql_statement, string query, uint length)
- {
- return ClientAPI.StatementPrepare(mysql_statement, query, length);
- }
-
- protected virtual bool StatementClose(IntPtr mysql_statement)
- {
- return ClientAPI.StatementClose(mysql_statement);
- }
-
- protected virtual string StatementError(IntPtr mysql_statement)
- {
- return ClientAPI.StatementError(mysql_statement);
- }
-
- protected virtual string VersionString(IntPtr mysql)
- {
- return ClientAPI.VersionString(mysql);
- }
-
- protected virtual string CharacterSetName(IntPtr mysql)
- {
- return ClientAPI.CharacterSetName(mysql);
- }
-
- #endregion
-
- }
-#endif
-}
-
-#endif
\ No newline at end of file
Deleted: branches/5.1/Driver/Source/EmbeddedAPI.cs
===================================================================
--- branches/5.1/Driver/Source/EmbeddedAPI.cs 2008-01-09 21:12:37 UTC (rev 1144)
+++ branches/5.1/Driver/Source/EmbeddedAPI.cs 2008-01-09 21:13:17 UTC (rev 1145)
@@ -1,102 +0,0 @@
-// Copyright (C) 2006 MySQL AB
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation
-//
-// There are special exceptions to the terms and conditions of the GPL
-// as it is applied to this software. View the full text of the
-// exception in file EXCEPTIONS in the directory of this software
-// distribution.
-//
-// 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, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace MySql.Data.MySqlClient
-{
- /// <summary>
- /// Summary description for ClientAPI.
- /// </summary>
- internal class EmbeddedAPI
- {
- [DllImport("libmysqld", EntryPoint="mysql_init")]
- public static extern IntPtr Init(IntPtr mysql);
-
- [DllImport("libmysqld", EntryPoint="mysql_server_init")]
- public static extern int ServerInit(int argc, string[] argv, string[] groups);
-
- [DllImport("libmysqld", EntryPoint="mysql_server_end")]
- public static extern void ServerEnd();
-
- [DllImport("libmysqld", EntryPoint="mysql_real_connect")]
- public static extern IntPtr Connect( IntPtr mysql,
- string host, string user, string password, string db, uint port,
- string unix_socket, uint flag );
-
- [DllImport("libmysqld", EntryPoint="mysql_close")]
- public static extern void Close(IntPtr mysql);
-
- [DllImport("libmysqld", EntryPoint="mysql_ping")]
- public static extern int Ping(IntPtr mysql);
-
- [DllImport("libmysqld", EntryPoint="mysql_select_db")]
- public static extern int SelectDatabase(IntPtr mysql, string dbName);
-
- [DllImport("libmysqld", EntryPoint="mysql_real_query")]
- public static extern int Query(IntPtr mysql, byte[] query, uint len);
-
- [DllImport("libmysqld", EntryPoint="mysql_error")]
- public static extern string ErrorMsg(IntPtr mysql);
-
- [DllImport("libmysqld", EntryPoint="mysql_errno")]
- public static extern int ErrorNumber(IntPtr mysql);
-
- [DllImport("libmysqld", EntryPoint="mysql_options")]
- public static extern int SetOptions(IntPtr mysql, ClientAPIOption option, ref object optionValue);
-
- [DllImport("libmysqld", EntryPoint="mysql_use_result")]
- public static extern IntPtr UseResult(IntPtr mysql);
-
- [DllImport("libmysqld", EntryPoint="mysql_more_results")]
- public static extern bool MoreResults(IntPtr mysql);
-
- [DllImport("libmysqld", EntryPoint="mysql_next_result")]
- public static extern int NextResult(IntPtr mysql);
-
- [DllImport("libmysqld", EntryPoint="mysql_free_result")]
- public static extern void FreeResult(IntPtr result);
-
- [DllImport("libmysqld", EntryPoint="mysql_field_count")]
- public static extern int FieldCount(IntPtr resultSet);
-
- [DllImport("libmysqld", EntryPoint="mysql_affected_rows")]
- public static extern ulong AffectedRows(IntPtr mysql);
-
- [DllImport("libmysqld", EntryPoint="mysql_insert_id")]
- public static extern ulong LastInsertId(IntPtr mysql);
-
- [DllImport("libmysqld", EntryPoint="mysql_fetch_field")]
- public static extern ClientField FetchField(IntPtr resultSet);
-
- [DllImport("libmysqld", EntryPoint="mysql_fetch_row")]
- public static extern IntPtr FetchRow(IntPtr resultSet);
-
- [DllImport("libmysqld", EntryPoint="mysql_fetch_lengths")]
- public static extern IntPtr FetchLengths(IntPtr resultSet);
-
- [DllImport("libmysqld", EntryPoint="mysql_get_server_info")]
- public static extern string VersionString(IntPtr mysql);
-
- [DllImport("libmysqld", EntryPoint="mysql_character_set_name")]
- public static extern string CharacterSetName(IntPtr mysql);
- }
-}
Deleted: branches/5.1/Driver/Source/EmbeddedDriver.cs
===================================================================
--- branches/5.1/Driver/Source/EmbeddedDriver.cs 2008-01-09 21:12:37 UTC (rev 1144)
+++ branches/5.1/Driver/Source/EmbeddedDriver.cs 2008-01-09 21:13:17 UTC (rev 1145)
@@ -1,158 +0,0 @@
-using System;
-
-#if FALSE
-
-namespace MySql.Data.MySqlClient
-{
-#if !PocketPC
-
- /// <summary>
- /// Summary description for EmbeddedDriver.
- /// </summary>
- internal class EmbeddedDriver : ClientDriver
- {
- string[] options;
-
- public EmbeddedDriver(MySqlConnectionStringBuilder settings) : base(settings)
- {
- options = new string[2];
- }
-
- public override void Open()
- {
- options[0] = "dummy";
- options[1] = "--defaults-file=" + connectionString.OptionFile;
-
- int result = EmbeddedAPI.ServerInit(2, options, null);
- if (result == 1)
- {
- string msg = EmbeddedAPI.ErrorMsg(IntPtr.Zero);
- throw new MySqlException("The embedded library failed to initialize");
- }
-
- base.Open();
- }
-
- public override void Close()
- {
- base.Close();
- EmbeddedAPI.ServerEnd();
- }
-
-
- #region Interface methods
-
- protected override IntPtr Init(IntPtr mysql)
- {
- return EmbeddedAPI.Init(mysql);
- }
-
- protected override IntPtr Connect(IntPtr mysql, string host, string user,
- string password, string db, uint port, string unix_socket, uint flag)
- {
- return EmbeddedAPI.Connect(mysql, host, user, password, db, port, unix_socket, flag);
- }
-
- protected override int SetOptions(IntPtr mysql, ClientAPIOption option, ref object optionValue)
- {
- return EmbeddedAPI.SetOptions(mysql, option, ref optionValue);
- }
-
- protected override void Close(IntPtr mysql)
- {
- EmbeddedAPI.Close(mysql);
- }
-
- protected override int SelectDatabase(IntPtr mysql, string dbName)
- {
- return EmbeddedAPI.SelectDatabase(mysql, dbName);
- }
-
- protected override int Query(IntPtr mysql, byte[] query, uint len)
- {
- return EmbeddedAPI.Query(mysql, query, len);
- }
-
- protected override string ErrorMsg(IntPtr mysql)
- {
- return EmbeddedAPI.ErrorMsg(mysql);
- }
-
- protected override int ErrorNumber(IntPtr mysql)
- {
- return EmbeddedAPI.ErrorNumber(mysql);
- }
-
- protected override IntPtr UseResult(IntPtr mysql)
- {
- return EmbeddedAPI.UseResult(mysql);
- }
-
- protected override bool MoreResults(IntPtr mysql)
- {
- return EmbeddedAPI.MoreResults(mysql);
- }
-
- protected override int NextResult(IntPtr mysql)
- {
- return EmbeddedAPI.NextResult(mysql);
- }
-
- protected override void FreeResult(IntPtr resultSet)
- {
- EmbeddedAPI.FreeResult(resultSet);
- }
-
- protected override int GetFieldCount(IntPtr resultSet)
- {
- return EmbeddedAPI.FieldCount(resultSet);
- }
-
- protected override ulong AffectedRows(IntPtr mysql)
- {
- return EmbeddedAPI.AffectedRows(mysql);
- }
-
- protected override ulong LastInsertId(IntPtr mysql)
- {
- return EmbeddedAPI.LastInsertId(mysql);
- }
-
- protected override ClientField FetchField(IntPtr resultSet)
- {
- return EmbeddedAPI.FetchField(resultSet);
- }
-
- protected override IntPtr FetchRow(IntPtr resultSet)
- {
- return EmbeddedAPI.FetchRow(resultSet);
- }
-
- protected override IntPtr FetchLengths(IntPtr resultSet)
- {
- return EmbeddedAPI.FetchLengths(resultSet);
- }
-
- protected override int Ping(IntPtr mysql)
- {
- return EmbeddedAPI.Ping(mysql);
- }
-
- protected override string VersionString(IntPtr mysql)
- {
- return EmbeddedAPI.VersionString(mysql);
- }
-
- protected override string CharacterSetName(IntPtr mysql)
- {
- return EmbeddedAPI.CharacterSetName(mysql);
- }
-
- }
-
-#endregion
-
-#endif
-}
-
-#endif
| Thread |
|---|
| • Connector/NET commit: r1145 - branches/5.1/Driver/Source | rburnett | 9 Jan |
