Commit 3466b8d5 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
parents 069d54fd 4cbb9917

Docs/Support/texi2html

+1 −1
Original line number Diff line number Diff line
@@ -1811,7 +1811,7 @@ sub fix_image 
{

  my($text) = @_;

  my($arg1, $ext);

  $text =~ /^([^,]*)$/;

  $text =~ /^([^,]*)/;

  die "error in image: '$text'" unless defined($1);

  $arg1 = $1;

  $arg1 =~ s/@@/@/g;

include/m_ctype.h

+5 −0
Original line number Diff line number Diff line
@@ -365,6 +365,11 @@ uint my_instr_mb(struct charset_info_st *, 
                 const char *s, uint s_length,

                 my_match_t *match, uint nmatch);



int my_wildcmp_unicode(CHARSET_INFO *cs,

                       const char *str, const char *str_end,

                       const char *wildstr, const char *wildend,

                       int escape, int w_one, int w_many,

                       MY_UNICASE_INFO **weights);



extern my_bool my_parse_charset_xml(const char *bug, uint len,

				    int (*add)(CHARSET_INFO *cs));

include/sql_common.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ extern "C" { 
MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,

			   my_bool default_value, uint server_capabilities);

void free_rows(MYSQL_DATA *cur);

my_bool mysql_autenticate(MYSQL *mysql, const char *passwd);

void free_old_query(MYSQL *mysql);

void end_server(MYSQL *mysql);

my_bool mysql_reconnect(MYSQL *mysql);

innobase/dict/dict0dict.c

+1 −1
Original line number Diff line number Diff line
@@ -2244,7 +2244,7 @@ dict_foreign_add_to_cache( 
Scans from pointer onwards. Stops if is at the start of a copy of

'string' where characters are compared without case sensitivity. Stops

also at '\0'. */

static



const char*

dict_scan_to(

/*=========*/

innobase/include/dict0dict.h

+12 −0
Original line number Diff line number Diff line
@@ -891,6 +891,18 @@ dict_tables_have_same_db( 
	const char*	name2);	/* in: table name in the form

				dbname '/' tablename */



/*************************************************************************

Scans from pointer onwards. Stops if is at the start of a copy of

'string' where characters are compared without case sensitivity. Stops

also at '\0'. */



const char*

dict_scan_to(

/*=========*/

				/* out: scanned up to this */

	const char*	ptr,	/* in: scan from */

	const char*	string);/* in: look for this */



/* Buffers for storing detailed information about the latest foreign key

and unique key errors */

extern FILE*	dict_foreign_err_file;