diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-06 16:47:48 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-06 16:47:48 -0600 |
| commit | 4bb40187438bdfb8b1d8b091399bd01e0e3425c1 (patch) | |
| tree | 3899db9196d895b67af082ace2454b1268b01d70 /libmysqld | |
| parent | ad5100da0f7041cf7a0dbf3cf2860c0f82fc4c7a (diff) | |
| download | mariadb-git-4bb40187438bdfb8b1d8b091399bd01e0e3425c1.tar.gz | |
misc bug fixes
libmysqld/Makefile.am:
sql_unions -> sql_union
BitKeeper/etc/ignore:
Added libmysqld/sql_union.cc to the ignore list
mysql-test/mysql-test-run.sh:
fix to get path-independent logging
mysql-test/r/rpl_log.result:
fix for path-independent logging
sql/log.cc:
fixed compile error with USING_TRANSACTIONS
sql/log_event.h:
fixed compile error with USING_TRANSACTIONS
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 aa358958a1b..d19029e31f6 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -54,7 +54,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ sql_rename.cc sql_repl.cc sql_select.cc sql_show.cc \ sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \ sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \ - unireg.cc uniques.cc stacktrace.c sql_unions.cc hash_filo.cc + unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc ## XXX: we should not have to duplicate info from the sources list sqlobjects = convert.lo derror.lo field.lo field_conv.lo filesort.lo \ @@ -72,7 +72,7 @@ sqlobjects = convert.lo derror.lo field.lo field_conv.lo filesort.lo \ sql_rename.lo sql_repl.lo sql_select.lo sql_show.lo \ sql_string.lo sql_table.lo sql_test.lo sql_udf.lo \ sql_update.lo sql_yacc.lo table.lo thr_malloc.lo time.lo \ - unireg.lo uniques.lo stacktrace.lo sql_unions.lo hash_filo.lo + unireg.lo uniques.lo stacktrace.lo sql_union.lo hash_filo.lo EXTRA_DIST = lib_vio.c |