diff options
| author | unknown <monty@mysql.com> | 2004-04-07 04:33:58 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-04-07 04:33:58 +0300 |
| commit | e9447881eb13378b06f0939091ab4e258a83ad51 (patch) | |
| tree | e2be01ea44891cc2fa4d0a64da4e14538f119f32 /libmysqld | |
| parent | 2d5635e3c8cfc6cc74f182b849813df909e4ec1d (diff) | |
| download | mariadb-git-e9447881eb13378b06f0939091ab4e258a83ad51.tar.gz | |
Portability fixes
Fixed problems with group_concat() and HAVING
Updated crash-me values
sql-bench/limits/mysql-4.0.cfg:
Rename: sql-bench/limits/mysql.cfg -> sql-bench/limits/mysql-4.0.cfg
include/my_global.h:
Safety fix
libmysqld/Makefile.am:
Portability fix (For AIX 64 bit)
mysql-test/r/func_gconcat.result:
More tests
mysql-test/t/func_gconcat.test:
More tests
sql/field.cc:
Cleanups
sql/init.cc:
moved thread_stack_min to right place
sql/item_sum.cc:
Fixed problems with group_concat() and HAVING
Removed some not needed variables
sql/item_sum.h:
Fixed problems with group_concat() and HAVING
Removed some not needed variables
sql/mysqld.cc:
Moved thread_stack_min to right place to handle case where we didn't get as much stack space as we asked for
sql/sql_parse.cc:
More debugging
sql/sql_select.cc:
Cleanup
sql/sql_yacc.yy:
Fixed handling of Item_group_concat() in having. (Arguments should not be handled as refs)
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index da58a711d22..0cfcf8b1c49 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -88,9 +88,9 @@ libmysqld.a: libmysqld_int.a $(INC_LIB) cd tmp ; \ for file in *.a ; do \ bfile=`basename $$file .a` ; \ - ar x $$file; \ + $(AR) x $$file; \ for obj in *.o ; do mv $$obj $${bfile}_$$obj ; done ; \ - ar q ../libmysqld_int2.a *.o ; \ + $(AR) q ../libmysqld_int2.a *.o ; \ rm -f *.o ; \ done mv libmysqld_int2.a libmysqld.a |