=== modified file 'mysql-test/r/partition_windows.result'
--- a/mysql-test/r/partition_windows.result 2008-01-04 11:06:20 +0000
+++ b/mysql-test/r/partition_windows.result 2008-06-27 19:17:42 +0000
@@ -15,16 +15,16 @@
INDEX DIRECTORY = 'F:/mysqltest/p2Index'
);
Warnings:
-Warning 0 DATA DIRECTORY option ignored
-Warning 0 INDEX DIRECTORY option ignored
-Warning 0 DATA DIRECTORY option ignored
-Warning 0 INDEX DIRECTORY option ignored
+Warning 1105 DATA DIRECTORY option ignored
+Warning 1105 INDEX DIRECTORY option ignored
+Warning 1105 DATA DIRECTORY option ignored
+Warning 1105 INDEX DIRECTORY option ignored
INSERT INTO t1 VALUES (NULL, "first", 1);
INSERT INTO t1 VALUES (NULL, "second", 2);
INSERT INTO t1 VALUES (NULL, "third", 3);
ALTER TABLE t1 ADD PARTITION (PARTITION p3 DATA DIRECTORY = 'G:/mysqltest/p3Data' INDEX DIRECTORY = 'H:/mysqltest/p3Index');
Warnings:
-Warning 0 DATA DIRECTORY option ignored
-Warning 0 INDEX DIRECTORY option ignored
+Warning 1105 DATA DIRECTORY option ignored
+Warning 1105 INDEX DIRECTORY option ignored
INSERT INTO t1 VALUES (NULL, "last", 4);
DROP TABLE t1;
=== modified file 'mysql-test/r/windows.result'
--- a/mysql-test/r/windows.result 2007-11-18 13:33:12 +0000
+++ b/mysql-test/r/windows.result 2008-06-27 19:17:42 +0000
@@ -9,8 +9,8 @@
drop table if exists t1;
CREATE TABLE t1 ( `ID` int(6) ) data directory 'c:/tmp/' index directory 'c:/tmp/' engine=MyISAM;
Warnings:
-Warning 0 DATA DIRECTORY option ignored
-Warning 0 INDEX DIRECTORY option ignored
+Warning 1105 DATA DIRECTORY option ignored
+Warning 1105 INDEX DIRECTORY option ignored
drop table t1;
CREATE TABLE t1 (a int, b int);
INSERT INTO t1 VALUES (1,1);
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc 2008-06-26 21:44:37 +0000
+++ b/sql/sql_class.cc 2008-06-27 19:17:42 +0000
@@ -403,7 +403,7 @@
m_sql_errno= 0;
memset(m_sqlstate, 0, sizeof(m_sqlstate));
m_server_status= 0;
- /* m_affected_rows= 0; */
+ m_affected_rows= 0;
m_last_insert_id= 0;
m_total_warn_count= 0;
#endif
@@ -1009,6 +1009,7 @@
session_tx_isolation= (enum_tx_isolation) variables.tx_isolation;
main_da.reset_diagnostics_area();
main_da.m_stmt_area.clear();
+ total_warn_count= 0;
update_charset();
reset_current_stmt_binlog_row_based();
bzero((char *) &status_var, sizeof(status_var));
=== modified file 'sql/sql_signal.cc'
--- a/sql/sql_signal.cc 2008-06-26 21:44:37 +0000
+++ b/sql/sql_signal.cc 2008-06-27 19:17:42 +0000
@@ -619,7 +619,7 @@
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), "MYSQL_ERRNO", "NULL");
DBUG_RETURN(1);
}
- int code= set->val_int();
+ longlong code= set->val_int();
if ((code <= 0) || (code > MAX_MYSQL_ERRNO))
{
str= set->val_str(& str_value);
@@ -627,7 +627,7 @@
"MYSQL_ERRNO", str->c_ptr_safe());
DBUG_RETURN(1);
}
- cond->m_sqlcode= code;
+ cond->m_sqlcode= (int) code;
}
if (thd->is_error())
@@ -1024,7 +1024,7 @@
DBUG_RETURN(1);
}
- uint cond_number= m_cond_expr->val_uint();
+ ulong cond_number= (ulong) m_cond_expr->val_uint();
if ((cond_number <= 0) || (cond_number > area->m_number))
{
my_error(ER_INVALID_COND_NUMBER, MYF(0));
|
