Commit c76b8d57 authored by joreland@mysql.com's avatar joreland@mysql.com

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0
parents e2bd1dd6 0fa5496a
...@@ -959,3 +959,4 @@ vio/test-ssl ...@@ -959,3 +959,4 @@ vio/test-ssl
vio/test-sslclient vio/test-sslclient
vio/test-sslserver vio/test-sslserver
vio/viotest-ssl vio/viotest-ssl
ac_available_languages_fragment
...@@ -3172,7 +3172,6 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl ...@@ -3172,7 +3172,6 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
AC_OUTPUT AC_OUTPUT
rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES
echo echo
echo "MySQL has a Web site at http://www.mysql.com/ which carries details on the" echo "MySQL has a Web site at http://www.mysql.com/ which carries details on the"
echo "latest release, upcoming features, and other information to make your" echo "latest release, upcoming features, and other information to make your"
......
...@@ -67,9 +67,9 @@ drop table t1; ...@@ -67,9 +67,9 @@ drop table t1;
create table t1 (a int, b char(10)); create table t1 (a int, b char(10));
load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines; load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
Warnings: Warnings:
Warning 1265 Data truncated for column 'a' at row 3 Warning 1264 Out of range value adjusted for column 'a' at row 3
Warning 1262 Row 3 was truncated; it contained more data than there were input columns Warning 1262 Row 3 was truncated; it contained more data than there were input columns
Warning 1265 Data truncated for column 'a' at row 5 Warning 1264 Out of range value adjusted for column 'a' at row 5
Warning 1262 Row 5 was truncated; it contained more data than there were input columns Warning 1262 Row 5 was truncated; it contained more data than there were input columns
select * from rewrite.t1; select * from rewrite.t1;
a b a b
...@@ -81,7 +81,7 @@ a b ...@@ -81,7 +81,7 @@ a b
truncate table t1; truncate table t1;
load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines; load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
Warnings: Warnings:
Warning 1265 Data truncated for column 'a' at row 4 Warning 1264 Out of range value adjusted for column 'a' at row 4
Warning 1261 Row 4 doesn't contain data for all columns Warning 1261 Row 4 doesn't contain data for all columns
select * from rewrite.t1; select * from rewrite.t1;
a b a b
......
...@@ -232,8 +232,7 @@ static void angel(const Options &options) ...@@ -232,8 +232,7 @@ static void angel(const Options &options)
sigsuspend(&zeromask); sigsuspend(&zeromask);
if (is_terminated) if (is_terminated)
log_info("angel got signal %d (%s), exiting", log_info("angel got signal %d, exiting", is_terminated);
is_terminated, sys_siglist[is_terminated]);
else if (child_status == CHILD_NEED_RESPAWN) else if (child_status == CHILD_NEED_RESPAWN)
{ {
child_status= CHILD_OK; child_status= CHILD_OK;
......
...@@ -4687,7 +4687,7 @@ ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) ...@@ -4687,7 +4687,7 @@ ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list)
update_thd(current_thd); update_thd(current_thd);
prebuilt->trx->op_info = (char*)"getting list of foreign keys"; prebuilt->trx->op_info = (char*)"getting list of foreign keys";
trx_search_latch_release_if_reserved(prebuilt->trx); trx_search_latch_release_if_reserved(prebuilt->trx);
mutex_enter(&(dict_sys->mutex)); mutex_enter_noninline(&(dict_sys->mutex));
foreign = UT_LIST_GET_FIRST(prebuilt->table->foreign_list); foreign = UT_LIST_GET_FIRST(prebuilt->table->foreign_list);
while (foreign != NULL) while (foreign != NULL)
...@@ -4768,7 +4768,7 @@ ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) ...@@ -4768,7 +4768,7 @@ ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list)
f_key_list->push_back(pf_key_info); f_key_list->push_back(pf_key_info);
foreign = UT_LIST_GET_NEXT(foreign_list, foreign); foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
} }
mutex_exit(&(dict_sys->mutex)); mutex_exit_noninline(&(dict_sys->mutex));
prebuilt->trx->op_info = (char*)""; prebuilt->trx->op_info = (char*)"";
DBUG_RETURN(0); DBUG_RETURN(0);
} }
......
...@@ -1627,7 +1627,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1627,7 +1627,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break; break;
mysql_log.write(thd,command,packet); mysql_log.write(thd,command,packet);
bzero(&create_info, sizeof(create_info)); bzero(&create_info, sizeof(create_info));
error= mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db), mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db),
&create_info, 0); &create_info, 0);
break; break;
} }
...@@ -1651,8 +1651,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1651,8 +1651,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break; break;
} }
mysql_log.write(thd,command,db); mysql_log.write(thd,command,db);
error= mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db), mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db),
0, 0) ; 0, 0);
break; break;
} }
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
......
...@@ -1211,7 +1211,7 @@ view_store_create_info(THD *thd, TABLE_LIST *table, String *buff) ...@@ -1211,7 +1211,7 @@ view_store_create_info(THD *thd, TABLE_LIST *table, String *buff)
if (!foreign_db_mode) if (!foreign_db_mode)
{ {
buff->append("ALGORITHM=", 10); buff->append("ALGORITHM=", 10);
switch(table->algorithm) switch((int8)table->algorithm)
{ {
case VIEW_ALGORITHM_UNDEFINED: case VIEW_ALGORITHM_UNDEFINED:
buff->append("UNDEFINED ", 10); buff->append("UNDEFINED ", 10);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment