* PChar -> PAnsichar

packages/mysql/examples/testdb3.pp

@@ -4,8 +4,8 @@ uses
   mysql3;
 
 Const
-  DataBase : Pchar = 'testdb';
-  Query    : Pchar = 'Select * from FPdev';
+  DataBase : PAnsiChar = 'testdb';
+  Query    : PAnsiChar = 'Select * from FPdev';
 
 var
   count,num : longint;
@@ -14,7 +14,7 @@ var
   qmysql : TMYSQL;
   qbuf : string [160];
   rowbuf : TMYSQL_ROW;
-  dummy : string;
+  dummy : Ansistring;
   recbuf : PMYSQL_RES;
 
 begin

packages/mysql/examples/testdb4.pp

@@ -4,8 +4,8 @@ uses
   mysql4;
 
 Const
-  DataBase : Pchar = 'testdb';
-  Query    : Pchar = 'Select * from FPdev';
+  DataBase : PAnsiChar = 'testdb';
+  Query    : PAnsiChar = 'Select * from FPdev';
 
 var
   count,num : longint;
@@ -14,7 +14,7 @@ var
   qmysql : TMYSQL;
   qbuf : string [160];
   rowbuf : TMYSQL_ROW;
-  dummy : string;
+  dummy : AnsiString;
   recbuf : PMYSQL_RES;
 
 begin

packages/mysql/examples/testdb5.pp

@@ -6,16 +6,16 @@ uses
   mysql57dyn;
 
 Const
-  CHost     : string = 'localhost';
-  CDataBase : string = 'test';
-  CQuery1   : string = 'select * from FPDEV';
-  CQuery2   : string = 'select * from FPDEV where ID between ? and ?';
+  CHost     : AnsiString = 'localhost';
+  CDataBase : AnsiString = 'test';
+  CQuery1   : AnsiString = 'select * from FPDEV';
+  CQuery2   : AnsiString = 'select * from FPDEV where ID between ? and ?';
 
 var
-  Database : string;
+  Database : AnsiString;
   MySQL : PMYSQL;
   i, real_length : integer;
-  s : string;
+  s : AnsiString;
   Res : PMYSQL_RES;
   Field: PMYSQL_FIELD;
   Row : MYSQL_ROW;
@@ -37,13 +37,13 @@ var
     error: my_bool;
   end;
 
-procedure MySQLError(const Msg: string);
+procedure MySQLError(const Msg: AnsiString);
 begin
   Writeln (stderr, Msg, ' (', mysql_errno(MySQL), ': ', mysql_error(MySQL), ')');
   halt(1);
 end;
 
-procedure MySQLStmtError(const Msg: string);
+procedure MySQLStmtError(const Msg: AnsiString);
 begin
   Writeln (stderr, Msg, ' (', mysql_stmt_errno(Stmt), ': ', mysql_stmt_error(Stmt), ')');
   halt(1);

packages/mysql/src/my4_sys.pp

@@ -7,7 +7,7 @@ unit my4_sys;
 
     type
       st_dynamic_array = record
-        buffers : pchar;
+        buffers : PAnsiChar;
         elements : cuint;
         max_elements : cuint;
         alloc_increment : cuint;

packages/mysql/src/mysql.inc

@@ -403,7 +403,7 @@ uses
        MAX_MEDIUMINT_WIDTH = 8;         // Max width for a INT24 w.o. sign
        MAX_INT_WIDTH = 10;              // Max width for a LONG w.o. sign
        MAX_BIGINT_WIDTH = 20;           // Max width for a LONGLONG
-       MAX_CHAR_WIDTH = 255;            // Max length for a CHAR colum
+       MAX_CHAR_WIDTH = 255;            // Max length for a AnsiChar colum
 {$IFDEF mysql51}
        MAX_BLOB_WIDTH = 16777216;       // Default width for blob
 {$ELSE}
@@ -466,7 +466,7 @@ uses
             retry_count : cuint;
             fcntl : cint;
             {$IFNDEF mysql41}
-            last_error : array[0..(MYSQL_ERRMSG_SIZE)-1] of char;
+            last_error : array[0..(MYSQL_ERRMSG_SIZE)-1] of AnsiChar;
             error : cuchar;
             return_errno : my_bool;
             {$ENDIF}
@@ -490,8 +490,8 @@ uses
             {   Pointer to query object in query cache, do not equal NULL (0) for
                 queries in cache that have not stored its results yet }
             {$IFDEF mysql41}
-            last_error : array[0..(MYSQL_ERRMSG_SIZE)-1] of char;
-            sqlstate : array[0..(SQLSTATE_LENGTH+1)-1] of char;
+            last_error : array[0..(MYSQL_ERRMSG_SIZE)-1] of AnsiChar;
+            sqlstate : array[0..(SQLSTATE_LENGTH+1)-1] of AnsiChar;
             last_errno : cuint;
             error : cuchar;
             {$ENDIF}
@@ -648,13 +648,13 @@ uses
     procedure net_clear(net:PNET{$IFDEF mysql51};check_buffer:my_bool{$ENDIF});cdecl;external mysqllib name 'net_clear';
     function net_realloc(net:PNET; length:culong):my_bool;cdecl;external mysqllib name 'net_realloc';
     function net_flush(net:PNET):my_bool;cdecl;external mysqllib name 'net_flush';
