Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0-engines (6bf9e0ff) · Commits · Software / OSDI20 Artifacts / mariadb

include/sql_common.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ extern const char *not_error_sqlstate;
		extern "C" {
		#endif

		extern CHARSET_INFO *default_client_charset_info;
		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);

libmysqld/lib_sql.cc

+7 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@ extern "C"
		int check_user(THD *thd, enum enum_server_command command,
		const char passwd, uint passwd_len, const char db,
		bool check_count);
		void thd_init_client_charset(THD *thd, uint cs_number);

		C_MODE_START

		#include <mysql.h>
		@@ -600,11 +602,14 @@ void create_embedded_thd(int client_flag, char db)
		return NULL;
		}


		#ifdef NO_EMBEDDED_ACCESS_CHECKS
		int check_embedded_connection(MYSQL *mysql)
		{
		int result;
		THD thd= (THD)mysql->thd;
		thd_init_client_charset(thd, mysql->charset->number);
		thd->update_charset();
		Security_context *sctx= thd->security_ctx;
		sctx->host_or_ip= sctx->host= (char*) my_localhost;
		strmake(sctx->priv_host, (char*) my_localhost, MAX_HOSTNAME-1);
		@@ -623,6 +628,8 @@ int check_embedded_connection(MYSQL *mysql)
		char scramble_buff[SCRAMBLE_LENGTH];
		int passwd_len;

		thd_init_client_charset(thd, mysql->charset->number);
		thd->update_charset();
		if (mysql->options.client_ip)
		{
		sctx->host= my_strdup(mysql->options.client_ip, MYF(0));

libmysqld/libmysqld.c

+3 −45

Original line number	Diff line number	Diff line
		@@ -90,49 +90,7 @@ static void end_server(MYSQL *mysql)
		}


		static int mysql_init_charset(MYSQL *mysql)
		{
		char charset_name_buff[16], *charset_name;

		if ((charset_name=mysql->options.charset_name))
		{
		const char *save=charsets_dir;
		if (mysql->options.charset_dir)
		charsets_dir=mysql->options.charset_dir;
		mysql->charset=get_charset_by_name(mysql->options.charset_name,
		MYF(MY_WME));
		charsets_dir=save;
		}
		else if (mysql->server_language)
		{
		charset_name=charset_name_buff;
		sprintf(charset_name,"%d",mysql->server_language); /* In case of errors */
		mysql->charset=get_charset((uint8) mysql->server_language, MYF(MY_WME));
		}
		else
		mysql->charset=default_charset_info;

		if (!mysql->charset)
		{
		mysql->net.last_errno=CR_CANT_READ_CHARSET;
		strmov(mysql->net.sqlstate, "HY0000");
		if (mysql->options.charset_dir)
		sprintf(mysql->net.last_error,ER(mysql->net.last_errno),
		charset_name ? charset_name : "unknown",
		mysql->options.charset_dir);
		else
		{
		char cs_dir_name[FN_REFLEN];
		get_charsets_dir(cs_dir_name);
		sprintf(mysql->net.last_error,ER(mysql->net.last_errno),
		charset_name ? charset_name : "unknown",
		cs_dir_name);
		}
		return mysql->net.last_errno;
		}
		return 0;
		}

		int mysql_init_character_set(MYSQL *mysql);

		MYSQL * STDCALL
		mysql_real_connect(MYSQL mysql,const char host, const char *user,
		@@ -222,10 +180,10 @@ mysql_real_connect(MYSQL mysql,const char host, const char *user,

		init_embedded_mysql(mysql, client_flag, db_name);

		if (check_embedded_connection(mysql))
		if (mysql_init_character_set(mysql))
		goto error;

		if (mysql_init_charset(mysql))
		if (check_embedded_connection(mysql))
		goto error;

		mysql->server_status= SERVER_STATUS_AUTOCOMMIT;

myisam/mi_check.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1158,13 +1158,14 @@ int chk_data_link(MI_CHECK param, MI_INFO info,int extend)
		#ifdef HAVE_RTREE_KEYS
		(keyinfo->flag & HA_SPATIAL) ?
		rtree_find_first(info, key, info->lastkey, key_length,
		SEARCH_SAME) :
		MBR_EQUAL \| MBR_DATA) :
		#endif
		_mi_search(info,keyinfo,info->lastkey,key_length,
		SEARCH_SAME, info->s->state.key_root[key]);
		if (search_result)
		{
		mi_check_print_error(param,"Record at: %10s Can't find key for index: %2d",
		mi_check_print_error(param,"Record at: %10s "
		"Can't find key for index: %2d",
		llstr(start_recpos,llbuff),key+1);
		if (error++ > MAXERR \|\| !(param->testflag & T_VERBOSE))
		goto err2;

myisam/mi_create.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,8 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		my_off_t key_root[MI_MAX_POSSIBLE_KEY],key_del[MI_MAX_KEY_BLOCK_SIZE];
		MI_CREATE_INFO tmp_create_info;
		DBUG_ENTER("mi_create");
		DBUG_PRINT("enter", ("keys: %u columns: %u uniques: %u flags: %u",
		keys, columns, uniques, flags));

		if (!ci)
		{
		@@ -471,6 +473,16 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		uniques * MI_UNIQUEDEF_SIZE +
		(key_segs + unique_key_parts)*HA_KEYSEG_SIZE+
		columns*MI_COLUMNDEF_SIZE);
		DBUG_PRINT("info", ("info_length: %u", info_length));
		/* There are only 16 bits for the total header length. */
		if (info_length > 65535)
		{
		my_printf_error(0, "MyISAM table '%s' has too many columns and/or "
		"indexes and/or unique constraints.",
		MYF(0), name + dirname_length(name));
		my_errno= HA_WRONG_CREATE_OPTION;
		goto err;
		}

		bmove(share.state.header.file_version,(byte*) myisam_file_magic,4);
		ci->old_options=options\| (ci->old_options & HA_OPTION_TEMP_COMPRESS_RECORD ?
		@@ -620,6 +632,7 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		errpos=3;
		}

		DBUG_PRINT("info", ("write state info and base info"));
		if (mi_state_info_write(file, &share.state, 2) \|\|
		mi_base_info_write(file, &share.base))
		goto err;
		@@ -633,6 +646,7 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		#endif

		/* Write key and keyseg definitions */
		DBUG_PRINT("info", ("write key and keyseg definitions"));
		for (i=0 ; i < share.base.keys - uniques; i++)
		{
		uint sp_segs=(keydefs[i].flag & HA_SPATIAL) ? 2*SPDIMS : 0;
		@@ -683,6 +697,7 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		}

		/* Save unique definition */
		DBUG_PRINT("info", ("write unique definitions"));
		for (i=0 ; i < share.state.header.uniques ; i++)
		{
		HA_KEYSEG *keyseg_end;
		@@ -713,6 +728,7 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		goto err;
		}
		}
		DBUG_PRINT("info", ("write field definitions"));
		for (i=0 ; i < share.base.fields ; i++)
		if (mi_recinfo_write(file, &recinfo[i]))
		goto err;
		@@ -727,6 +743,7 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		#endif

		/* Enlarge files */
		DBUG_PRINT("info", ("enlarge to keystart: %lu", (ulong) share.base.keystart));
		if (my_chsize(file,(ulong) share.base.keystart,0,MYF(0)))
		goto err;