Commit a02b724e authored by unknown's avatar unknown

Fixes for prior commit


mysys/my_getsystime.c:
  Applied Sergei's fixes
sql/sql_prepare.cc:
  Fix prior commit
parent 2ebb6f23
...@@ -47,6 +47,8 @@ ulonglong my_getsystime() ...@@ -47,6 +47,8 @@ ulonglong my_getsystime()
offset=li.QuadPart-OFFSET_TO_EPOC; offset=li.QuadPart-OFFSET_TO_EPOC;
QueryPerformanceFrequency(&li); QueryPerformanceFrequency(&li);
freq=li.QuadPart; freq=li.QuadPart;
QueryPerformanceCounter(&t_cnt);
offset-=t_cnt.QuadPart/freq*10000000+t_cnt.QuadPart%freq*10000000/freq;
} }
QueryPerformanceCounter(&t_cnt); QueryPerformanceCounter(&t_cnt);
return t_cnt.QuadPart/freq*10000000+t_cnt.QuadPart%freq*10000000/freq+offset; return t_cnt.QuadPart/freq*10000000+t_cnt.QuadPart%freq*10000000/freq+offset;
......
...@@ -1147,11 +1147,11 @@ static int mysql_test_insert_select(Prepared_statement *stmt, ...@@ -1147,11 +1147,11 @@ static int mysql_test_insert_select(Prepared_statement *stmt,
TABLE_LIST *first_local_table= TABLE_LIST *first_local_table=
(TABLE_LIST *)lex->select_lex.table_list.first; (TABLE_LIST *)lex->select_lex.table_list.first;
/* Skip first table, which is the table we are inserting in */ /* Skip first table, which is the table we are inserting in */
lex->select_lex.table_list.first= (uchar*) first_local_table->next; lex->select_lex.table_list.first= (byte*) first_local_table->next;
lex->select_lex.resolve_mode= SELECT_LEX::NOMATTER_MODE; lex->select_lex.resolve_mode= SELECT_LEX::NOMATTER_MODE;
res= select_like_statement_test(stmt, tables); res= select_like_statement_test(stmt, tables);
/* revert changes*/ /* revert changes*/
lex->select_lex.table_list.first= (uchar*) first_local_table; lex->select_lex.table_list.first= (byte*) first_local_table;
lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE; lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE;
return res; return res;
} }
......
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