-    function my_net_write(net:PNET; packet:Pchar; len:culong):my_bool;cdecl;external mysqllib name 'my_net_write';
-    function net_write_command(net:PNET; command:cuchar; header:Pchar; head_len:culong; packet:Pchar;
+    function my_net_write(net:PNET; packet:PAnsiChar; len:culong):my_bool;cdecl;external mysqllib name 'my_net_write';
+    function net_write_command(net:PNET; command:cuchar; header:PAnsiChar; head_len:culong; packet:PAnsiChar;
                len:culong):my_bool;cdecl;external mysqllib name 'net_write_command';
  {$IFDEF mysql56}
-    function net_write_packet(net:PNET; packet:Pchar; length:culong):my_bool;cdecl;external mysqllib name 'net_write_packet';
+    function net_write_packet(net:PNET; packet:PAnsiChar; length:culong):my_bool;cdecl;external mysqllib name 'net_write_packet';
  {$ELSE}
-    function net_real_write(net:PNET; packet:Pchar; len:culong):cint;cdecl;external mysqllib name 'net_real_write';
+    function net_real_write(net:PNET; packet:PAnsiChar; len:culong):cint;cdecl;external mysqllib name 'net_real_write';
  {$ENDIF}
     function my_net_read(net:PNET):culong;cdecl;external mysqllib name 'my_net_read';
 {$ENDIF}
@@ -693,11 +693,11 @@ uses
        st_udf_args = record
             arg_count : cuint;           // Number of arguments
             arg_type : PItem_result;     // Pointer to item_results
-            args : PPChar;               // Pointer to item_results
+            args : PPAnsiChar;               // Pointer to item_results
             lengths : pculong;            // Length of string arguments
-            maybe_null : Pchar;          // Length of string arguments
+            maybe_null : PAnsiChar;          // Length of string arguments
 {$IFDEF mysql50}
-            attributes : PPChar;         // Pointer to attribute name
+            attributes : PPAnsiChar;         // Pointer to attribute name
             attribute_lengths : pculong;  // Length of attribute arguments
  {$IFDEF mysql51}
             extension: pointer;
@@ -714,7 +714,7 @@ uses
             maybe_null : my_bool;        // 1 if function can return NULL
             decimals : cuint;            // for real functions
             max_length : culong;          // For string functions
-            ptr : Pchar;                 // free pointer for function data
+            ptr : PAnsiChar;                 // free pointer for function data
             const_item : my_bool;        // free pointer for function data
 {$IFDEF mysql51}
             extension: pointer;
@@ -735,32 +735,32 @@ uses
 {$IFNDEF LinkDynamically}
     procedure randominit(_para1:Prand_struct; seed1:culong; seed2:culong);cdecl;external mysqllib name 'randominit';
     function my_rnd(_para1:Prand_struct):cdouble;cdecl;external mysqllib name 'my_rnd';
-    procedure create_random_string(fto:Pchar; length:cuint; rand_st:Prand_struct);cdecl;external mysqllib name 'create_random_string';
-    procedure hash_password(fto:culong; password:Pchar; password_len:cuint);cdecl;external mysqllib name 'hash_password';
-    procedure make_scrambled_password_323(fto:Pchar; password:Pchar);cdecl;external mysqllib name 'make_scrambled_password_323';
-    procedure scramble_323(fto:Pchar; message:Pchar; password:Pchar);cdecl;external mysqllib name 'scramble_323';
-    function check_scramble_323(_para1:Pchar; message:Pchar; salt:culong):my_bool;cdecl;external mysqllib name 'check_scramble_323';
-    procedure get_salt_from_password_323(res:pculong; password:Pchar);cdecl;external mysqllib name 'get_salt_from_password_323';
-    procedure make_password_from_salt_323(fto:Pchar; salt:pculong);cdecl;external mysqllib name 'make_password_from_salt_323';
+    procedure create_random_string(fto:PAnsiChar; length:cuint; rand_st:Prand_struct);cdecl;external mysqllib name 'create_random_string';
+    procedure hash_password(fto:culong; password:PAnsiChar; password_len:cuint);cdecl;external mysqllib name 'hash_password';
+    procedure make_scrambled_password_323(fto:PAnsiChar; password:PAnsiChar);cdecl;external mysqllib name 'make_scrambled_password_323';
+    procedure scramble_323(fto:PAnsiChar; message:PAnsiChar; password:PAnsiChar);cdecl;external mysqllib name 'scramble_323';
+    function check_scramble_323(_para1:PAnsiChar; message:PAnsiChar; salt:culong):my_bool;cdecl;external mysqllib name 'check_scramble_323';
+    procedure get_salt_from_password_323(res:pculong; password:PAnsiChar);cdecl;external mysqllib name 'get_salt_from_password_323';
+    procedure make_password_from_salt_323(fto:PAnsiChar; salt:pculong);cdecl;external mysqllib name 'make_password_from_salt_323';
 {$IFDEF mysql50}
-    function octet2hex(fto:Pchar; str:Pchar; len:cuint):pchar;cdecl;external mysqllib name 'octet2hex';
+    function octet2hex(fto:PAnsiChar; str:PAnsiChar; len:cuint):PAnsiChar;cdecl;external mysqllib name 'octet2hex';
 {$ENDIF}
-    procedure make_scrambled_password(fto:Pchar; password:Pchar);cdecl;external mysqllib name 'make_scrambled_password';
-    procedure scramble(fto:Pchar; message:Pchar; password:Pchar);cdecl;external mysqllib name 'scramble';
-    function check_scramble(reply:Pchar; message:Pchar; hash_stage2:Pbyte):my_bool;cdecl;external mysqllib name 'check_scramble';
-    procedure get_salt_from_password(res:Pbyte; password:Pchar);cdecl;external mysqllib name 'get_salt_from_password';
-    procedure make_password_from_salt(fto:Pchar; hash_stage2:Pbyte);cdecl;external mysqllib name 'make_password_from_salt';
+    procedure make_scrambled_password(fto:PAnsiChar; password:PAnsiChar);cdecl;external mysqllib name 'make_scrambled_password';
+    procedure scramble(fto:PAnsiChar; message:PAnsiChar; password:PAnsiChar);cdecl;external mysqllib name 'scramble';
+    function check_scramble(reply:PAnsiChar; message:PAnsiChar; hash_stage2:Pbyte):my_bool;cdecl;external mysqllib name 'check_scramble';
+    procedure get_salt_from_password(res:Pbyte; password:PAnsiChar);cdecl;external mysqllib name 'get_salt_from_password';
+    procedure make_password_from_salt(fto:PAnsiChar; hash_stage2:Pbyte);cdecl;external mysqllib name 'make_password_from_salt';
     { end of password.c  }
 
-    function get_tty_password(opt_message:Pchar):Pchar;cdecl;external mysqllib name 'get_tty_password';
-    function mysql_errno_to_sqlstate(mysql_errno:cuint):Pchar;cdecl;external mysqllib name 'mysql_errno_to_sqlstate';
+    function get_tty_password(opt_message:PAnsiChar):PAnsiChar;cdecl;external mysqllib name 'get_tty_password';
+    function mysql_errno_to_sqlstate(mysql_errno:cuint):PAnsiChar;cdecl;external mysqllib name 'mysql_errno_to_sqlstate';
 
     { Some other useful functions  }
 {$IFDEF mysql50}
-    function modify_defaults_file(file_location:Pchar; option:Pchar; option_value:Pchar; section_name:Pchar; remove_option:cint):cint;cdecl;external mysqllib name 'load_defaults';
+    function modify_defaults_file(file_location:PAnsiChar; option:PAnsiChar; option_value:PAnsiChar; section_name:PAnsiChar; remove_option:cint):cint;cdecl;external mysqllib name 'load_defaults';
 {$ENDIF}
 
-    function load_defaults(conf_file:Pchar; groups:PPchar; argc:pcint; argv:PPPchar):cint;cdecl;external mysqllib name 'load_defaults';
+    function load_defaults(conf_file:PAnsiChar; groups:PPAnsiChar; argc:pcint; argv:PPPAnsiChar):cint;cdecl;external mysqllib name 'load_defaults';
     function my_init:my_bool;cdecl;external mysqllib name 'my_init';
     function my_thread_init:my_bool;cdecl;external mysqllib name 'my_thread_init';
     procedure my_thread_end;cdecl;external mysqllib name 'my_thread_end';
@@ -775,7 +775,7 @@ uses
 {$IFNDEF LinkDynamically}
     function net_field_length(packet:PPuchar):culong;extdecl;external mysqllib name 'net_field_length_ll';
     function net_field_length_ll(packet:PPuchar):my_ulonglong;cdecl;external mysqllib name 'net_field_length_ll';
-    function net_store_length(pkg:Pchar; length:ulonglong):Pchar;cdecl;external mysqllib name 'net_store_length';
+    function net_store_length(pkg:PAnsiChar; length:ulonglong):PAnsiChar;cdecl;external mysqllib name 'net_store_length';
 {$ENDIF}
 {$endif}
 
@@ -822,7 +822,7 @@ uses
 {$IFNDEF LinkDynamically}
       var
          mysql_port : cuint;cvar;external;
-         mysql_unix_port : Pchar;cvar;external;
+         mysql_unix_port : PAnsiChar;cvar;external;
 {$ENDIF}
 
       const
@@ -832,17 +832,17 @@ uses
     type
        Pst_mysql_field = ^st_mysql_field;
        st_mysql_field = record
-            name : Pchar;             // Name of column
+            name : PAnsiChar;             // Name of column
 {$IFDEF mysql41}
-            org_name : Pchar;         // Original column name, if an alias
+            org_name : PAnsiChar;         // Original column name, if an alias
 {$ENDIF}
-            table : Pchar;            // Table of column if column was a field
-            org_table : Pchar;        // Org table name, if table was an alias
-            db : Pchar;               // Database for table
+            table : PAnsiChar;            // Table of column if column was a field
+            org_table : PAnsiChar;        // Org table name, if table was an alias
+            db : PAnsiChar;               // Database for table
 {$IFDEF mysql41}
-            catalog : Pchar;          // Catalog for table
+            catalog : PAnsiChar;          // Catalog for table
 {$ENDIF}
-            def : Pchar;              // Default value (set by mysql_list_fields)
+            def : PAnsiChar;              // Default value (set by mysql_list_fields)
             length : culong;          // Width of column (create length)
             max_length : culong;      // Max width for selected set
 {$IFDEF mysql41}
@@ -868,7 +868,7 @@ uses
        PMYSQL_FIELD = ^MYSQL_FIELD;
 
        PMYSQL_ROW = ^MYSQL_ROW;       // return data as array of strings
-       MYSQL_ROW = ppchar;
+       MYSQL_ROW = PPAnsiChar;
 
        PMYSQL_FIELD_OFFSET = ^MYSQL_FIELD_OFFSET;     // offset to current field
        MYSQL_FIELD_OFFSET = cuint;
@@ -1059,7 +1059,7 @@ uses
 
     type
        st_dynamic_array = record
-            buffer : ^char;
+            buffer : ^AnsiChar;
             elements : cuint;
             max_element : cuint;
             alloc_increment : cuint;
@@ -1085,40 +1085,40 @@ uses
             protocol : cuint;
             client_flag : culong;
 {$ENDIF}
-            host : Pchar;
+            host : PAnsiChar;
 {$IFNDEF mysql41}
-            init_command: Pchar;
+            init_command: PAnsiChar;
 {$ENDIF}
-            user : Pchar;
-            password : Pchar;
-            unix_socket : Pchar;
-            db : Pchar;
+            user : PAnsiChar;
+            password : PAnsiChar;
+            unix_socket : PAnsiChar;
+            db : PAnsiChar;
 {$IFDEF mysql41}
             init_commands : Pst_dynamic_array;
 {$ENDIF}
-            my_cnf_file : Pchar;
-            my_cnf_group : Pchar;
-            charset_dir : Pchar;
-            charset_name : Pchar;
-            ssl_key : Pchar;                 // PEM key file
-            ssl_cert : Pchar;                // PEM cert file
-            ssl_ca : Pchar;                  // PEM CA file
-            ssl_capath : Pchar;              // PEM directory of CA-s?
-            ssl_cipher : Pchar;              // cipher to use
+            my_cnf_file : PAnsiChar;
+            my_cnf_group : PAnsiChar;
+            charset_dir : PAnsiChar;
+            charset_name : PAnsiChar;
+            ssl_key : PAnsiChar;                 // PEM key file
+            ssl_cert : PAnsiChar;                // PEM cert file
+            ssl_ca : PAnsiChar;                  // PEM CA file
+            ssl_capath : PAnsiChar;              // PEM directory of CA-s?
+            ssl_cipher : PAnsiChar;              // cipher to use
 {$IFDEF mysql41}
-            shared_memory_base_name : Pchar;
+            shared_memory_base_name : PAnsiChar;
 {$ENDIF}
             max_allowed_packet : culong;
 {$IFDEF Mysql80}
             compress : my_bool;
             named_pipe : my_bool;
-            bind_address: Pchar;
+            bind_address: PAnsiChar;
             report_data_truncation: my_bool;
             { function pointers for local infile support  }
-            local_infile_init : function (_para1:Ppointer; _para2:Pchar; _para3:pointer):cint;cdecl;
-            local_infile_read : function (_para1:pointer; _para2:Pchar; _para3:cuint):cint;
+            local_infile_init : function (_para1:Ppointer; _para2:PAnsiChar; _para3:pointer):cint;cdecl;
+            local_infile_read : function (_para1:pointer; _para2:PAnsiChar; _para3:cuint):cint;
             local_infile_end : procedure (_para1:pointer);
-            local_infile_error : function (_para1:pointer; _para2:Pchar; _para3:cuint):cint;
+            local_infile_error : function (_para1:pointer; _para2:PAnsiChar; _para3:cuint):cint;
             local_infile_userdata : pointer;
             extension : ^st_mysql_options_extention;
 {$ELSE}
@@ -1144,23 +1144,23 @@ uses
                 {The ip/hostname to use when authenticating
                  client against embedded server built with
                  grant tables - only used in embedded server}
-              0: (client_ip: PChar;);
+              0: (client_ip: PAnsiChar;);
                 {The local address to bind when connecting to
                  remote server - not used in embedded server}
-              1: (bind_address: PChar;);
+              1: (bind_address: PAnsiChar;);
             end;
 {$ELSE}
-            client_ip : Pchar;
+            client_ip : PAnsiChar;
 {$ENDIF}
             secure_auth : my_bool;           // Refuse client connecting to server if it uses old (pre-4.1.1) protocol
 {$IFDEF mysql50}
             report_data_truncation : my_bool;// 0 - never report, 1 - always report (default)
 {$ENDIF}
     { function pointers for local infile support  }
-            local_infile_init : function (_para1:Ppointer; _para2:Pchar; _para3:pointer):cint;cdecl;
-            local_infile_read : function (_para1:pointer; _para2:Pchar; _para3:cuint):cint;
+            local_infile_init : function (_para1:Ppointer; _para2:PAnsiChar; _para3:pointer):cint;cdecl;
+            local_infile_read : function (_para1:pointer; _para2:PAnsiChar; _para3:cuint):cint;
             local_infile_end : procedure (_para1:pointer);
-            local_infile_error : function (_para1:pointer; _para2:Pchar; _para3:cuint):cint;
+            local_infile_error : function (_para1:pointer; _para2:PAnsiChar; _para3:cuint):cint;
             local_infile_userdata : pointer;
 {$IFDEF mysql51}
             extension : ^st_mysql_options_extention;
@@ -1190,10 +1190,10 @@ uses
             primary_number : cuint;
             binary_number : cuint;
             state : cuint;
-            csname : ^char;
-            name : ^char;
-            comment : ^char;
-            tailoring : ^char;
+            csname : ^AnsiChar;
+            name : ^AnsiChar;
+            comment : ^AnsiChar;
+            tailoring : ^AnsiChar;
             ftype : ^cuchar;
             to_lower : ^cuchar;
             to_upper : ^cuchar;
@@ -1221,10 +1221,10 @@ uses
        character_set = record
             number : cuint;
             state : cuint;
-            csname : Pchar;
-            name : Pchar;
-            comment : Pchar;
-            dir : Pchar;
+            csname : PAnsiChar;
+            name : PAnsiChar;
+            comment : PAnsiChar;
+            dir : PAnsiChar;
             mbminlen : cuint;
             mbmaxlen : cuint;
          end;
@@ -1238,14 +1238,14 @@ uses
        st_mysql = record
             net : NET;                   // Communication parameters
             connector_fd : gptr;         // ConnectorFd for SSL
-            host : Pchar;
-            user : Pchar;
-            passwd : Pchar;
-            unix_socket : Pchar;
-            server_version : Pchar;
-            host_info : Pchar;
-            info : Pchar;
-            db : Pchar;
+            host : PAnsiChar;
+            user : PAnsiChar;
+            passwd : PAnsiChar;
+            unix_socket : PAnsiChar;
+            server_version : PAnsiChar;
+            host_info : PAnsiChar;
+            info : PAnsiChar;
+            db : PAnsiChar;
             charset : Pcharset_info_st;
             fields : PMYSQL_FIELD;
             field_alloc : MEM_ROOT;
@@ -1266,7 +1266,7 @@ uses
             status : mysql_status;
             free_me : my_bool;           // If free in mysql_close
             reconnect : my_bool;         // set to 1 if automatic reconnect
-            scramble : array[0..(SCRAMBLE_LENGTH+1)-1] of char;  // session-wide random string
+            scramble : array[0..(SCRAMBLE_LENGTH+1)-1] of AnsiChar;  // session-wide random string
 {$IFDEF mysql80}
 {$ELSE}
     {  Set if this is the original connection, not a master or a slave we have
@@ -1347,11 +1347,11 @@ uses
             read_prepare_result : function (mysql:PMYSQL; stmt:PMYSQL_STMT):my_bool;
             stmt_execute : function (stmt:PMYSQL_STMT):cint;
             read_binary_rows : function (stmt:PMYSQL_STMT):cint;
-            unbuffered_fetch : function (mysql:PMYSQL; row:PPchar):cint;
+            unbuffered_fetch : function (mysql:PMYSQL; row:PPAnsiChar):cint;
             free_embedded_thd : procedure (mysql:PMYSQL);
-            read_statistics : function (mysql:PMYSQL):Pchar;
+            read_statistics : function (mysql:PMYSQL):PAnsiChar;
             next_result : function (mysql:PMYSQL):my_bool;
-            read_change_user_result : function (mysql:PMYSQL; buff:Pchar; passwd:Pchar):cint;
+            read_change_user_result : function (mysql:PMYSQL; buff:PAnsiChar; passwd:PAnsiChar):cint;
 {$IFDEF mysql50}
             read_rowsfrom_cursor : function (stmt:PMYSQL_STMT):cint;
 {$ENDIF mysql50}
@@ -1364,9 +1364,9 @@ uses
        Pst_mysql_manager = ^st_mysql_manager;
        st_mysql_manager = record
             net : NET;
-            host : Pchar;
-            user : Pchar;
-            passwd : Pchar;
+            host : PAnsiChar;
+            user : PAnsiChar;
+            passwd : PAnsiChar;
 {$IFDEF mysql51}
             net_buf, net_buf_pos, net_data_end : pcchar;
             port : cuint;
@@ -1383,9 +1383,9 @@ uses
             eof : my_bool;
             cmd_status : cint;
             last_errno : cint;
-            net_buf : Pchar;
-            net_buf_pos : Pchar;
-            net_data_end : Pchar;
+            net_buf : PAnsiChar;
+            net_buf_pos : PAnsiChar;
+            net_data_end : PAnsiChar;
             net_buf_size : cint;
             last_error : array[0..(MAX_MYSQL_MANAGER_ERR)-1] of cchar;
 {$ENDIF}
@@ -1490,7 +1490,7 @@ uses
             fetch_result : procedure (_para1:Pst_mysql_bind; _para2:PMYSQL_FIELD; row:PPbyte);
             skip_result : procedure (_para1:Pst_mysql_bind; _para2:PMYSQL_FIELD; row:PPbyte);
             buffer_length : culong;         // output buffer length, must be set when fetching str/binary
-            offset : culong;                // offset position for char/binary fetch
+            offset : culong;                // offset position for AnsiChar/binary fetch
             length_value : culong;          //  Used if length is 0
             param_number : cuint;           // For null count and error messages
             pack_length : cuint;            // Internal length for packed data
@@ -1515,7 +1515,7 @@ uses
  {$ELSE}
             row_ptr : PByte;                // for the current data position
  {$ENDIF}
-            offset : culong;                // offset position for char/binary fetch
+            offset : culong;                // offset position for AnsiChar/binary fetch
  {$IFNDEF mysql50}
             internal_length : culong;       //  Used if length is 0
  {$ELSE}
@@ -1583,8 +1583,8 @@ uses
             param_count : cuint;            // input parameter count
             field_count : cuint;            // number of columns in result set
             state : enum_mysql_stmt_state;  // statement state
-            last_error : array[0..(MYSQL_ERRMSG_SIZE)-1] of char;  // error message
-            sqlstate : array[0..(SQLSTATE_LENGTH+1)-1] of char;
+            last_error : array[0..(MYSQL_ERRMSG_SIZE)-1] of AnsiChar;  // error message
+            sqlstate : array[0..(SQLSTATE_LENGTH+1)-1] of AnsiChar;
             send_types_to_server : my_bool; // Types of input parameters should be sent to server
             bind_param_done : my_bool;      // input buffers were supplied
 {$IFNDEF mysql50}
@@ -1623,7 +1623,7 @@ uses
     { Set up and bring down the server; to ensure that applications will
       work when linked against either the standard client library or the
       embedded server library, these functions should be called.     }
-    function mysql_server_init(argc:cint; argv:PPchar; groups:PPchar):cint;extdecl;external mysqllib name 'mysql_server_init';
+    function mysql_server_init(argc:cint; argv:PPAnsiChar; groups:PPAnsiChar):cint;extdecl;external mysqllib name 'mysql_server_init';
     procedure mysql_server_end;extdecl;external mysqllib name 'mysql_server_end';
 
     { mysql_server_init/end need to be called when using libmysqld or
@@ -1634,7 +1634,7 @@ uses
       names which suit well whether you're using libmysqld or libmysqlclient. We
       intend to promote these aliases over the mysql_server* ones.     }
 
-    function mysql_library_init(argc:cint; argv:PPchar; groups:PPchar):cint;extdecl;external mysqllib name 'mysql_server_init';
+    function mysql_library_init(argc:cint; argv:PPAnsiChar; groups:PPAnsiChar):cint;extdecl;external mysqllib name 'mysql_server_init';
     procedure mysql_library_end;extdecl;external mysqllib name 'mysql_server_end';
 
     function mysql_get_parameters:PMYSQL_PARAMETERS;extdecl;external mysqllib name 'mysql_get_parameters';
@@ -1658,23 +1658,23 @@ uses
     function mysql_affected_rows(mysql:PMYSQL):my_ulonglong;extdecl;external mysqllib name 'mysql_affected_rows';
     function mysql_insert_id(mysql:PMYSQL):my_ulonglong;extdecl;external mysqllib name 'mysql_insert_id';
     function mysql_errno(mysql:PMYSQL):cuint;extdecl;external mysqllib name 'mysql_errno';
-    function mysql_error(mysql:PMYSQL):Pchar;extdecl;external mysqllib name 'mysql_error';
-    function mysql_sqlstate(mysql:PMYSQL):Pchar;extdecl;external mysqllib name 'mysql_sqlstate';
+    function mysql_error(mysql:PMYSQL):PAnsiChar;extdecl;external mysqllib name 'mysql_error';
+    function mysql_sqlstate(mysql:PMYSQL):PAnsiChar;extdecl;external mysqllib name 'mysql_sqlstate';
     function mysql_warning_count(mysql:PMYSQL):cuint;extdecl;external mysqllib name 'mysql_warning_count';
-    function mysql_info(mysql:PMYSQL):Pchar;extdecl;external mysqllib name 'mysql_info';
+    function mysql_info(mysql:PMYSQL):PAnsiChar;extdecl;external mysqllib name 'mysql_info';
     function mysql_thread_id(mysql:PMYSQL):culong;extdecl;external mysqllib name 'mysql_thread_id';
-    function mysql_character_set_name(mysql:PMYSQL):Pchar;extdecl;external mysqllib name 'mysql_character_set_name';
-    function mysql_set_character_set(mysql:PMYSQL; csname:Pchar):longint;extdecl;external mysqllib name 'mysql_set_character_set';
+    function mysql_character_set_name(mysql:PMYSQL):PAnsiChar;extdecl;external mysqllib name 'mysql_character_set_name';
+    function mysql_set_character_set(mysql:PMYSQL; csname:PAnsiChar):longint;extdecl;external mysqllib name 'mysql_set_character_set';
     function mysql_init(mysql:PMYSQL):PMYSQL;extdecl;external mysqllib name 'mysql_init';
-    function mysql_ssl_set(mysql:PMYSQL; key:Pchar; cert:Pchar; ca:Pchar; capath:Pchar;
-               cipher:Pchar):my_bool;extdecl;external mysqllib name 'mysql_ssl_set';
-    function mysql_change_user(mysql:PMYSQL; user:Pchar; passwd:Pchar; db:Pchar):my_bool;extdecl;external mysqllib name 'mysql_change_user';
-    function mysql_real_connect(mysql:PMYSQL; host:Pchar; user:Pchar; passwd:Pchar; db:Pchar;
-               port:cuint; unix_socket:Pchar; clientflag:culong):PMYSQL;extdecl;external mysqllib name 'mysql_real_connect';
-    function mysql_select_db(mysql:PMYSQL; db:Pchar):cint;extdecl;external mysqllib name 'mysql_select_db';
-    function mysql_query(mysql:PMYSQL; q:Pchar):cint;extdecl;external mysqllib name 'mysql_query';
-    function mysql_send_query(mysql:PMYSQL; q:Pchar; length:culong):cint;extdecl;external mysqllib name 'mysql_send_query';
-    function mysql_real_query(mysql:PMYSQL; q:Pchar; length:culong):cint;extdecl;external mysqllib name 'mysql_real_query';
+    function mysql_ssl_set(mysql:PMYSQL; key:PAnsiChar; cert:PAnsiChar; ca:PAnsiChar; capath:PAnsiChar;
+               cipher:PAnsiChar):my_bool;extdecl;external mysqllib name 'mysql_ssl_set';
+    function mysql_change_user(mysql:PMYSQL; user:PAnsiChar; passwd:PAnsiChar; db:PAnsiChar):my_bool;extdecl;external mysqllib name 'mysql_change_user';
+    function mysql_real_connect(mysql:PMYSQL; host:PAnsiChar; user:PAnsiChar; passwd:PAnsiChar; db:PAnsiChar;
+               port:cuint; unix_socket:PAnsiChar; clientflag:culong):PMYSQL;extdecl;external mysqllib name 'mysql_real_connect';
+    function mysql_select_db(mysql:PMYSQL; db:PAnsiChar):cint;extdecl;external mysqllib name 'mysql_select_db';
+    function mysql_query(mysql:PMYSQL; q:PAnsiChar):cint;extdecl;external mysqllib name 'mysql_query';
+    function mysql_send_query(mysql:PMYSQL; q:PAnsiChar; length:culong):cint;extdecl;external mysqllib name 'mysql_send_query';
+    function mysql_real_query(mysql:PMYSQL; q:PAnsiChar; length:culong):cint;extdecl;external mysqllib name 'mysql_real_query';
     function mysql_store_result(mysql:PMYSQL):PMYSQL_RES;extdecl;external mysqllib name 'mysql_store_result';
     function mysql_use_result(mysql:PMYSQL):PMYSQL_RES;extdecl;external mysqllib name 'mysql_use_result';
  {$IFDEF mysql50}
@@ -1688,9 +1688,9 @@ uses
 {$ELSE}
 
     var
-      mysql_server_init: function (argc:cint; argv:PPchar; groups:PPchar):cint;extdecl;
+      mysql_server_init: function (argc:cint; argv:PPAnsiChar; groups:PPAnsiChar):cint;extdecl;
       mysql_server_end: procedure ();extdecl;
-      mysql_library_init: function (argc:cint; argv:PPchar; groups:PPchar):cint;extdecl;
+      mysql_library_init: function (argc:cint; argv:PPAnsiChar; groups:PPAnsiChar):cint;extdecl;
       mysql_library_end: procedure ();extdecl;
       mysql_num_rows: function (res:PMYSQL_RES):my_ulonglong;extdecl;
       mysql_num_fields: function (res:PMYSQL_RES):cuint;extdecl;
@@ -1703,23 +1703,23 @@ uses
       mysql_affected_rows: function (mysql:PMYSQL):my_ulonglong;extdecl;
       mysql_insert_id: function (mysql:PMYSQL):my_ulonglong;extdecl;
       mysql_errno: function (mysql:PMYSQL):cuint;extdecl;
-      mysql_error: function (mysql:PMYSQL):Pchar;extdecl;
-      mysql_sqlstate: function (mysql:PMYSQL):Pchar;extdecl;
+      mysql_error: function (mysql:PMYSQL):PAnsiChar;extdecl;
+      mysql_sqlstate: function (mysql:PMYSQL):PAnsiChar;extdecl;
       mysql_warning_count: function (mysql:PMYSQL):cuint;extdecl;
-      mysql_info: function (mysql:PMYSQL):Pchar;extdecl;
+      mysql_info: function (mysql:PMYSQL):PAnsiChar;extdecl;
       mysql_thread_id: function (mysql:PMYSQL):culong;extdecl;
-      mysql_character_set_name: function (mysql:PMYSQL):Pchar;extdecl;
-      mysql_set_character_set: function (mysql:PMYSQL; csname:Pchar):cint;extdecl;
+      mysql_character_set_name: function (mysql:PMYSQL):PAnsiChar;extdecl;
+      mysql_set_character_set: function (mysql:PMYSQL; csname:PAnsiChar):cint;extdecl;
       mysql_init: function (mysql:PMYSQL):PMYSQL;extdecl;
-      mysql_ssl_set: function (mysql:PMYSQL; key:Pchar; cert:Pchar; ca:Pchar; capath:Pchar;
-                 cipher:Pchar):my_bool;extdecl;
-      mysql_change_user: function (mysql:PMYSQL; user:Pchar; passwd:Pchar; db:Pchar):my_bool;extdecl;
-      mysql_real_connect: function (mysql:PMYSQL; host:Pchar; user:Pchar; passwd:Pchar; db:Pchar;
-                 port:cuint; unix_socket:Pchar; clientflag:culong):PMYSQL;extdecl;
-      mysql_select_db: function (mysql:PMYSQL; db:Pchar):cint;extdecl;
-      mysql_query: function (mysql:PMYSQL; q:Pchar):cint;extdecl;
-      mysql_send_query: function (mysql:PMYSQL; q:Pchar; length:culong):cint;extdecl;
-      mysql_real_query: function (mysql:PMYSQL; q:Pchar; length:culong):cint;extdecl;
+      mysql_ssl_set: function (mysql:PMYSQL; key:PAnsiChar; cert:PAnsiChar; ca:PAnsiChar; capath:PAnsiChar;
+                 cipher:PAnsiChar):my_bool;extdecl;
+      mysql_change_user: function (mysql:PMYSQL; user:PAnsiChar; passwd:PAnsiChar; db:PAnsiChar):my_bool;extdecl;
+      mysql_real_connect: function (mysql:PMYSQL; host:PAnsiChar; user:PAnsiChar; passwd:PAnsiChar; db:PAnsiChar;
+                 port:cuint; unix_socket:PAnsiChar; clientflag:culong):PMYSQL;extdecl;
+      mysql_select_db: function (mysql:PMYSQL; db:PAnsiChar):cint;extdecl;
+      mysql_query: function (mysql:PMYSQL; q:PAnsiChar):cint;extdecl;
+      mysql_send_query: function (mysql:PMYSQL; q:PAnsiChar; length:culong):cint;extdecl;
+      mysql_real_query: function (mysql:PMYSQL; q:PAnsiChar; length:culong):cint;extdecl;
       mysql_store_result: function (mysql:PMYSQL):PMYSQL_RES;extdecl;
       mysql_use_result: function (mysql:PMYSQL):PMYSQL_RES;extdecl;
  {$IFDEF mysql50}
@@ -1734,12 +1734,12 @@ uses
 
 {$IFNDEF LinkDynamically}
     { perform query on master  }
-    function mysql_master_query(mysql:PMYSQL; q:Pchar; length:culong):my_bool;extdecl;external mysqllib name 'mysql_master_query';
-    function mysql_master_send_query(mysql:PMYSQL; q:Pchar; length:culong):my_bool;extdecl;external mysqllib name 'mysql_master_send_query';
+    function mysql_master_query(mysql:PMYSQL; q:PAnsiChar; length:culong):my_bool;extdecl;external mysqllib name 'mysql_master_query';
+    function mysql_master_send_query(mysql:PMYSQL; q:PAnsiChar; length:culong):my_bool;extdecl;external mysqllib name 'mysql_master_send_query';
 
     { perform query on slave  }
-    function mysql_slave_query(mysql:PMYSQL; q:Pchar; length:culong):my_bool;extdecl;external mysqllib name 'mysql_slave_query';
-    function mysql_slave_send_query(mysql:PMYSQL; q:Pchar; length:culong):my_bool;extdecl;external mysqllib name 'mysql_slave_send_query';
+    function mysql_slave_query(mysql:PMYSQL; q:PAnsiChar; length:culong):my_bool;extdecl;external mysqllib name 'mysql_slave_query';
+    function mysql_slave_send_query(mysql:PMYSQL; q:PAnsiChar; length:culong):my_bool;extdecl;external mysqllib name 'mysql_slave_send_query';
 {$ENDIF}
 
     { local infile support  }
@@ -1748,7 +1748,7 @@ uses
        LOCAL_INFILE_ERROR_LEN = 512;
 
 {$IFNDEF LinkDynamically}
-{    procedure mysql_set_local_infile_handler(mysql:PMYSQL; local_infile_init:function (_para1:Ppointer; _para2:Pchar; _para3:pointer):longint; local_infile_read:function (_para1:pointer; _para2:Pchar; _para3:dword):longint; local_infile_end:procedure (_pa
+{    procedure mysql_set_local_infile_handler(mysql:PMYSQL; local_infile_init:function (_para1:Ppointer; _para2:PAnsiChar; _para3:pointer):longint; local_infile_read:function (_para1:pointer; _para2:PAnsiChar; _para3:dword):longint; local_infile_end:procedure (_pa
                 _para6:pointer);cdecl;external mysqllib name 'mysql_set_local_infile_handler';}
     procedure mysql_set_local_infile_default(mysql:PMYSQL);cdecl;external mysqllib name 'mysql_set_local_infile_default';
 
@@ -1767,32 +1767,32 @@ uses
     { get the value of the master read flag  }
     function mysql_reads_from_master_enabled(mysql:PMYSQL):my_bool;extdecl;external mysqllib name 'mysql_reads_from_master_enabled';
 
-    function mysql_rpl_query_type(q : pchar;len : cint):mysql_rpl_type;extdecl;external mysqllib name 'mysql_rpl_query_type';
+    function mysql_rpl_query_type(q : PAnsiChar;len : cint):mysql_rpl_type;extdecl;external mysqllib name 'mysql_rpl_query_type';
 
     { discover the master and its slaves  }
     function mysql_rpl_probe(mysql:PMYSQL):my_bool;extdecl;external mysqllib name 'mysql_rpl_probe';
 
     { set the master, close/free the old one, if it is not a pivot  }
-    function mysql_set_master(mysql:PMYSQL; host:Pchar; port:cuint; user:Pchar; passwd:Pchar):cint;extdecl;external mysqllib name 'mysql_set_master';
-    function mysql_add_slave(mysql:PMYSQL; host:Pchar; port:cuint; user:Pchar; passwd:Pchar):cint;extdecl;external mysqllib name 'mysql_add_slave';
+    function mysql_set_master(mysql:PMYSQL; host:PAnsiChar; port:cuint; user:PAnsiChar; passwd:PAnsiChar):cint;extdecl;external mysqllib name 'mysql_set_master';
+    function mysql_add_slave(mysql:PMYSQL; host:PAnsiChar; port:cuint; user:PAnsiChar; passwd:PAnsiChar):cint;extdecl;external mysqllib name 'mysql_add_slave';
     function mysql_shutdown(mysql:PMYSQL; shutdown_level:mysql_enum_shutdown_level):cint;extdecl;external mysqllib name 'mysql_shutdown';
     function mysql_dump_debug_info(mysql:PMYSQL):cint;extdecl;external mysqllib name 'mysql_dump_debug_info';
     function mysql_refresh(mysql:PMYSQL; refresh_options:cuint):cint;extdecl;external mysqllib name 'mysql_refresh';
     function mysql_kill(mysql:PMYSQL; pid:culong):cint;extdecl;external mysqllib name 'mysql_kill';
     function mysql_set_server_option(mysql:PMYSQL; option:enum_mysql_set_option):cint;extdecl;external mysqllib name 'mysql_set_server_option';
     function mysql_ping(mysql:PMYSQL):cint;extdecl;external mysqllib name 'mysql_ping';
-    function mysql_stat(mysql:PMYSQL):Pchar;extdecl;external mysqllib name 'mysql_stat';
-    function mysql_get_server_info(mysql:PMYSQL):Pchar;extdecl;external mysqllib name 'mysql_get_server_info';
-    function mysql_get_client_info:Pchar;extdecl;external mysqllib name 'mysql_get_client_info';
+    function mysql_stat(mysql:PMYSQL):PAnsiChar;extdecl;external mysqllib name 'mysql_stat';
+    function mysql_get_server_info(mysql:PMYSQL):PAnsiChar;extdecl;external mysqllib name 'mysql_get_server_info';
+    function mysql_get_client_info:PAnsiChar;extdecl;external mysqllib name 'mysql_get_client_info';
     function mysql_get_client_version:culong;extdecl;external mysqllib name 'mysql_get_client_version';
-    function mysql_get_host_info(mysql:PMYSQL):Pchar;extdecl;external mysqllib name 'mysql_get_host_info';
+    function mysql_get_host_info(mysql:PMYSQL):PAnsiChar;extdecl;external mysqllib name 'mysql_get_host_info';
     function mysql_get_server_version(mysql:PMYSQL):culong;extdecl;external mysqllib name 'mysql_get_server_version';
     function mysql_get_proto_info(mysql:PMYSQL):cuint;extdecl;external mysqllib name 'mysql_get_proto_info';
-    function mysql_list_dbs(mysql:PMYSQL; wild:Pchar):PMYSQL_RES;extdecl;external mysqllib name 'mysql_list_dbs';
+    function mysql_list_dbs(mysql:PMYSQL; wild:PAnsiChar):PMYSQL_RES;extdecl;external mysqllib name 'mysql_list_dbs';
 
-    function mysql_list_tables(mysql:PMYSQL; wild:Pchar):PMYSQL_RES;extdecl;external mysqllib name 'mysql_list_tables';
+    function mysql_list_tables(mysql:PMYSQL; wild:PAnsiChar):PMYSQL_RES;extdecl;external mysqllib name 'mysql_list_tables';
     function mysql_list_processes(mysql:PMYSQL):PMYSQL_RES;extdecl;external mysqllib name 'mysql_list_processes';
-    function mysql_options(mysql:PMYSQL; option:mysql_option; arg:Pchar):cint;extdecl;external mysqllib name 'mysql_options';
+    function mysql_options(mysql:PMYSQL; option:mysql_option; arg:PAnsiChar):cint;extdecl;external mysqllib name 'mysql_options';
     procedure mysql_free_result(result:PMYSQL_RES);extdecl;external mysqllib name 'mysql_free_result';
     procedure mysql_data_seek(result:PMYSQL_RES; offset:my_ulonglong);extdecl;external mysqllib name 'mysql_data_seek';
     function mysql_row_seek(result:PMYSQL_RES; offset:MYSQL_ROW_OFFSET):MYSQL_ROW_OFFSET;extdecl;external mysqllib name 'mysql_row_seek';
@@ -1800,25 +1800,25 @@ uses
     function mysql_fetch_row(result:PMYSQL_RES):MYSQL_ROW;extdecl;external mysqllib name 'mysql_fetch_row';
     function mysql_fetch_lengths(result:PMYSQL_RES):pculong;extdecl;external mysqllib name 'mysql_fetch_lengths';
     function mysql_fetch_field(result:PMYSQL_RES):PMYSQL_FIELD;extdecl;external mysqllib name 'mysql_fetch_field';
-    function mysql_list_fields(mysql:PMYSQL; table:Pchar; wild:Pchar):PMYSQL_RES;extdecl;external mysqllib name 'mysql_list_fields';
-    function mysql_escape_string(fto:Pchar; from:Pchar; from_length:culong):culong;extdecl;external mysqllib name 'mysql_escape_string';
-    function mysql_hex_string(fto:Pchar; from:Pchar; from_length:culong):culong;extdecl;external mysqllib name 'mysql_hex_string';
-    function mysql_real_escape_string(mysql:PMYSQL; fto:Pchar; from:Pchar; length:culong):culong;extdecl;external mysqllib name 'mysql_real_escape_string';
-    procedure mysql_debug(debug:Pchar);extdecl;external mysqllib name 'mysql_debug';
-{    function mysql_odbc_escape_string(mysql:PMYSQL; fto:Pchar; to_length:dword; from:Pchar; from_length:dword;
-               param:pointer; extend_buffer:function (_para1:pointer; to:Pchar; length:Pdword):Pchar):Pchar;extdecl;external mysqllib name 'mysql_odbc_escape_string';}
-    procedure myodbc_remove_escape(mysql:PMYSQL; name:Pchar);extdecl;external mysqllib name 'myodbc_remove_escape';
+    function mysql_list_fields(mysql:PMYSQL; table:PAnsiChar; wild:PAnsiChar):PMYSQL_RES;extdecl;external mysqllib name 'mysql_list_fields';
+    function mysql_escape_string(fto:PAnsiChar; from:PAnsiChar; from_length:culong):culong;extdecl;external mysqllib name 'mysql_escape_string';
+    function mysql_hex_string(fto:PAnsiChar; from:PAnsiChar; from_length:culong):culong;extdecl;external mysqllib name 'mysql_hex_string';
+    function mysql_real_escape_string(mysql:PMYSQL; fto:PAnsiChar; from:PAnsiChar; length:culong):culong;extdecl;external mysqllib name 'mysql_real_escape_string';
+    procedure mysql_debug(debug:PAnsiChar);extdecl;external mysqllib name 'mysql_debug';
+{    function mysql_odbc_escape_string(mysql:PMYSQL; fto:PAnsiChar; to_length:dword; from:PAnsiChar; from_length:dword;
+               param:pointer; extend_buffer:function (_para1:pointer; to:PAnsiChar; length:Pdword):PAnsiChar):PAnsiChar;extdecl;external mysqllib name 'mysql_odbc_escape_string';}
+    procedure myodbc_remove_escape(mysql:PMYSQL; name:PAnsiChar);extdecl;external mysqllib name 'myodbc_remove_escape';
     function mysql_thread_safe:cuint;extdecl;external mysqllib name 'mysql_thread_safe';
     function mysql_embedded:my_bool;extdecl;external mysqllib name 'mysql_embedded';
     function mysql_manager_init(con:PMYSQL_MANAGER):PMYSQL_MANAGER;extdecl;external mysqllib name 'mysql_manager_init';
-    function mysql_manager_connect(con:PMYSQL_MANAGER; host:Pchar; user:Pchar; passwd:Pchar; port:cuint):PMYSQL_MANAGER;extdecl;external mysqllib name 'mysql_manager_connect';
+    function mysql_manager_connect(con:PMYSQL_MANAGER; host:PAnsiChar; user:PAnsiChar; passwd:PAnsiChar; port:cuint):PMYSQL_MANAGER;extdecl;external mysqllib name 'mysql_manager_connect';
     procedure mysql_manager_close(con:PMYSQL_MANAGER);extdecl;external mysqllib name 'mysql_manager_close';
-    function mysql_manager_command(con:PMYSQL_MANAGER; cmd:Pchar; cmd_len:cint):cint;extdecl;external mysqllib name 'mysql_manager_command';
-    function mysql_manager_fetch_line(con:PMYSQL_MANAGER; res_buf:Pchar; res_buf_size:cint):cint;extdecl;external mysqllib name 'mysql_manager_fetch_line';
+    function mysql_manager_command(con:PMYSQL_MANAGER; cmd:PAnsiChar; cmd_len:cint):cint;extdecl;external mysqllib name 'mysql_manager_command';
+    function mysql_manager_fetch_line(con:PMYSQL_MANAGER; res_buf:PAnsiChar; res_buf_size:cint):cint;extdecl;external mysqllib name 'mysql_manager_fetch_line';
     function mysql_read_query_result(mysql:PMYSQL):my_bool;extdecl;external mysqllib name 'mysql_read_query_result';
 
     function mysql_stmt_init(mysql:PMYSQL):PMYSQL_STMT;extdecl;external mysqllib name 'mysql_stmt_init';
-    function mysql_stmt_prepare(stmt:PMYSQL_STMT; query:Pchar; length:culong):cint;extdecl;external mysqllib name 'mysql_stmt_prepare';
+    function mysql_stmt_prepare(stmt:PMYSQL_STMT; query:PAnsiChar; length:culong):cint;extdecl;external mysqllib name 'mysql_stmt_prepare';
     function mysql_stmt_execute(stmt:PMYSQL_STMT):cint;extdecl;external mysqllib name 'mysql_stmt_execute';
     function mysql_stmt_fetch(stmt:PMYSQL_STMT):cint;extdecl;external mysqllib name 'mysql_stmt_fetch';
     function mysql_stmt_fetch_column(stmt:PMYSQL_STMT; bind:PMYSQL_BIND; column:cuint; offset:culong):cint;extdecl;external mysqllib name 'mysql_stmt_fetch_column';
@@ -1831,12 +1831,12 @@ uses
     function mysql_stmt_close(stmt:PMYSQL_STMT):my_bool;extdecl;external mysqllib name 'mysql_stmt_close';
     function mysql_stmt_reset(stmt:PMYSQL_STMT):my_bool;extdecl;external mysqllib name 'mysql_stmt_reset';
     function mysql_stmt_free_result(stmt:PMYSQL_STMT):my_bool;extdecl;external mysqllib name 'mysql_stmt_free_result';
-    function mysql_stmt_send_long_data(stmt:PMYSQL_STMT; param_number:cuint; data:Pchar; length:culong):my_bool;extdecl;external mysqllib name 'mysql_stmt_send_long_data';
+    function mysql_stmt_send_long_data(stmt:PMYSQL_STMT; param_number:cuint; data:PAnsiChar; length:culong):my_bool;extdecl;external mysqllib name 'mysql_stmt_send_long_data';
     function mysql_stmt_result_metadata(stmt:PMYSQL_STMT):PMYSQL_RES;extdecl;external mysqllib name 'mysql_stmt_result_metadata';
     function mysql_stmt_param_metadata(stmt:PMYSQL_STMT):PMYSQL_RES;extdecl;external mysqllib name 'mysql_stmt_param_metadata';
     function mysql_stmt_errno(stmt:PMYSQL_STMT):cuint;extdecl;external mysqllib name 'mysql_stmt_errno';
-    function mysql_stmt_error(stmt:PMYSQL_STMT):Pchar;extdecl;external mysqllib name 'mysql_stmt_error';
-    function mysql_stmt_sqlstate(stmt:PMYSQL_STMT):Pchar;extdecl;external mysqllib name 'mysql_stmt_sqlstate';
+    function mysql_stmt_error(stmt:PMYSQL_STMT):PAnsiChar;extdecl;external mysqllib name 'mysql_stmt_error';
+    function mysql_stmt_sqlstate(stmt:PMYSQL_STMT):PAnsiChar;extdecl;external mysqllib name 'mysql_stmt_sqlstate';
     function mysql_stmt_row_seek(stmt:PMYSQL_STMT; offset:MYSQL_ROW_OFFSET):MYSQL_ROW_OFFSET;extdecl;external mysqllib name 'mysql_stmt_row_seek';
     function mysql_stmt_row_tell(stmt:PMYSQL_STMT):MYSQL_ROW_OFFSET;extdecl;external mysqllib name 'mysql_stmt_row_tell';
     procedure mysql_stmt_data_seek(stmt:PMYSQL_STMT; offset:my_ulonglong);extdecl;external mysqllib name 'mysql_stmt_data_seek';
@@ -1861,18 +1861,18 @@ uses
       mysql_kill: function (mysql:PMYSQL; pid:culong):cint;extdecl;
       mysql_set_server_option: function (mysql:PMYSQL; option:enum_mysql_set_option):cint;extdecl;
       mysql_ping: function (mysql:PMYSQL):cint;extdecl;
-      mysql_stat: function (mysql:PMYSQL):Pchar;extdecl;
-      mysql_get_server_info: function (mysql:PMYSQL):Pchar;extdecl;
-      mysql_get_client_info: function :Pchar;extdecl;
+      mysql_stat: function (mysql:PMYSQL):PAnsiChar;extdecl;
+      mysql_get_server_info: function (mysql:PMYSQL):PAnsiChar;extdecl;
+      mysql_get_client_info: function :PAnsiChar;extdecl;
       mysql_get_client_version: function :culong;extdecl;
-      mysql_get_host_info: function (mysql:PMYSQL):Pchar;extdecl;
+      mysql_get_host_info: function (mysql:PMYSQL):PAnsiChar;extdecl;
       mysql_get_server_version: function (mysql:PMYSQL):culong;extdecl;
       mysql_get_proto_info: function (mysql:PMYSQL):cuint;extdecl;
-      mysql_list_dbs: function (mysql:PMYSQL; wild:Pchar):PMYSQL_RES;extdecl;
+      mysql_list_dbs: function (mysql:PMYSQL; wild:PAnsiChar):PMYSQL_RES;extdecl;
 
-      mysql_list_tables: function (mysql:PMYSQL; wild:Pchar):PMYSQL_RES;extdecl;
+      mysql_list_tables: function (mysql:PMYSQL; wild:PAnsiChar):PMYSQL_RES;extdecl;
       mysql_list_processes: function (mysql:PMYSQL):PMYSQL_RES;extdecl;
-      mysql_options: function (mysql:PMYSQL; option:mysql_option; arg:Pchar):cint;extdecl;
+      mysql_options: function (mysql:PMYSQL; option:mysql_option; arg:PAnsiChar):cint;extdecl;
 {$IFDEF mysql56}
       mysql_options4: function (mysql:PMYSQL; option:mysql_option; arg1,arg2:Pointer):cint;extdecl;
  {$IFDEF mysql57}
@@ -1886,15 +1886,15 @@ uses
       mysql_fetch_row: function (result:PMYSQL_RES):MYSQL_ROW;extdecl;
       mysql_fetch_lengths: function (result:PMYSQL_RES):pculong;extdecl;
       mysql_fetch_field: function (result:PMYSQL_RES):PMYSQL_FIELD;extdecl;
-      mysql_list_fields: function (mysql:PMYSQL; table:Pchar; wild:Pchar):PMYSQL_RES;extdecl;
-      mysql_escape_string: function (fto:Pchar; from:Pchar; from_length:culong):culong;extdecl;
-      mysql_hex_string: function (fto:Pchar; from:Pchar; from_length:culong):culong;extdecl;
-      mysql_real_escape_string: function (mysql:PMYSQL; fto:Pchar; from:Pchar; length:culong):culong;extdecl;
+      mysql_list_fields: function (mysql:PMYSQL; table:PAnsiChar; wild:PAnsiChar):PMYSQL_RES;extdecl;
+      mysql_escape_string: function (fto:PAnsiChar; from:PAnsiChar; from_length:culong):culong;extdecl;
+      mysql_hex_string: function (fto:PAnsiChar; from:PAnsiChar; from_length:culong):culong;extdecl;
+      mysql_real_escape_string: function (mysql:PMYSQL; fto:PAnsiChar; from:PAnsiChar; length:culong):culong;extdecl;
 {$IFDEF mysql57}
       mysql_real_escape_string_quote: function(mysql:PMYSQL; fto:pcchar; from:pcchar; length:culong; quote: cchar):culong;extdecl;
       mysql_reset_connection: function(mysql:PMYSQL):cint;extdecl;
 {$ENDIF}
-      mysql_debug: procedure (debug:Pchar);extdecl;
+      mysql_debug: procedure (debug:PAnsiChar);extdecl;
 
       mysql_rollback: function (mysql:PMYSQL):my_bool;extdecl;
       mysql_autocommit: function (mysql:PMYSQL; auto_mode:my_bool):my_bool;extdecl;
@@ -1904,7 +1904,7 @@ uses
       mysql_close: procedure (sock:PMYSQL);extdecl;
 
       mysql_stmt_init: function (mysql:PMYSQL):PMYSQL_STMT;extdecl;
-      mysql_stmt_prepare: function (stmt:PMYSQL_STMT; query:Pchar; length:culong):cint;extdecl;
+      mysql_stmt_prepare: function (stmt:PMYSQL_STMT; query:PAnsiChar; length:culong):cint;extdecl;
       mysql_stmt_execute: function (stmt:PMYSQL_STMT):cint;extdecl;
       mysql_stmt_fetch: function (stmt:PMYSQL_STMT):cint;extdecl;
       mysql_stmt_fetch_column: function (stmt:PMYSQL_STMT; bind:PMYSQL_BIND; column:cuint; offset:culong):cint;extdecl;
@@ -1917,12 +1917,12 @@ uses
       mysql_stmt_close: function (stmt:PMYSQL_STMT):my_bool;extdecl;
       mysql_stmt_reset: function (stmt:PMYSQL_STMT):my_bool;extdecl;
       mysql_stmt_free_result: function (stmt:PMYSQL_STMT):my_bool;extdecl;
-      mysql_stmt_send_long_data: function (stmt:PMYSQL_STMT; param_number:cuint; data:Pchar; length:culong):my_bool;extdecl;
+      mysql_stmt_send_long_data: function (stmt:PMYSQL_STMT; param_number:cuint; data:PAnsiChar; length:culong):my_bool;extdecl;
       mysql_stmt_result_metadata: function (stmt:PMYSQL_STMT):PMYSQL_RES;extdecl;
       mysql_stmt_param_metadata: function (stmt:PMYSQL_STMT):PMYSQL_RES;extdecl;
       mysql_stmt_errno: function (stmt:PMYSQL_STMT):cuint;extdecl;
-      mysql_stmt_error: function (stmt:PMYSQL_STMT):Pchar;extdecl;
-      mysql_stmt_sqlstate: function (stmt:PMYSQL_STMT):Pchar;extdecl;
+      mysql_stmt_error: function (stmt:PMYSQL_STMT):PAnsiChar;extdecl;
+      mysql_stmt_sqlstate: function (stmt:PMYSQL_STMT):PAnsiChar;extdecl;
       mysql_stmt_row_seek: function (stmt:PMYSQL_STMT; offset:MYSQL_ROW_OFFSET):MYSQL_ROW_OFFSET;extdecl;
       mysql_stmt_row_tell: function (stmt:PMYSQL_STMT):MYSQL_ROW_OFFSET;extdecl;
       mysql_stmt_data_seek: procedure (stmt:PMYSQL_STMT; offset:my_ulonglong);extdecl;
@@ -1956,8 +1956,8 @@ uses
 
 {$IFDEF LinkDynamically}
 Function InitialiseMysql(Const LibraryName : AnsiString) : Integer;
-Function InitialiseMysql(Const LibraryName : AnsiString; argc: cint; argv:PPchar = Nil; groups:PPchar = nil) : Integer;
-Function InitialiseMysql(argc:cint = -1; argv:PPchar = nil; groups:PPchar = nil) : Integer;
+Function InitialiseMysql(Const LibraryName : AnsiString; argc: cint; argv:PPAnsiChar = Nil; groups:PPAnsiChar = nil) : Integer;
+Function InitialiseMysql(argc:cint = -1; argv:PPAnsiChar = nil; groups:PPAnsiChar = nil) : Integer;
 Procedure ReleaseMySQL;
 Function DoReleaseMysql : Integer;
 
@@ -1977,7 +1977,7 @@ ResourceString
 var 
   RefCount : integer;
 
-Function TryInitialiseMysql(Const LibraryName: AnsiString; argc: cint; argv: PPchar; groups: PPchar) : Integer;
+Function TryInitialiseMysql(Const LibraryName: AnsiString; argc: cint; argv: PPAnsiChar; groups: PPAnsiChar) : Integer;
 
 begin
   Result := 0;
@@ -2108,7 +2108,7 @@ end;
 
 
 
-Function InitialiseMysql(argc: cint; argv: PPchar; groups: PPchar) : Integer;
+Function InitialiseMysql(argc: cint; argv: PPAnsiChar; groups: PPAnsiChar) : Integer;
 
 begin
   Result := 0;
@@ -2128,7 +2128,7 @@ begin
   Result:=InitialiseMySQL(LibraryName,-1,Nil,Nil);
 end;
 
-Function InitialiseMysql(Const LibraryName: AnsiString; argc: cint; argv: PPchar; groups:PPchar) : Integer;
+Function InitialiseMysql(Const LibraryName: AnsiString; argc: cint; argv: PPAnsiChar; groups:PPAnsiChar) : Integer;
 
 begin
   Result := TryInitialiseMysql(LibraryName,argc,argv,groups);

packages/mysql/src/mysql3.pp

@@ -52,36 +52,36 @@ Function mysql_field_tell(res : PMYSQL_RES) : Cardinal; extdecl; external mysqll
 Function mysql_affected_rows(mysql : PMYSQL): my_ulonglong; extdecl; external mysqllib;
 Function mysql_insert_id(mysql : PMYSQL): my_ulonglong; extdecl; external mysqllib;
 Function mysql_errno(mysql : PMYSQL) : Cardinal; extdecl; external mysqllib;
-Function mysql_info(mysql : PMYSQL): Pchar; extdecl; external mysqllib;
+Function mysql_info(mysql : PMYSQL): PAnsiChar; extdecl; external mysqllib;
 Function mysql_thread_id(mysql : PMYSQL) : ptruint; extdecl; external mysqllib;
-Function mysql_error(mysql : PMYSQL) : pchar; extdecl; external mysqllib;
+Function mysql_error(mysql : PMYSQL) : PAnsiChar; extdecl; external mysqllib;
 
 function mysql_init(mysql: PMYSQL) : PMYSQL;extdecl; external mysqllib name 'mysql_init';
-function mysql_connect (mysql : PMYSQL; host,user,passwd: pchar) : PMYSQL;extdecl; external mysqllib name 'mysql_connect';
-function mysql_real_connect (mysql : PMYSQL; const host,user,passwd : pchar;
-		                   {$ifndef use_mysql_321} const db : Pchar; {$endif}  // strictly speaking 3.22+ not 3.21+	      		
+function mysql_connect (mysql : PMYSQL; host,user,passwd: PAnsiChar) : PMYSQL;extdecl; external mysqllib name 'mysql_connect';
+function mysql_real_connect (mysql : PMYSQL; const host,user,passwd : PAnsiChar;
+		                   {$ifndef use_mysql_321} const db : PAnsiChar; {$endif}  // strictly speaking 3.22+ not 3.21+	      		
                                    port : cardinal;
-                                   unix_socket : pchar;
+                                   unix_socket : PAnsiChar;
                                    clientflag : cardinal) : PMYSQL;extdecl; external mysqllib;
 
 function mysql_close(sock : PMYSQL) : longint ;extdecl; external mysqllib name 'mysql_close';
-function mysql_select_db(MYSQL : PMYSQL; db : Pchar) : longint;extdecl; external mysqllib name 'mysql_select_db';
-function mysql_query(mysql : PMYSQL; q : pchar) : longint;extdecl; external mysqllib name 'mysql_query';
-function mysql_real_query(mysql : PMYSQL; q : Pchar; length : longint) : longint;extdecl; external mysqllib name 'mysql_real_query';
-function mysql_create_db(mysql : PMYSQL; db : pchar) : longint;extdecl; external mysqllib name 'mysql_create_db';
-Function mysql_drop_db(mysql : PMYSQL; DB : Pchar) : longint;extdecl; external mysqllib name 'mysql_drop_db';
+function mysql_select_db(MYSQL : PMYSQL; db : PAnsiChar) : longint;extdecl; external mysqllib name 'mysql_select_db';
+function mysql_query(mysql : PMYSQL; q : PAnsiChar) : longint;extdecl; external mysqllib name 'mysql_query';
+function mysql_real_query(mysql : PMYSQL; q : PAnsiChar; length : longint) : longint;extdecl; external mysqllib name 'mysql_real_query';
+function mysql_create_db(mysql : PMYSQL; db : PAnsiChar) : longint;extdecl; external mysqllib name 'mysql_create_db';
+Function mysql_drop_db(mysql : PMYSQL; DB : PAnsiChar) : longint;extdecl; external mysqllib name 'mysql_drop_db';
 Function mysql_shutdown(mysql : PMYSQL) : longint;extdecl; external mysqllib name 'mysql_shutdown';
 Function mysql_dump_debug_info(mysql : PMYSQL) : longint;extdecl; external mysqllib name 'mysql_dump_debug_info';
 Function mysql_refresh(mysql : PMYSQL; refresh_options : cardinal) : longint;extdecl; external mysqllib name 'mysql_refresh';
 Function mysql_kill(mysql : PMYSQL; pid : Cardinal) : longint;extdecl; external mysqllib name 'mysql_kill';
-Function mysql_stat(mysql : PMYSQL) : Pchar;extdecl; external mysqllib name 'mysql_stat';
-Function mysql_get_server_info(mysql : PMYSQL) : pchar;extdecl; external mysqllib name 'mysql_get_server_info';
-Function mysql_get_client_info : pchar;extdecl; external mysqllib;
-Function mysql_get_host_info(mysql : PMYSQL) : pchar;extdecl; external mysqllib name 'mysql_get_host_info';
+Function mysql_stat(mysql : PMYSQL) : PAnsiChar;extdecl; external mysqllib name 'mysql_stat';
+Function mysql_get_server_info(mysql : PMYSQL) : PAnsiChar;extdecl; external mysqllib name 'mysql_get_server_info';
+Function mysql_get_client_info : PAnsiChar;extdecl; external mysqllib;
+Function mysql_get_host_info(mysql : PMYSQL) : PAnsiChar;extdecl; external mysqllib name 'mysql_get_host_info';
 Function mysql_get_proto_info(mysql : PMYSQL) : Cardinal;extdecl; external mysqllib name 'mysql_get_proto_info';
-Function mysql_list_dbs(mysql : PMYSQL;wild : Pchar) : PMYSQL_RES;extdecl; external mysqllib name 'mysql_list_dbs';
-Function mysql_list_tables(mysql : PMYSQL;Wild : Pchar) : PMYSQL_RES;extdecl; external mysqllib name 'mysql_list_tables';
-Function mysql_list_fields(mysql : PMYSQL; table,wild : pchar) : PMYSQL_RES;extdecl; external mysqllib name 'mysql_list_fields';
+Function mysql_list_dbs(mysql : PMYSQL;wild : PAnsiChar) : PMYSQL_RES;extdecl; external mysqllib name 'mysql_list_dbs';
+Function mysql_list_tables(mysql : PMYSQL;Wild : PAnsiChar) : PMYSQL_RES;extdecl; external mysqllib name 'mysql_list_tables';
+Function mysql_list_fields(mysql : PMYSQL; table,wild : PAnsiChar) : PMYSQL_RES;extdecl; external mysqllib name 'mysql_list_fields';
 Function mysql_list_processes(mysql : PMYSQL) : PMYSQL_RES;extdecl; external mysqllib name 'mysql_list_processes';
 Function mysql_store_result(mysql : PMYSQL) : PMYSQL_RES;extdecl; external mysqllib name 'mysql_store_result';
 Function mysql_use_result(mysql : PMYSQL) : PMYSQL_RES;extdecl; external mysqllib name 'mysql_use_result';
@@ -92,8 +92,8 @@ Function mysql_field_seek(musql : PMYSQL_RES;offs : TMYSQL_FIELD_OFFSET): TMYSQL
 function mysql_fetch_row(mysql : PMYSQL_RES) : TMYSQL_ROW;extdecl; external mysqllib name 'mysql_fetch_row';
 function mysql_fetch_lengths(mysql : PMYSQL_RES) : PCardinal;extdecl; external mysqllib name 'mysql_fetch_lengths';
 function mysql_fetch_field(handle : PMYSQL_RES) : PMYSQL_FIELD;extdecl; external mysqllib name 'mysql_fetch_field';
-Function mysql_escape_string(escto,escfrom : pchar; length : Cardinal) : cardinal;extdecl; external mysqllib name 'mysql_escape_string';
-Procedure mysql_debug(debug : pchar);extdecl; external mysqllib name 'mysql_debug';
+Function mysql_escape_string(escto,escfrom : PAnsiChar; length : Cardinal) : cardinal;extdecl; external mysqllib name 'mysql_escape_string';
+Procedure mysql_debug(debug : PAnsiChar);extdecl; external mysqllib name 'mysql_debug';
 
 implementation
 

packages/mysql/src/mysql3_com.pp

@@ -44,23 +44,23 @@ Procedure sql_free (root : PMEM_ROOT);extdecl;external;
 Procedure init_alloc_root (root: PMEM_ROOT;block_size : Cardinal);extdecl;external;
 Function sql_alloc_first_block(root : PMEM_ROOT) : my_bool;extdecl;external;
 Function sql_alloc_root(mem_root : PMEM_ROOT;len : Cardinal) : longint;extdecl;external;
-Function sql_strdup_root(root : PMEM_ROOT;st : pchar) : pchar;extdecl;external;
-Function sql_memdup_root(root: PMEM_ROOT;st : pchar; len : Cardinal) : longint;extdecl;external;
+Function sql_strdup_root(root : PMEM_ROOT;st : PAnsiChar) : PAnsiChar;extdecl;external;
+Function sql_memdup_root(root: PMEM_ROOT;st : PAnsiChar; len : Cardinal) : longint;extdecl;external;
 Function  my_net_init(net :PNET; fd : Socket) : Longint;extdecl;external;
 procedure net_end(net : PNET);extdecl;external;
 Procedure net_clear(net : PNET);extdecl;external;
 Function  net_flush(net : PNET) : longint;extdecl;external;
 Function  my_net_write(net : PNET;packet : pbyte;len : cardinal) : longint;extdecl;external;
-Function  net_write_command(net : PNET; command : char;packet : pbyte;len : cardinal) : longint;extdecl;external;
+Function  net_write_command(net : PNET; command : AnsiChar;packet : pbyte;len : cardinal) : longint;extdecl;external;
 Function  net_real_write(net : PNET;packet : pbyte; len : Cardinal) : longint;extdecl;external;
 Function  my_net_read(net : PNET) : Cardinal;extdecl;external;
 procedure randominit(rand : Prand_struct; seed1,seed2 : Cardinal);extdecl;external;
 Function  rnd(rand : Prand_struct) : double;extdecl;external;
-procedure make_scrambled_password(toarg, passwd : Pchar);extdecl;external;
-procedure get_salt_from_password(res : pcardinal; password : pchar);extdecl;external;
-procedure scramble(toarg,message,password : pchar; old_ver : my_bool);extdecl;external;
-function  check_scramble(scramble,message : pchar; salt : cardinal;old_ver:my_bool) : my_bool;extdecl;external;
-function  get_tty_password(opt_message:  pchar) : pchar;extdecl;external;
+procedure make_scrambled_password(toarg, passwd : PAnsiChar);extdecl;external;
+procedure get_salt_from_password(res : pcardinal; password : PAnsiChar);extdecl;external;
+procedure scramble(toarg,message,password : PAnsiChar; old_ver : my_bool);extdecl;external;
+function  check_scramble(scramble,message : PAnsiChar; salt : cardinal;old_ver:my_bool) : my_bool;extdecl;external;
+function  get_tty_password(opt_message:  PAnsiChar) : PAnsiChar;extdecl;external;
 
 (*
 #define NULL_LENGTH ((unsigned long) ~0) { For net_store_length }

packages/mysql/src/mysql3_comdyn.pp

@@ -37,23 +37,23 @@ var
   init_alloc_root : procedure(root: PMEM_ROOT;block_size : Cardinal);extdecl;
   sql_alloc_first_block : function(root : PMEM_ROOT) : my_bool;extdecl;
   sql_alloc_root : function(mem_root : PMEM_ROOT;len : Cardinal) : longint;extdecl;
-  sql_strdup_root : function(root : PMEM_ROOT;st : pchar) : pchar;extdecl;
-  sql_memdup_root : function(root: PMEM_ROOT;st : pchar; len : Cardinal) : longint;extdecl;
+  sql_strdup_root : function(root : PMEM_ROOT;st : PAnsiChar) : PAnsiChar;extdecl;
+  sql_memdup_root : function(root: PMEM_ROOT;st : PAnsiChar; len : Cardinal) : longint;extdecl;
   my_net_init : function(net :PNET; fd : Socket) : Longint;extdecl;
   net_end : procedure(net : PNET);extdecl;
   net_clear : procedure(net : PNET);extdecl;
   net_flush : function(net : PNET) : longint;extdecl;
   my_net_write : function(net : PNET;packet : pbyte;len : cardinal) : longint;extdecl;
-  net_write_command : function(net : PNET; command : char;packet : pbyte;len : cardinal) : longint;extdecl;
+  net_write_command : function(net : PNET; command : AnsiChar;packet : pbyte;len : cardinal) : longint;extdecl;
   net_real_write : function(net : PNET;packet : pbyte; len : Cardinal) : longint;extdecl;
   my_net_read : function(net : PNET) : Cardinal;extdecl;
   randominit : procedure(rand : Prand_struct; seed1,seed2 : Cardinal);extdecl;
   rnd : function(rand : Prand_struct) : double;extdecl;
-  make_scrambled_password : procedure(toarg, passwd : Pchar);extdecl;
-  get_salt_from_password : procedure(res : pcardinal; password : pchar);extdecl;
-  scramble : procedure(toarg,message,password : pchar; old_ver : my_bool);extdecl;
-  check_scramble : function(scramble,message : pchar; salt : cardinal;old_ver:my_bool) : my_bool;extdecl;
-  get_tty_password : function(opt_message:  pchar) : pchar;extdecl;
+  make_scrambled_password : procedure(toarg, passwd : PAnsiChar);extdecl;
+  get_salt_from_password : procedure(res : pcardinal; password : PAnsiChar);extdecl;
+  scramble : procedure(toarg,message,password : PAnsiChar; old_ver : my_bool);extdecl;
+  check_scramble : function(scramble,message : PAnsiChar; salt : cardinal;old_ver:my_bool) : my_bool;extdecl;
+  get_tty_password : function(opt_message:  PAnsiChar) : PAnsiChar;extdecl;
 
 Procedure InitialiseMysql3_com;
 Procedure ReleaseMysql3_com;

packages/mysql/src/mysql3_comtypes.inc

@@ -13,10 +13,10 @@ Type
 
 Const
  NAME_LEN  = 64 ;               { Field/table name length }
- LOCAL_HOST : pchar = 'localhost' ;
+ LOCAL_HOST : PAnsiChar = 'localhost' ;
 
  MYSQL_PORT = 3306;             { Alloced by ISI for MySQL }
- MYSQL_UNIX_ADDR  : pchar = '/tmp/mysql.sock';
+ MYSQL_UNIX_ADDR  : PAnsiChar = '/tmp/mysql.sock';
 
 Type
  enum_server_command = ( COM_SLEEP,COM_QUIT,COM_INIT_DB,COM_QUERY,
@@ -120,8 +120,8 @@ st_net  = record
   nettype : net_type; //DT
   fd : Socket;
   fcntl : Longint;
-  buff,buff_end,write_pos,read_pos : Pchar;//DT
-  last_error : array [0..MYSQL_ERRMSG_SIZE-1] of char;
+  buff,buff_end,write_pos,read_pos : PAnsiChar;//DT
+  last_error : array [0..MYSQL_ERRMSG_SIZE-1] of AnsiChar;
   last_errno,max_packet,timeout,pkt_nr : Cardinal;
   error,return_errno : my_bool;
   compress : my_bool; //DT
@@ -135,7 +135,7 @@ st_net  = record
 {$else}
   more : my_bool;//DT
 {$endif}
-  save_char : char; //DT
+  save_char : AnsiChar; //DT
 end;
 TNET = st_net;
 PNET = ^TNET;
@@ -192,7 +192,7 @@ Item_result = (STRING_RESULT,REAL_RESULT,INT_RESULT);
 st_udf_args = record
   arg_count : cardinal;                 { Number of arguments }
   arg_type : ^Item_result;              { Pointer to item_results }
-  args : ppchar;                        { Pointer to argument }
+  args : PPAnsiChar;                        { Pointer to argument }
   lengths : PCardinal;                  { Length of string arguments }
 end;
 TUDF_ARGS = st_udf_args;
@@ -204,7 +204,7 @@ st_udf_init = record
   maybe_null : my_bool;                 { 1 if function can return NULL }
   decimals : cardinal;                  { for real functions }
   max_length : Cardinal;                { For string functions }
-  ptr : PChar;                          { free pointer for function data }
+  ptr : PAnsiChar;                          { free pointer for function data }
 end;
 TUDF_INIT = st_udf_init;
 PUDF_INIT = TUDF_INIT;

packages/mysql/src/mysql3_version.pp

@@ -18,11 +18,11 @@ interface
 Const
 
 {$ifdef use_mysql_321}
-  MYSQL_SERVER_VERSION : pchar ='3.21.28-gamma';
+  MYSQL_SERVER_VERSION : PAnsiChar ='3.21.28-gamma';
   FRM_VER = 6;
   MYSQL_VERSION_ID =32128;
 {$else}
-  MYSQL_SERVER_VERSION : pchar ='3.23.34';
+  MYSQL_SERVER_VERSION : PAnsiChar ='3.23.34';
   FRM_VER = 6; { ??? }
   MYSQL_VERSION_ID =32334;
 {$endif}

packages/mysql/src/mysql3dyn.pp

@@ -32,7 +32,7 @@ uses dynlibs, classes, sysutils, mysql3_comdyn;
 
 {$i mysql3types.inc}
 
-type tpcharfunction = function : pchar; extdecl;
+type tpcharfunction = function : PAnsiChar; extdecl;
 
 var
   mysql_num_rows : function(res : PMYSQL_RES) : my_ulonglong; extdecl;
@@ -45,35 +45,35 @@ var
   mysql_affected_rows : function(mysql : PMYSQL): my_ulonglong; extdecl;
   mysql_insert_id : function(mysql : PMYSQL): my_ulonglong; extdecl;
   mysql_errno : function(mysql : PMYSQL) : Cardinal; extdecl;
-  mysql_info : function(mysql : PMYSQL): Pchar; extdecl;
+  mysql_info : function(mysql : PMYSQL): PAnsiChar; extdecl;
   mysql_thread_id : function(mysql : PMYSQL) : ptruint; extdecl;
-  mysql_error : function(mysql : PMYSQL) : pchar; extdecl;
+  mysql_error : function(mysql : PMYSQL) : PAnsiChar; extdecl;
 
   mysql_init : function(mysql: PMYSQL) : PMYSQL;extdecl;
-  mysql_connect : function(mysql : PMYSQL; host,user,passwd: pchar) : PMYSQL;extdecl;
-  mysql_real_connect : function(mysql : PMYSQL; const host,user,passwd : pchar;
-		                   {$ifndef use_mysql_321} const db : Pchar; {$endif}  // strictly speaking 3.22+ not 3.21+	      		
+  mysql_connect : function(mysql : PMYSQL; host,user,passwd: PAnsiChar) : PMYSQL;extdecl;
+  mysql_real_connect : function(mysql : PMYSQL; const host,user,passwd : PAnsiChar;
+		                   {$ifndef use_mysql_321} const db : PAnsiChar; {$endif}  // strictly speaking 3.22+ not 3.21+	      		
                                    port : cardinal;
-                                   unix_socket : pchar;
+                                   unix_socket : PAnsiChar;
                                    clientflag : cardinal) : PMYSQL;extdecl;
   mysql_close : function(sock : PMYSQL) : longint ;extdecl;
-  mysql_select_db : function(MYSQL : PMYSQL; db : Pchar) : longint;extdecl;
-  mysql_query : function(mysql : PMYSQL; q : pchar) : longint;extdecl;
-  mysql_real_query : function(mysql : PMYSQL; q : Pchar; length : longint) : longint;extdecl;
-  mysql_create_db : function(mysql : PMYSQL; db : pchar) : longint;extdecl;
-  mysql_drop_db : function(mysql : PMYSQL; DB : Pchar) : longint;extdecl;
+  mysql_select_db : function(MYSQL : PMYSQL; db : PAnsiChar) : longint;extdecl;
+  mysql_query : function(mysql : PMYSQL; q : PAnsiChar) : longint;extdecl;
+  mysql_real_query : function(mysql : PMYSQL; q : PAnsiChar; length : longint) : longint;extdecl;
+  mysql_create_db : function(mysql : PMYSQL; db : PAnsiChar) : longint;extdecl;
+  mysql_drop_db : function(mysql : PMYSQL; DB : PAnsiChar) : longint;extdecl;
   mysql_shutdown : function(mysql : PMYSQL) : longint;extdecl;
   mysql_dump_debug_info : function(mysql : PMYSQL) : longint;extdecl;
   mysql_refresh : function(mysql : PMYSQL; refresh_options : cardinal) : longint;extdecl;
   mysql_kill : function(mysql : PMYSQL; pid : Cardinal) : longint;extdecl;
-  mysql_stat : function(mysql : PMYSQL) : Pchar;extdecl;
-  mysql_get_server_info : function(mysql : PMYSQL) : pchar;extdecl;
-  mysql_get_client_info : function : pchar;extdecl;
-  mysql_get_host_info : function(mysql : PMYSQL) : pchar;extdecl;
+  mysql_stat : function(mysql : PMYSQL) : PAnsiChar;extdecl;
+  mysql_get_server_info : function(mysql : PMYSQL) : PAnsiChar;extdecl;
+  mysql_get_client_info : function : PAnsiChar;extdecl;
+  mysql_get_host_info : function(mysql : PMYSQL) : PAnsiChar;extdecl;
   mysql_get_proto_info : function(mysql : PMYSQL) : Cardinal;extdecl;
-  mysql_list_dbs : function(mysql : PMYSQL;wild : Pchar) : PMYSQL_RES;extdecl;
-  mysql_list_tables : function(mysql : PMYSQL;Wild : Pchar) : PMYSQL_RES;extdecl;
-  mysql_list_fields : function(mysql : PMYSQL; table,wild : pchar) : PMYSQL_RES;extdecl;
+  mysql_list_dbs : function(mysql : PMYSQL;wild : PAnsiChar) : PMYSQL_RES;extdecl;
+  mysql_list_tables : function(mysql : PMYSQL;Wild : PAnsiChar) : PMYSQL_RES;extdecl;
+  mysql_list_fields : function(mysql : PMYSQL; table,wild : PAnsiChar) : PMYSQL_RES;extdecl;
   mysql_list_processes : function(mysql : PMYSQL) : PMYSQL_RES;extdecl;
   mysql_store_result : function(mysql : PMYSQL) : PMYSQL_RES;extdecl;
   mysql_use_result : function(mysql : PMYSQL) : PMYSQL_RES;extdecl;
@@ -84,8 +84,8 @@ var
   mysql_fetch_row : function(mysql : PMYSQL_RES) : TMYSQL_ROW;extdecl;
   mysql_fetch_lengths : function(mysql : PMYSQL_RES) : PCardinal;extdecl;
   mysql_fetch_field : function(handle : PMYSQL_RES) : PMYSQL_FIELD;extdecl;
-  mysql_escape_string : function(escto,escfrom : pchar; length : Cardinal) : cardinal;extdecl;
-  mysql_debug : procedure(debug : pchar);extdecl;
+  mysql_escape_string : function(escto,escfrom : PAnsiChar; length : Cardinal) : cardinal;extdecl;
+  mysql_debug : procedure(debug : PAnsiChar);extdecl;
 
 Procedure InitialiseMysql3;
 Procedure ReleaseMysql3;

packages/mysql/src/mysql3types.inc

@@ -8,20 +8,20 @@
 
 type
    my_bool = byte;
-   gptr   = pchar;
+   gptr   = PAnsiChar;
    Socket = Longint;
    PCardinal = ^Cardinal;
 
 {$ifdef linux}
 Var
   mysql_port : cardinal; external name 'mysql_port';
-  mysql_unix_port : pchar; external name 'mysql_unix_port';
+  mysql_unix_port : PAnsiChar; external name 'mysql_unix_port';
 {$endif}
 
 {$ifdef darwin}
 Var
   mysql_port : cardinal; external mysqllib name 'mysql_port';
-  mysql_unix_port : pchar; external mysqllib name 'mysql_unix_port';
+  mysql_unix_port : PAnsiChar; external mysqllib name 'mysql_unix_port';
 {$endif}
 
 {
@@ -32,9 +32,9 @@ Var
 }
 Type
 st_mysql_field = record
-  name : Pchar;                 { Name of column }
-  table : pchar;                { Table of column if column was a field }
-  def: pchar;                   { Default value (set by mysql_list_fields) }
+  name : PAnsiChar;                 { Name of column }
+  table : PAnsiChar;                { Table of column if column was a field }
+  def: PAnsiChar;                   { Default value (set by mysql_list_fields) }
   ftype : enum_field_types;     { Type of field. See mysql_com.h for types }
   length : cardinal;            { Width of column }
   max_length : cardinal;        { Max width of selected set }
@@ -44,7 +44,7 @@ end;
 TMYSQL_FIELD = st_mysql_field;
 PMYSQL_FIELD = ^TMYSQL_FIELD;
 
-TMYSQL_ROW = PPchar;             { return data as array of strings }
+TMYSQL_ROW = PPAnsiChar;             { return data as array of strings }
 TMYSQL_FIELD_OFFSET = cardinal;  { offset to current field }
 
 {$ifndef oldmysql}
@@ -78,12 +78,12 @@ st_mysql_options = record
   connect_timeout,client_flag : cardinal;
   compress,named_pipe : my_bool;
   port : cardinal;
-  host,init_command,user,password,unix_socket,db : pchar;
-  my_cnf_file,my_cnf_group : pchar;
+  host,init_command,user,password,unix_socket,db : PAnsiChar;
+  my_cnf_file,my_cnf_group : PAnsiChar;
 {$ifndef use_mysql_321}
-  charset_dir, charset_name : pchar;
+  charset_dir, charset_name : PAnsiChar;
   use_ssl : my_bool;
-  ssl_key, ssl_cert, ssl_ca, ssl_capath : pchar;
+  ssl_key, ssl_cert, ssl_ca, ssl_capath : PAnsiChar;
 {$endif}
 end;
 
@@ -102,7 +102,7 @@ mysql_status = (MYSQL_STATUS_READY,
 (*
 charset_info_st = Record
         number : cardinal;
-        name : pchar;
+        name : PAnsiChar;
         ctype : pointer {uchar*};
         to_lower : pointer {uchar*};
         to_upper : pointer {uchar*};
@@ -123,7 +123,7 @@ st_mysql = Record
   connector_fd : gptr;
 {$endif}
   host,user,passwd,unix_socket,server_version,host_info,
-  info,db : pchar;
+  info,db : PAnsiChar;
   port,client_flag,server_capabilities : cardinal;
   protocol_version : cardinal;
   field_count : cardinal;
@@ -142,7 +142,7 @@ st_mysql = Record
   reconnect : my_bool;          { set to 1 if automatic reconnect }
   options : st_mysql_options;
 {$ifndef use_mysql_321}
-  scramble_buf : array[0..8] of char;
+  scramble_buf : array[0..8] of AnsiChar;
   charset : pointer { struct charset_info_st};
   server_language : cardinal;
 {$endif}

packages/mysql/src/mysql4.pp

@@ -47,7 +47,7 @@ uses ctypes,my4_sys,mysql4_com,dynlibs;
 
 {$i mysql4types.inc}
 
-function mysql_server_init(argc:longint; argv:PPchar; groups:PPchar):longint;extdecl;external External_library name 'mysql_server_init';
+function mysql_server_init(argc:longint; argv:PPAnsiChar; groups:PPAnsiChar):longint;extdecl;external External_library name 'mysql_server_init';
 procedure mysql_server_end;extdecl;external External_library name 'mysql_server_end';
 function mysql_thread_init:my_bool;extdecl;external External_library name 'mysql_thread_init';
 procedure mysql_thread_end;extdecl;external External_library name 'mysql_thread_end';
@@ -62,27 +62,27 @@ function mysql_field_count(mysql:PMYSQL):dword;extdecl;external External_library
 function mysql_affected_rows(mysql:PMYSQL):my_ulonglong;extdecl;external External_library name 'mysql_affected_rows';
 function mysql_insert_id(mysql:PMYSQL):my_ulonglong;extdecl;external External_library name 'mysql_insert_id';
 function mysql_errno(mysql:PMYSQL):dword;extdecl;external External_library name 'mysql_errno';
-function mysql_error(mysql:PMYSQL):Pchar;extdecl;external External_library name 'mysql_error';
-function mysql_info(mysql:PMYSQL):Pchar;extdecl;external External_library name 'mysql_info';
+function mysql_error(mysql:PMYSQL):PAnsiChar;extdecl;external External_library name 'mysql_error';
+function mysql_info(mysql:PMYSQL):PAnsiChar;extdecl;external External_library name 'mysql_info';
 function mysql_thread_id(mysql:PMYSQL):dword;extdecl;external External_library name 'mysql_thread_id';
-function mysql_character_set_name(mysql:PMYSQL):Pchar;extdecl;external External_library name 'mysql_character_set_name';
+function mysql_character_set_name(mysql:PMYSQL):PAnsiChar;extdecl;external External_library name 'mysql_character_set_name';
 function mysql_init(mysql:PMYSQL):PMYSQL;extdecl;external External_library name 'mysql_init';
-function mysql_ssl_set(mysql:PMYSQL; key:Pchar; cert:Pchar; ca:Pchar; capath:Pchar;
-           cipher:Pchar):longint;extdecl;external External_library name 'mysql_ssl_set';
+function mysql_ssl_set(mysql:PMYSQL; key:PAnsiChar; cert:PAnsiChar; ca:PAnsiChar; capath:PAnsiChar;
+           cipher:PAnsiChar):longint;extdecl;external External_library name 'mysql_ssl_set';
 function mysql_ssl_clear(mysql:PMYSQL):longint;extdecl;external External_library name 'mysql_ssl_clear';
-function mysql_change_user(mysql:PMYSQL; user:Pchar; passwd:Pchar; db:Pchar):my_bool;extdecl;external External_library name 'mysql_change_user';
-function mysql_real_connect(mysql:PMYSQL; host:Pchar; user:Pchar; passwd:Pchar; db:Pchar;
-           port:dword; unix_socket:Pchar; clientflag:dword):PMYSQL;extdecl;external External_library name 'mysql_real_connect';
+function mysql_change_user(mysql:PMYSQL; user:PAnsiChar; passwd:PAnsiChar; db:PAnsiChar):my_bool;extdecl;external External_library name 'mysql_change_user';
+function mysql_real_connect(mysql:PMYSQL; host:PAnsiChar; user:PAnsiChar; passwd:PAnsiChar; db:PAnsiChar;
+           port:dword; unix_socket:PAnsiChar; clientflag:dword):PMYSQL;extdecl;external External_library name 'mysql_real_connect';
 procedure mysql_close(sock:PMYSQL);extdecl;external External_library name 'mysql_close';
-function mysql_select_db(mysql:PMYSQL; db:Pchar):longint;extdecl;external External_library name 'mysql_select_db';
-function mysql_query(mysql:PMYSQL; q:Pchar):longint;extdecl;external External_library name 'mysql_query';
-function mysql_send_query(mysql:PMYSQL; q:Pchar; length:dword):longint;extdecl;external External_library name 'mysql_send_query';
+function mysql_select_db(mysql:PMYSQL; db:PAnsiChar):longint;extdecl;external External_library name 'mysql_select_db';
+function mysql_query(mysql:PMYSQL; q:PAnsiChar):longint;extdecl;external External_library name 'mysql_query';
+function mysql_send_query(mysql:PMYSQL; q:PAnsiChar; length:dword):longint;extdecl;external External_library name 'mysql_send_query';
 function mysql_read_query_result(mysql:PMYSQL):longint;extdecl;external External_library name 'mysql_read_query_result';
-function mysql_real_query(mysql:PMYSQL; q:Pchar; length:dword):longint;extdecl;external External_library name 'mysql_real_query';
-function mysql_master_query(mysql:PMYSQL; q:Pchar; length:dword):longint;extdecl;external External_library name 'mysql_master_query';
-function mysql_master_send_query(mysql:PMYSQL; q:Pchar; length:dword):longint;extdecl;external External_library name 'mysql_master_send_query';
-function mysql_slave_query(mysql:PMYSQL; q:Pchar; length:dword):longint;extdecl;external External_library name 'mysql_slave_query';
-function mysql_slave_send_query(mysql:PMYSQL; q:Pchar; length:dword):longint;extdecl;external External_library name 'mysql_slave_send_query';
+function mysql_real_query(mysql:PMYSQL; q:PAnsiChar; length:dword):longint;extdecl;external External_library name 'mysql_real_query';
+function mysql_master_query(mysql:PMYSQL; q:PAnsiChar; length:dword):longint;extdecl;external External_library name 'mysql_master_query';
+function mysql_master_send_query(mysql:PMYSQL; q:PAnsiChar; length:dword):longint;extdecl;external External_library name 'mysql_master_send_query';
+function mysql_slave_query(mysql:PMYSQL; q:PAnsiChar; length:dword):longint;extdecl;external External_library name 'mysql_slave_query';
+function mysql_slave_send_query(mysql:PMYSQL; q:PAnsiChar; length:dword):longint;extdecl;external External_library name 'mysql_slave_send_query';
 
 procedure mysql_enable_rpl_parse(mysql:PMYSQL);extdecl;external External_library name 'mysql_enable_rpl_parse';
 procedure mysql_disable_rpl_parse(mysql:PMYSQL);extdecl;external External_library name 'mysql_disable_rpl_parse';
@@ -91,29 +91,29 @@ procedure mysql_enable_reads_from_master(mysql:PMYSQL);extdecl;external External
 procedure mysql_disable_reads_from_master(mysql:PMYSQL);extdecl;external External_library name 'mysql_disable_reads_from_master';
 function mysql_reads_from_master_enabled(mysql:PMYSQL):longint;extdecl;external External_library name 'mysql_reads_from_master_enabled';
 (* error
-enum mysql_rpl_type      mysql_rpl_query_type(const char* q, int len);
+enum mysql_rpl_type      mysql_rpl_query_type(const AnsiChar* q, int len);
 in declaration at line 291 *)
 
 function mysql_rpl_probe(mysql:PMYSQL):longint;extdecl;external External_library name 'mysql_rpl_probe';
-function mysql_set_master(mysql:PMYSQL; host:Pchar; port:dword; user:Pchar; passwd:Pchar):longint;extdecl;external External_library name 'mysql_set_master';
-function mysql_add_slave(mysql:PMYSQL; host:Pchar; port:dword; user:Pchar; passwd:Pchar):longint;extdecl;external External_library name 'mysql_add_slave';
+function mysql_set_master(mysql:PMYSQL; host:PAnsiChar; port:dword; user:PAnsiChar; passwd:PAnsiChar):longint;extdecl;external External_library name 'mysql_set_master';
+function mysql_add_slave(mysql:PMYSQL; host:PAnsiChar; port:dword; user:PAnsiChar; passwd:PAnsiChar):longint;extdecl;external External_library name 'mysql_add_slave';
 function mysql_shutdown(mysql:PMYSQL):longint;extdecl;external External_library name 'mysql_shutdown';
 function mysql_dump_debug_info(mysql:PMYSQL):longint;extdecl;external External_library name 'mysql_dump_debug_info';
 function mysql_refresh(mysql:PMYSQL; refresh_options:dword):longint;extdecl;external External_library name 'mysql_refresh';
 function mysql_kill(mysql:PMYSQL; pid:dword):longint;extdecl;external External_library name 'mysql_kill';
 function mysql_ping(mysql:PMYSQL):longint;extdecl;external External_library name 'mysql_ping';
-function mysql_stat(mysql:PMYSQL):Pchar;extdecl;external External_library name 'mysql_stat';
-function mysql_get_server_info(mysql:PMYSQL):Pchar;extdecl;external External_library name 'mysql_get_server_info';
-function mysql_get_client_info:Pchar;extdecl;external External_library name 'mysql_get_client_info';
-function mysql_get_host_info(mysql:PMYSQL):Pchar;extdecl;external External_library name 'mysql_get_host_info';
+function mysql_stat(mysql:PMYSQL):PAnsiChar;extdecl;external External_library name 'mysql_stat';
+function mysql_get_server_info(mysql:PMYSQL):PAnsiChar;extdecl;external External_library name 'mysql_get_server_info';
+function mysql_get_client_info:PAnsiChar;extdecl;external External_library name 'mysql_get_client_info';
+function mysql_get_host_info(mysql:PMYSQL):PAnsiChar;extdecl;external External_library name 'mysql_get_host_info';
 function mysql_get_proto_info(mysql:PMYSQL):dword;extdecl;external External_library name 'mysql_get_proto_info';
-function mysql_list_dbs(mysql:PMYSQL; wild:Pchar):PMYSQL_RES;extdecl;external External_library name 'mysql_list_dbs';
-function mysql_list_tables(mysql:PMYSQL; wild:Pchar):PMYSQL_RES;extdecl;external External_library name 'mysql_list_tables';
-function mysql_list_fields(mysql:PMYSQL; table:Pchar; wild:Pchar):PMYSQL_RES;extdecl;external External_library name 'mysql_list_fields';
+function mysql_list_dbs(mysql:PMYSQL; wild:PAnsiChar):PMYSQL_RES;extdecl;external External_library name 'mysql_list_dbs';
+function mysql_list_tables(mysql:PMYSQL; wild:PAnsiChar):PMYSQL_RES;extdecl;external External_library name 'mysql_list_tables';
+function mysql_list_fields(mysql:PMYSQL; table:PAnsiChar; wild:PAnsiChar):PMYSQL_RES;extdecl;external External_library name 'mysql_list_fields';
 function mysql_list_processes(mysql:PMYSQL):PMYSQL_RES;extdecl;external External_library name 'mysql_list_processes';
 function mysql_store_result(mysql:PMYSQL):PMYSQL_RES;extdecl;external External_library name 'mysql_store_result';
 function mysql_use_result(mysql:PMYSQL):PMYSQL_RES;extdecl;external External_library name 'mysql_use_result';
-function mysql_options(mysql:PMYSQL; option:mysql_option; arg:Pchar):longint;extdecl;external External_library name 'mysql_options';
+function mysql_options(mysql:PMYSQL; option:mysql_option; arg:PAnsiChar):longint;extdecl;external External_library name 'mysql_options';
 procedure mysql_free_result(result:PMYSQL_RES);extdecl;external External_library name 'mysql_free_result';
 procedure mysql_data_seek(result:PMYSQL_RES; offset:my_ulonglong);extdecl;external External_library name 'mysql_data_seek';
 function mysql_row_seek(result:PMYSQL_RES; _para2:MYSQL_ROW_OFFSET):MYSQL_ROW_OFFSET;extdecl;external External_library name 'mysql_row_seek';
@@ -121,20 +121,20 @@ function mysql_field_seek(result:PMYSQL_RES; offset:MYSQL_FIELD_OFFSET):MYSQL_FI
 function mysql_fetch_row(result:PMYSQL_RES):MYSQL_ROW;extdecl;external External_library name 'mysql_fetch_row';
 function mysql_fetch_lengths(result:PMYSQL_RES):Pdword;extdecl;external External_library name 'mysql_fetch_lengths';
 function mysql_fetch_field(result:PMYSQL_RES):PMYSQL_FIELD;extdecl;external External_library name 'mysql_fetch_field';
-function mysql_escape_string(_to:Pchar; from:Pchar; from_length:dword):dword;extdecl;external External_library name 'mysql_escape_string';
-function mysql_real_escape_string(mysql:PMYSQL; _to:Pchar; from:Pchar; length:dword):dword;extdecl;external External_library name 'mysql_real_escape_string';
-procedure mysql_debug(debug:Pchar);extdecl;external External_library name 'mysql_debug';
+function mysql_escape_string(_to:PAnsiChar; from:PAnsiChar; from_length:dword):dword;extdecl;external External_library name 'mysql_escape_string';
+function mysql_real_escape_string(mysql:PMYSQL; _to:PAnsiChar; from:PAnsiChar; length:dword):dword;extdecl;external External_library name 'mysql_real_escape_string';
+procedure mysql_debug(debug:PAnsiChar);extdecl;external External_library name 'mysql_debug';
 
-function mysql_odbc_escape_string(mysql:PMYSQL; _to:Pchar; to_length:dword; from:Pchar; from_length:dword;
-         param:pointer; extend_buffer: TExdendBuffer):Pchar;extdecl;external External_library name 'mysql_odbc_escape_string';
-procedure myodbc_remove_escape(mysql:PMYSQL; name:Pchar);extdecl;external External_library name 'myodbc_remove_escape';
+function mysql_odbc_escape_string(mysql:PMYSQL; _to:PAnsiChar; to_length:dword; from:PAnsiChar; from_length:dword;
+         param:pointer; extend_buffer: TExdendBuffer):PAnsiChar;extdecl;external External_library name 'mysql_odbc_escape_string';
+procedure myodbc_remove_escape(mysql:PMYSQL; name:PAnsiChar);extdecl;external External_library name 'myodbc_remove_escape';
 function mysql_thread_safe:dword;extdecl;external External_library name 'mysql_thread_safe';
 function mysql_manager_init(con:PMYSQL_MANAGER):PMYSQL_MANAGER;extdecl;external External_library name 'mysql_manager_init';
-function mysql_manager_connect(con:PMYSQL_MANAGER; host:Pchar; user:Pchar; passwd:Pchar; port:dword):PMYSQL_MANAGER;extdecl;external External_library name 'mysql_manager_connect';
+function mysql_manager_connect(con:PMYSQL_MANAGER; host:PAnsiChar; user:PAnsiChar; passwd:PAnsiChar; port:dword):PMYSQL_MANAGER;extdecl;external External_library name 'mysql_manager_connect';
 procedure mysql_manager_close(con:PMYSQL_MANAGER);extdecl;external External_library name 'mysql_manager_close';
-function mysql_manager_command(con:PMYSQL_MANAGER; cmd:Pchar; cmd_len:longint):longint;extdecl;external External_library name 'mysql_manager_command';
-function mysql_manager_fetch_line(con:PMYSQL_MANAGER; res_buf:Pchar; res_buf_size:longint):longint;extdecl;external External_library name 'mysql_manager_fetch_line';
-function simple_command(mysql:PMYSQL; command:enum_server_command; arg:Pchar; length:dword; skipp_check:my_bool):longint;extdecl;external External_library name 'simple_command';
+function mysql_manager_command(con:PMYSQL_MANAGER; cmd:PAnsiChar; cmd_len:longint):longint;extdecl;external External_library name 'mysql_manager_command';
+function mysql_manager_fetch_line(con:PMYSQL_MANAGER; res_buf:PAnsiChar; res_buf_size:longint):longint;extdecl;external External_library name 'mysql_manager_fetch_line';
+function simple_command(mysql:PMYSQL; command:enum_server_command; arg:PAnsiChar; length:dword; skipp_check:my_bool):longint;extdecl;external External_library name 'simple_command';
 function net_safe_read(mysql:PMYSQL):dword;extdecl;external External_library name 'net_safe_read';
 
 function IS_PRI_KEY(n : longint) : Boolean;

packages/mysql/src/mysql4_com.pp

@@ -56,13 +56,13 @@ Type
   function net_flush(net:PNET):longint;extdecl;external External_library name 'net_flush';
 
 (* Const before type ignored *)
-  function my_net_write(net:PNET; packet:Pchar; len:dword):longint;extdecl;external External_library name 'my_net_write';
+  function my_net_write(net:PNET; packet:PAnsiChar; len:dword):longint;extdecl;external External_library name 'my_net_write';
 
 (* Const before type ignored *)
-  function net_write_command(net:PNET; command:byte; packet:Pchar; len:dword):longint;extdecl;external External_library name 'net_write_command';
+  function net_write_command(net:PNET; command:byte; packet:PAnsiChar; len:dword):longint;extdecl;external External_library name 'net_write_command';
 
 (* Const before type ignored *)
-  function net_real_write(net:PNET; packet:Pchar; len:dword):longint;extdecl;external External_library name 'net_real_write';
+  function net_real_write(net:PNET; packet:PAnsiChar; len:dword):longint;extdecl;external External_library name 'net_real_write';
 
   function my_net_read(net:PNET):dword;extdecl;external External_library name 'my_net_read';
 
@@ -79,32 +79,32 @@ Type
   function rnd(_para1:Prand_struct):double;extdecl;external External_library name 'rnd';
 
 (* Const before type ignored *)
-  procedure make_scrambled_password(_to:Pchar; password:Pchar);extdecl;external External_library name 'make_scrambled_password';
+  procedure make_scrambled_password(_to:PAnsiChar; password:PAnsiChar);extdecl;external External_library name 'make_scrambled_password';
 
 (* Const before type ignored *)
-  procedure get_salt_from_password(res:Pdword; password:Pchar);extdecl;external External_library name 'get_salt_from_password';
+  procedure get_salt_from_password(res:Pdword; password:PAnsiChar);extdecl;external External_library name 'get_salt_from_password';
 
-  procedure make_password_from_salt(_to:Pchar; hash_res:Pdword);extdecl;external External_library name 'make_password_from_salt';
+  procedure make_password_from_salt(_to:PAnsiChar; hash_res:Pdword);extdecl;external External_library name 'make_password_from_salt';
 
 (* Const before type ignored *)
 (* Const before type ignored *)
-  function scramble(_to:Pchar; message:Pchar; password:Pchar; old_ver:my_bool):Pchar;extdecl;external External_library name 'scramble';
+  function scramble(_to:PAnsiChar; message:PAnsiChar; password:PAnsiChar; old_ver:my_bool):PAnsiChar;extdecl;external External_library name 'scramble';
 
 (* Const before type ignored *)
 (* Const before type ignored *)
-  function check_scramble(_para1:Pchar; message:Pchar; salt:Pdword; old_ver:my_bool):my_bool;extdecl;external External_library name 'check_scramble';
+  function check_scramble(_para1:PAnsiChar; message:PAnsiChar; salt:Pdword; old_ver:my_bool):my_bool;extdecl;external External_library name 'check_scramble';
 
-  function get_tty_password(opt_message:Pchar):Pchar;extdecl;external External_library name 'get_tty_password';
+  function get_tty_password(opt_message:PAnsiChar):PAnsiChar;extdecl;external External_library name 'get_tty_password';
 
 (* Const before type ignored *)
-  procedure hash_password(result:Pdword; password:Pchar);extdecl;external External_library name 'hash_password';
+  procedure hash_password(result:Pdword; password:PAnsiChar);extdecl;external External_library name 'hash_password';
 
   { Some other useful functions  }
   procedure my_init;extdecl;external External_library name 'my_init';
 
 (* Const before type ignored *)
 (* Const before type ignored *)
-  procedure load_defaults(conf_file:Pchar; groups:PPchar; argc:Plongint; argv:PPPchar);extdecl;external External_library name 'load_defaults';
+  procedure load_defaults(conf_file:PAnsiChar; groups:PPAnsiChar; argc:Plongint; argv:PPPAnsiChar);extdecl;external External_library name 'load_defaults';
 
   function my_thread_init:my_bool;extdecl;external External_library name 'my_thread_init';
 

packages/mysql/src/mysql4_comdyn.pp

@@ -50,9 +50,9 @@ var
   net_end : procedure (net:PNET);extdecl;
   net_clear : procedure (net:PNET);extdecl;
   net_flush : function (net:PNET):longint;extdecl;
-  my_net_write : function (net:PNET; packet:Pchar; len:dword):longint;extdecl;
-  net_write_command : function (net:PNET; command:byte; packet:Pchar; len:dword):longint;extdecl;
-  net_real_write : function (net:PNET; packet:Pchar; len:dword):longint;extdecl;
+  my_net_write : function (net:PNET; packet:PAnsiChar; len:dword):longint;extdecl;
+  net_write_command : function (net:PNET; command:byte; packet:PAnsiChar; len:dword):longint;extdecl;
+  net_real_write : function (net:PNET; packet:PAnsiChar; len:dword):longint;extdecl;
   my_net_read : function (net:PNET):dword;extdecl;
 { The following function is not meant for normal usage  }
 {
@@ -62,15 +62,15 @@ unsigned int timeout);
 }
   randominit : procedure (_para1:Prand_struct; seed1:dword; seed2:dword);extdecl;
   rnd : function (_para1:Prand_struct):double;extdecl;
-  make_scrambled_password : procedure (_to:Pchar; password:Pchar);extdecl;
-  get_salt_from_password : procedure (res:Pdword; password:Pchar);extdecl;
-  make_password_from_salt : procedure (_to:Pchar; hash_res:Pdword);extdecl;
-  scramble : function (_to:Pchar; message:Pchar; password:Pchar; old_ver:my_bool):Pchar;extdecl;
-  check_scramble : function (_para1:Pchar; message:Pchar; salt:Pdword; old_ver:my_bool):my_bool;extdecl;
-  get_tty_password : function (opt_message:Pchar):Pchar;extdecl;
-  hash_password : procedure (result:Pdword; password:Pchar);extdecl;
+  make_scrambled_password : procedure (_to:PAnsiChar; password:PAnsiChar);extdecl;
+  get_salt_from_password : procedure (res:Pdword; password:PAnsiChar);extdecl;
+  make_password_from_salt : procedure (_to:PAnsiChar; hash_res:Pdword);extdecl;
+  scramble : function (_to:PAnsiChar; message:PAnsiChar; password:PAnsiChar; old_ver:my_bool):PAnsiChar;extdecl;
+  check_scramble : function (_para1:PAnsiChar; message:PAnsiChar; salt:Pdword; old_ver:my_bool):my_bool;extdecl;
+  get_tty_password : function (opt_message:PAnsiChar):PAnsiChar;extdecl;
+  hash_password : procedure (result:Pdword; password:PAnsiChar);extdecl;
   my_init : procedure;extdecl;
-  load_defaults : procedure (conf_file:Pchar; groups:PPchar; argc:Plongint; argv:PPPchar);extdecl;
+  load_defaults : procedure (conf_file:PAnsiChar; groups:PPAnsiChar; argc:Plongint; argv:PPPAnsiChar);extdecl;
   my_thread_init : function : my_bool;extdecl;
   my_thread_end : procedure ;extdecl;
 

packages/mysql/src/mysql4_comtypes.inc

@@ -118,8 +118,8 @@ type
     reading_or_writing : cuint;
     save_char : cchar;
     no_send_ok : my_bool;
-    last_error : array[0..(MYSQL_ERRMSG_SIZE)-1] of char;
-    sqlstate : array[0..SQLSTATE_LENGTH] of char;
+    last_error : array[0..(MYSQL_ERRMSG_SIZE)-1] of AnsiChar;
+    sqlstate : array[0..SQLSTATE_LENGTH] of AnsiChar;
     last_errno : cuint;
     error : cuchar;
     query_cache_query : gptr;
@@ -180,9 +180,9 @@ type
      st_udf_args = record
           arg_count : dword;
           arg_type : PItem_result;
-          args : ^Pchar;
+          args : ^PAnsiChar;
           lengths : Pdword;
-          maybe_null : Pchar;
+          maybe_null : PAnsiChar;
        end;
      UDF_ARGS = st_udf_args;
      PUDF_ARGS = ^UDF_ARGS;
@@ -198,7 +198,7 @@ type
           maybe_null : my_bool;
           decimals : dword;
           max_length : dword;
-          ptr : Pchar;
+          ptr : PAnsiChar;
           const_item : my_bool;
        end;
      UDF_INIT = st_udf_init;

packages/mysql/src/mysql4dyn.pp

@@ -57,10 +57,10 @@ uses ctypes,dynlibs, classes, sysutils, my4_sys, mysql4_comdyn;
 
 {$i mysql4types.inc}
 
-type tpcharfunction = function : pchar; extdecl;
+type tpcharfunction = function : PAnsiChar; extdecl;
 
 var
-  mysql_server_init : function (argc:longint; argv:PPchar; groups:PPchar):longint;extdecl;
+  mysql_server_init : function (argc:longint; argv:PPAnsiChar; groups:PPAnsiChar):longint;extdecl;
   mysql_server_end : procedure;extdecl;
   mysql_thread_init : function :my_bool;extdecl;
   mysql_thread_end : procedure;extdecl;
@@ -75,25 +75,25 @@ var
   mysql_affected_rows : function (mysql:PMYSQL):my_ulonglong;extdecl;
   mysql_insert_id : function (mysql:PMYSQL):my_ulonglong;extdecl;
   mysql_errno : function (mysql:PMYSQL):dword;extdecl;
-  mysql_error : function (mysql:PMYSQL):Pchar;extdecl;
-  mysql_info : function (mysql:PMYSQL):Pchar;extdecl;
+  mysql_error : function (mysql:PMYSQL):PAnsiChar;extdecl;
+  mysql_info : function (mysql:PMYSQL):PAnsiChar;extdecl;
   mysql_thread_id : function (mysql:PMYSQL):dword;extdecl;
-  mysql_character_set_name : function (mysql:PMYSQL):Pchar;extdecl;
+  mysql_character_set_name : function (mysql:PMYSQL):PAnsiChar;extdecl;
   mysql_init : function (mysql:PMYSQL):PMYSQL;extdecl;
-  mysql_ssl_set : function (mysql:PMYSQL; key:Pchar; cert:Pchar; ca:Pchar; capath:Pchar;cipher:Pchar):longint;extdecl;
+  mysql_ssl_set : function (mysql:PMYSQL; key:PAnsiChar; cert:PAnsiChar; ca:PAnsiChar; capath:PAnsiChar;cipher:PAnsiChar):longint;extdecl;
   mysql_ssl_clear : function (mysql:PMYSQL):longint;extdecl;
-  mysql_change_user : function (mysql:PMYSQL; user:Pchar; passwd:Pchar; db:Pchar):my_bool;extdecl;
-  mysql_real_connect : function (mysql:PMYSQL; host:Pchar; user:Pchar; passwd:Pchar; db:Pchar;port:dword; unix_socket:Pchar; clientflag:dword):PMYSQL;extdecl;
+  mysql_change_user : function (mysql:PMYSQL; user:PAnsiChar; passwd:PAnsiChar; db:PAnsiChar):my_bool;extdecl;
+  mysql_real_connect : function (mysql:PMYSQL; host:PAnsiChar; user:PAnsiChar; passwd:PAnsiChar; db:PAnsiChar;port:dword; unix_socket:PAnsiChar; clientflag:dword):PMYSQL;extdecl;
   mysql_close : procedure (sock:PMYSQL);extdecl;
-  mysql_select_db : function (mysql:PMYSQL; db:Pchar):longint;extdecl;
-  mysql_query : function (mysql:PMYSQL; q:Pchar):longint;extdecl;
-  mysql_send_query : function (mysql:PMYSQL; q:Pchar; length:dword):longint;extdecl;
+  mysql_select_db : function (mysql:PMYSQL; db:PAnsiChar):longint;extdecl;
+  mysql_query : function (mysql:PMYSQL; q:PAnsiChar):longint;extdecl;
+  mysql_send_query : function (mysql:PMYSQL; q:PAnsiChar; length:dword):longint;extdecl;
   mysql_read_query_result : function (mysql:PMYSQL):longint;extdecl;
-  mysql_real_query : function (mysql:PMYSQL; q:Pchar; length:dword):longint;extdecl;
-  mysql_master_query : function (mysql:PMYSQL; q:Pchar; length:dword):longint;extdecl;
-  mysql_master_send_query : function (mysql:PMYSQL; q:Pchar; length:dword):longint;extdecl;
-  mysql_slave_query : function (mysql:PMYSQL; q:Pchar; length:dword):longint;extdecl;
-  mysql_slave_send_query : function (mysql:PMYSQL; q:Pchar; length:dword):longint;extdecl;
+  mysql_real_query : function (mysql:PMYSQL; q:PAnsiChar; length:dword):longint;extdecl;
+  mysql_master_query : function (mysql:PMYSQL; q:PAnsiChar; length:dword):longint;extdecl;
+  mysql_master_send_query : function (mysql:PMYSQL; q:PAnsiChar; length:dword):longint;extdecl;
+  mysql_slave_query : function (mysql:PMYSQL; q:PAnsiChar; length:dword):longint;extdecl;
+  mysql_slave_send_query : function (mysql:PMYSQL; q:PAnsiChar; length:dword):longint;extdecl;
   mysql_enable_rpl_parse : procedure (mysql:PMYSQL);extdecl;
   mysql_disable_rpl_parse : procedure (mysql:PMYSQL);extdecl;
   mysql_rpl_parse_enabled : function (mysql:PMYSQL):longint;extdecl;
@@ -101,28 +101,28 @@ var
   mysql_disable_reads_from_master : procedure (mysql:PMYSQL);extdecl;
   mysql_reads_from_master_enabled : function (mysql:PMYSQL):longint;extdecl;
 (* error
-enum mysql_rpl_type      mysql_rpl_query_type(const char* q, int len);
+enum mysql_rpl_type      mysql_rpl_query_type(const AnsiChar* q, int len);
 in declaration at line 291 *)
   mysql_rpl_probe : function (mysql:PMYSQL):longint;extdecl;
-  mysql_set_master : function (mysql:PMYSQL; host:Pchar; port:dword; user:Pchar; passwd:Pchar):longint;extdecl;
-  mysql_add_slave : function (mysql:PMYSQL; host:Pchar; port:dword; user:Pchar; passwd:Pchar):longint;extdecl;
+  mysql_set_master : function (mysql:PMYSQL; host:PAnsiChar; port:dword; user:PAnsiChar; passwd:PAnsiChar):longint;extdecl;
+  mysql_add_slave : function (mysql:PMYSQL; host:PAnsiChar; port:dword; user:PAnsiChar; passwd:PAnsiChar):longint;extdecl;
   mysql_shutdown : function (mysql:PMYSQL):longint;extdecl;
   mysql_dump_debug_info : function (mysql:PMYSQL):longint;extdecl;
   mysql_refresh : function (mysql:PMYSQL; refresh_options:dword):longint;extdecl;
   mysql_kill : function (mysql:PMYSQL; pid:dword):longint;extdecl;
   mysql_ping : function (mysql:PMYSQL):longint;extdecl;
-  mysql_stat : function (mysql:PMYSQL):Pchar;extdecl;
-  mysql_get_server_info : function (mysql:PMYSQL):Pchar;extdecl;
-  mysql_get_client_info : tpcharfunction; //function:Pchar; extdecl;
-  mysql_get_host_info : function (mysql:PMYSQL):Pchar;extdecl;
+  mysql_stat : function (mysql:PMYSQL):PAnsiChar;extdecl;
+  mysql_get_server_info : function (mysql:PMYSQL):PAnsiChar;extdecl;
+  mysql_get_client_info : tpcharfunction; //function:PAnsiChar; extdecl;
+  mysql_get_host_info : function (mysql:PMYSQL):PAnsiChar;extdecl;
   mysql_get_proto_info : function (mysql:PMYSQL):dword;extdecl;
-  mysql_list_dbs : function (mysql:PMYSQL; wild:Pchar):PMYSQL_RES;extdecl;
-  mysql_list_tables : function (mysql:PMYSQL; wild:Pchar):PMYSQL_RES;extdecl;
-  mysql_list_fields : function (mysql:PMYSQL; table:Pchar; wild:Pchar):PMYSQL_RES;extdecl;
+  mysql_list_dbs : function (mysql:PMYSQL; wild:PAnsiChar):PMYSQL_RES;extdecl;
+  mysql_list_tables : function (mysql:PMYSQL; wild:PAnsiChar):PMYSQL_RES;extdecl;
+  mysql_list_fields : function (mysql:PMYSQL; table:PAnsiChar; wild:PAnsiChar):PMYSQL_RES;extdecl;
   mysql_list_processes : function (mysql:PMYSQL):PMYSQL_RES;extdecl;
   mysql_store_result : function (mysql:PMYSQL):PMYSQL_RES;extdecl;
   mysql_use_result : function (mysql:PMYSQL):PMYSQL_RES;extdecl;
-  mysql_options : function (mysql:PMYSQL; option:mysql_option; arg:Pchar):longint;extdecl;
+  mysql_options : function (mysql:PMYSQL; option:mysql_option; arg:PAnsiChar):longint;extdecl;
   mysql_free_result : procedure (result:PMYSQL_RES);extdecl;
   mysql_data_seek : procedure (result:PMYSQL_RES; offset:my_ulonglong);extdecl;
   mysql_row_seek : function (result:PMYSQL_RES; _para2:MYSQL_ROW_OFFSET):MYSQL_ROW_OFFSET;extdecl;
@@ -130,18 +130,18 @@ in declaration at line 291 *)
   mysql_fetch_row : function (result:PMYSQL_RES):MYSQL_ROW;extdecl;
   mysql_fetch_lengths : function (result:PMYSQL_RES):Pdword;extdecl;
   mysql_fetch_field : function (result:PMYSQL_RES):PMYSQL_FIELD;extdecl;
-  mysql_escape_string : function (_to:Pchar; from:Pchar; from_length:dword):dword;extdecl;
-  mysql_real_escape_string : function (mysql:PMYSQL; _to:Pchar; from:Pchar; length:dword):dword;extdecl;
-  mysql_debug : procedure (debug:Pchar);extdecl;
-  mysql_odbc_escape_string : function (mysql:PMYSQL; _to:Pchar; to_length:dword; from:Pchar; from_length:dword;param:pointer; extend_buffer: TExdendBuffer):Pchar;extdecl;
-  myodbc_remove_escape : procedure (mysql:PMYSQL; name:Pchar);extdecl;
+  mysql_escape_string : function (_to:PAnsiChar; from:PAnsiChar; from_length:dword):dword;extdecl;
+  mysql_real_escape_string : function (mysql:PMYSQL; _to:PAnsiChar; from:PAnsiChar; length:dword):dword;extdecl;
+  mysql_debug : procedure (debug:PAnsiChar);extdecl;
+  mysql_odbc_escape_string : function (mysql:PMYSQL; _to:PAnsiChar; to_length:dword; from:PAnsiChar; from_length:dword;param:pointer; extend_buffer: TExdendBuffer):PAnsiChar;extdecl;
+  myodbc_remove_escape : procedure (mysql:PMYSQL; name:PAnsiChar);extdecl;
   mysql_thread_safe : function :dword;extdecl;
   mysql_manager_init : function (con:PMYSQL_MANAGER):PMYSQL_MANAGER;extdecl;
-  mysql_manager_connect : function (con:PMYSQL_MANAGER; host:Pchar; user:Pchar; passwd:Pchar; port:dword):PMYSQL_MANAGER;extdecl;
+  mysql_manager_connect : function (con:PMYSQL_MANAGER; host:PAnsiChar; user:PAnsiChar; passwd:PAnsiChar; port:dword):PMYSQL_MANAGER;extdecl;
   mysql_manager_close : procedure (con:PMYSQL_MANAGER);extdecl;
-  mysql_manager_command : function (con:PMYSQL_MANAGER; cmd:Pchar; cmd_len:longint):longint;extdecl;
-  mysql_manager_fetch_line : function (con:PMYSQL_MANAGER; res_buf:Pchar; res_buf_size:longint):longint;extdecl;
-  simple_command : function (mysql:PMYSQL; command:enum_server_command; arg:Pchar; length:dword; skipp_check:my_bool):longint;extdecl;
+  mysql_manager_command : function (con:PMYSQL_MANAGER; cmd:PAnsiChar; cmd_len:longint):longint;extdecl;
+  mysql_manager_fetch_line : function (con:PMYSQL_MANAGER; res_buf:PAnsiChar; res_buf_size:longint):longint;extdecl;
+  simple_command : function (mysql:PMYSQL; command:enum_server_command; arg:PAnsiChar; length:dword; skipp_check:my_bool):longint;extdecl;
   net_safe_read : function (mysql:PMYSQL):dword;extdecl;
 
 

packages/mysql/src/mysql4types.inc

@@ -5,28 +5,28 @@
 type
 
   Pmy_bool = ^my_bool;
-  my_bool = char;
+  my_bool = AnsiChar;
 
   Pgptr = ^gptr;
-  gptr = char;
+  gptr = AnsiChar;
 
   Pmy_socket = ^my_socket;
   my_socket = longint;
 
 var
   mysql_port : dword;cvar;external;
-  mysql_unix_port : Pchar;cvar;external;
+  mysql_unix_port : PAnsiChar;cvar;external;
 
 type
   Pst_mysql_field = ^st_mysql_field;
   st_mysql_field = record
-       name : Pchar;
-       org_name : pchar;
-       table : Pchar;
-       org_table : Pchar;
-       db : Pchar;
-       catalog : pchar;
-       def : Pchar;
+       name : PAnsiChar;
+       org_name : PAnsiChar;
+       table : PAnsiChar;
+       org_table : PAnsiChar;
+       db : PAnsiChar;
+       catalog : PAnsiChar;
+       def : PAnsiChar;
        length : culong;
        max_length : culong;
        name_length : cuint;
@@ -46,7 +46,7 @@ type
   PMYSQL_FIELD = ^MYSQL_FIELD;
 
 type
-  MYSQL_ROW = ppchar;
+  MYSQL_ROW = PPAnsiChar;
   PMYSQL_ROW = ^MYSQL_ROW;
   TMYSQL_ROW = MYSQL_ROW;
 
@@ -125,18 +125,18 @@ type
        user,
        password,
        unix_socket,
-       db : pchar;
+       db : PAnsiChar;
        init_commands : pst_dynamic_array;
-       my_cnf_file : Pchar;
-       my_cnf_group : Pchar;
-       charset_dir : Pchar;
-       charset_name : Pchar;
-       ssl_key : Pchar;
-       ssl_cert : Pchar;
-       ssl_ca : Pchar;
-       ssl_capath : Pchar;
-       ssl_cipher : Pchar;
-       shared_memory_base_name : pchar;
+       my_cnf_file : PAnsiChar;
+       my_cnf_group : PAnsiChar;
+       charset_dir : PAnsiChar;
+       charset_name : PAnsiChar;
+       ssl_key : PAnsiChar;
+       ssl_cert : PAnsiChar;
+       ssl_ca : PAnsiChar;
+       ssl_capath : PAnsiChar;
+       ssl_cipher : PAnsiChar;
+       shared_memory_base_name : PAnsiChar;
        max_allowed_packet : culong;
        use_ssl : my_bool;
        compress : my_bool;
@@ -145,7 +145,7 @@ type
        rpl_parse : my_bool;
        no_master_reads : my_bool;
        methods_to_use : mysql_option;
-       client_ip : pchar;
+       client_ip : PAnsiChar;
        secure_auth : my_bool;
        local_infile_init : pointer;
        local_infile_read : pointer;
@@ -165,14 +165,14 @@ type
   st_mysql = record
        net : NET;
        connector_fd : gptr;
-       host : Pchar;
-       user : Pchar;
-       passwd : Pchar;
-       unix_socket : Pchar;
-       server_version : Pchar;
-       host_info : Pchar;
-       info : Pchar;
-       db : Pchar;
+       host : PAnsiChar;
+       user : PAnsiChar;
+       passwd : PAnsiChar;
+       unix_socket : PAnsiChar;
+       server_version : PAnsiChar;
+       host_info : PAnsiChar;
+       info : PAnsiChar;
+       db : PAnsiChar;
        charset : Pointer;  //!! Was Pcharset_info_st;
        fields : PMYSQL_FIELD;
        field_alloc : MEM_ROOT;
@@ -193,7 +193,7 @@ type
        status : mysql_status;
        free_me : my_bool;
        reconnect : my_bool;
-       scramble_buff : array[0..20] of char;
+       scramble_buff : array[0..20] of AnsiChar;
        rpl_pivot : my_bool;
        master : Pst_mysql;
        next_slave : Pst_mysql;
@@ -243,24 +243,24 @@ type
   Pst_mysql_manager = ^st_mysql_manager;
   st_mysql_manager = record
        net : NET;
-       host : Pchar;
-       user : Pchar;
-       passwd : Pchar;
+       host : PAnsiChar;
+       user : PAnsiChar;
+       passwd : PAnsiChar;
        port : dword;
        free_me : my_bool;
        eof : my_bool;
        cmd_status : longint;
        last_errno : longint;
-       net_buf : Pchar;
-       net_buf_pos : Pchar;
-       net_data_end : Pchar;
+       net_buf : PAnsiChar;
+       net_buf_pos : PAnsiChar;
+       net_data_end : PAnsiChar;
        net_buf_size : longint;
-       last_error : array[0..(MAX_MYSQL_MANAGER_ERR)-1] of char;
+       last_error : array[0..(MAX_MYSQL_MANAGER_ERR)-1] of AnsiChar;
     end;
   MYSQL_MANAGER = st_mysql_manager;
   PMYSQL_MANAGER = ^MYSQL_MANAGER;
 
 Type
-  TExdendBuffer = function (_para1:pointer; _to:Pchar; length:Pdword):Pchar;
+  TExdendBuffer = function (_para1:pointer; _to:PAnsiChar; length:Pdword):PAnsiChar;