database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-5.0-11787

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


include/mysql.h:
  Auto merged
sql-common/client.c:
  Auto merged
client/mysqltest.c:
  Resolve conflict
This commit is contained in:
unknown
2005-09-03 09:34:34 -07:00
parent 80ea9db87b 813033338c
commit 3eb26b7735
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql-common/client.c
View File

@@ -2760,6 +2760,9 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg)
case MYSQL_REPORT_DATA_TRUNCATION:
mysql->options.report_data_truncation= test(*(my_bool *) arg);
break;
case MYSQL_OPT_RECONNECT:
mysql->reconnect= *(my_bool *) arg;
break;
default:
DBUG_RETURN(1);
}