1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
This commit is contained in:
tsmith@ramayana.hindu.god
2007-08-01 18:32:01 -06:00
156 changed files with 2613 additions and 8509 deletions

View File

@ -5061,7 +5061,11 @@ bool check_merge_table_access(THD *thd, char *db,
#ifndef EMBEDDED_LIBRARY
#define used_stack(A,B) (long)(A > B ? A - B : B - A)
#if STACK_DIRECTION < 0
#define used_stack(A,B) (long) (A - B)
#else
#define used_stack(A,B) (long) (B - A)
#endif
#ifndef DBUG_OFF
long max_stack_used;