Cleanup deprecated functionality

Author: dveeden

dbdimp.c

@@ -1524,7 +1524,7 @@ MYSQL *mysql_dr_connect(
     {
       /* connection succeeded. */
       /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs
-         functions (_admin_internal(),_ListDBs()). */
+         function _ListDBs(). */
       if (!(result->client_flag & CLIENT_PROTOCOL_41) && imp_dbh)
         imp_dbh->use_server_side_prepare = FALSE;
 
@@ -2696,7 +2696,6 @@ my_ulonglong mysql_st_internal_execute(
   bool bind_comment_placeholders= TRUE;
   STRLEN slen;
   char *sbuf = SvPV(statement, slen);
-  char *table;
   char *salloc;
   int htype;
   bool async = FALSE;
@@ -2764,68 +2763,6 @@ my_ulonglong mysql_st_internal_execute(
       PerlIO_printf(DBIc_LOGPIO(imp_xxh), "Binding parameters: %s\n", sbuf);
   }
 
-  if (slen >= 11 && (!strncmp(sbuf, "listfields ", 11) ||
-                     !strncmp(sbuf, "LISTFIELDS ", 11)))
-  {
-    do_warn(h, JW_ERR_LIST_FIELDS,
-		    "LISTFIELDS support is deprecated and will be removed in an upcoming release");
-
-    /* remove pre-space */
-    slen-= 10;
-    sbuf+= 10;
-    while (slen && isspace(*sbuf)) { --slen;  ++sbuf; }
-
-    if (!slen)
-    {
-      do_error(h, JW_ERR_QUERY, "Missing table name" ,NULL);
-      return -2;
-    }
-    if (!(table= malloc(slen+1)))
-    {
-      do_error(h, JW_ERR_MEM, "Out of memory" ,NULL);
-      return -2;
-    }
-
-    strncpy(table, sbuf, slen);
-    sbuf= table;
-
-    while (slen && !isspace(*sbuf))
-    {
-      --slen;
-      ++sbuf;
-    }
-    *sbuf++= '\0';
-
-    char* buffer = malloc(strlen(table)+20);
-    if (buffer == NULL)
-    {
-      do_error(h, JW_ERR_MEM, "Out of memory" ,NULL);
-      return -2;
-    }
-    else
-    {
-      strcpy(buffer, "SHOW COLUMNS FROM ");
-      strcat(buffer, table);
-      if (mysql_real_query(svsock, buffer, strlen(buffer)) != 0) {
-        do_error(h, JW_ERR_QUERY, "Query for columns failed" ,NULL);
-        return -2;
-      }
-      *result = mysql_store_result(svsock);
-      free(buffer);
-    }
-
-    free(table);
-
-    if (!(*result))
-    {
-      do_error(h, mysql_errno(svsock), mysql_error(svsock)
-               ,mysql_sqlstate(svsock));
-      return -2;
-    }
-
-    return 0;
-  }
-
   if(async) {
     if((mysql_send_query(svsock, sbuf, slen)) &&
        (!mysql_db_reconnect(h) ||

lib/DBD/mysql.pm

@@ -179,24 +179,6 @@ sub data_sources {
     @dsn;
 }
 
-sub admin {
-    my($drh) = shift;
-    my($command) = shift;
-    my($dbname) = ($command eq 'createdb'  ||  $command eq 'dropdb') ?
-	shift : '';
-    my($host, $port) = DBD::mysql->_OdbcParseHost(shift(@_) || '');
-    my($user) = shift || '';
-    my($password) = shift || '';
-
-    warn 'admin() is deprecated and will be removed in an upcoming version';
-
-    $drh->func(undef, $command,
-	       $dbname || '',
-	       $host || '',
-	       $port || '',
-	       $user, $password, '_admin_internal');
-}
-
 package DBD::mysql::db; # ====== DATABASE ======
 use strict;
 use DBI qw(:sql_types);
@@ -259,19 +241,6 @@ sub ANSI2db {
     return $DBD::mysql::db::ANSI2db{"$type"};
 }
 
-sub admin {
-    my($dbh) = shift;
-    my($command) = shift;
-    my($dbname) = ($command eq 'createdb'  ||  $command eq 'dropdb') ?
-	shift : '';
-    $dbh->{'Driver'}->func($dbh, $command, $dbname, '', '', '',
-			   '_admin_internal');
-}
-
-sub _SelectDB ($$) {
-    die "_SelectDB is removed from this module; use DBI->connect instead.";
-}
-
 sub table_info ($) {
   my ($dbh, $catalog, $schema, $table, $type, $attr) = @_;
   $dbh->{mysql_server_prepare}||= 0;
@@ -1378,29 +1347,6 @@ This returns:
 
 =back
 
-=back
-
-
-=head2 Private MetaData Methods
-
-=over
-
-=item B<ListDBs>
-
-    my $drh = DBI->install_driver("mysql");
-    @dbs = $drh->func("$hostname:$port", '_ListDBs');
-    @dbs = $drh->func($hostname, $port, '_ListDBs');
-    @dbs = $dbh->func('_ListDBs');
-
-Returns a list of all databases managed by the MySQL server
-running on C<$hostname>, port C<$port>. This is a legacy
-method.  Instead, you should use the portable method
-
-    @dbs = DBI->data_sources("mysql");
-
-=back
-
-
 =head1 DATABASE HANDLES
 
 The DBD::mysql driver supports the following attributes of database

mysql.xs

@@ -84,100 +84,6 @@ _ListDBs(drh, host=NULL, port=NULL, user=NULL, password=NULL)
 }
 
 
-void
-_admin_internal(drh,dbh,command,dbname=NULL,host=NULL,port=NULL,user=NULL,password=NULL)
-  SV* drh
-  SV* dbh
-  char* command
-  char* dbname
-  char* host
-  char* port
-  char* user
-  char* password
-  PPCODE:
-{
-  MYSQL mysql;
-  int retval;
-  MYSQL* sock;
-  const char *shutdown = "SHUTDOWN";
-  const char *reload = "FLUSH PRIVILEGES";
-
-  /*
-   *  Connect to the database, if required.
- */
-  if (SvOK(dbh)) {
-    D_imp_dbh(dbh);
-    sock = imp_dbh->pmysql;
-  }
-  else
-  {
-    mysql.net.fd = -1;
-    sock = mysql_dr_connect(drh, &mysql, NULL, host, port, user,  password, NULL, NULL);
-    if (sock == NULL)
-    {
-      do_error(drh, mysql_errno(&mysql), mysql_error(&mysql),
-               mysql_sqlstate(&mysql));
-      XSRETURN_NO;
-    }
-  }
-
-  if (strEQ(command, "shutdown"))
-    retval = mysql_real_query(sock, shutdown, strlen(shutdown));
-  else if (strEQ(command, "reload"))
-    retval = mysql_real_query(sock, reload, strlen(reload));
-  else if (strEQ(command, "createdb"))
-  {
-    char* buffer = malloc(strlen(dbname)+50);
-    if (buffer == NULL)
-    {
-      do_error(drh, JW_ERR_MEM, "Out of memory" ,NULL);
-      XSRETURN_NO;
-    }
-    else
-    {
-      strcpy(buffer, "CREATE DATABASE ");
-      strcat(buffer, dbname);
-      retval = mysql_real_query(sock, buffer, strlen(buffer));
-      free(buffer);
-    }
-  }
-  else if (strEQ(command, "dropdb"))
-  {
-    char* buffer = malloc(strlen(dbname)+50);
-    if (buffer == NULL)
-    {
-      do_error(drh, JW_ERR_MEM, "Out of memory" ,NULL);
-      XSRETURN_NO;
-    }
-    else
-    {
-      strcpy(buffer, "DROP DATABASE ");
-      strcat(buffer, dbname);
-      retval = mysql_real_query(sock, buffer, strlen(buffer));
-      free(buffer);
-    }
-  }
-  else
-  {
-    croak("Unknown command: %s", command);
-  }
-  if (retval)
-  {
-    do_error(SvOK(dbh) ? dbh : drh, mysql_errno(sock),
-             mysql_error(sock) ,mysql_sqlstate(sock));
-  }
-
-  if (SvOK(dbh))
-  {
-    mysql_close(sock);
-  }
-  if (retval)
-    XSRETURN_NO;
-  else 
-    XSRETURN_YES;
-}
-
-
 MODULE = DBD::mysql    PACKAGE = DBD::mysql::db