1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Merge vajra.(none):/opt/local/work/mysql-5.0-21483

into  vajra.(none):/opt/local/work/mysql-5.1-runtime
This commit is contained in:
kostja@vajra.(none)
2007-05-10 18:29:07 +04:00
2 changed files with 25 additions and 25 deletions

View File

@ -172,7 +172,7 @@ public:
#include "sql_lex.h" /* Must be here */
class delayed_insert;
class Delayed_insert;
class select_result;
class Time_zone;
@ -1002,7 +1002,7 @@ public:
time_t start_time,time_after_lock,user_time;
time_t connect_time,thr_create_time; // track down slow pthread_create
thr_lock_type update_lock_default;
delayed_insert *di;
Delayed_insert *di;
/* <> 0 if we are inside of trigger or stored function. */
uint in_sub_stmt;