diff options
author | unknown <monty@hundin.mysql.fi> | 2001-12-06 14:10:51 +0200 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-12-06 14:10:51 +0200 |
commit | cfab46f546dcc56b11b536cec6ad699d121e8470 (patch) | |
tree | 5892a4c0af05e8a0354e957498fe09243b13eebc /fs | |
parent | 989f131d5f1af49b6618d7195868f118b09b242e (diff) | |
download | mariadb-git-cfab46f546dcc56b11b536cec6ad699d121e8470.tar.gz |
Update copyright
Fixed memory leak on shutdown (Affects the embedded version & MyODBC)
client/client_priv.h:
Update copyright
client/completion_hash.cc:
Update copyright
client/completion_hash.h:
Update copyright
client/connect_test.c:
Update copyright
client/errmsg.c:
Update copyright
client/get_password.c:
Update copyright
client/insert_test.c:
Update copyright
client/list_test.c:
Update copyright
client/my_readline.h:
Update copyright
client/mysql.cc:
Update copyright
client/mysqladmin.c:
Update copyright
client/mysqlbinlog.cc:
Update copyright
client/mysqlcheck.c:
Update copyright
client/mysqldump.c:
Update copyright
client/mysqlimport.c:
Update copyright
client/mysqlmanager-pwgen.c:
Update copyright
client/mysqlmanagerc.c:
Update copyright
client/mysqlshow.c:
Update copyright
client/mysqltest.c:
Update copyright
client/password.c:
Update copyright
client/readline.cc:
Update copyright
client/select_test.c:
Update copyright
client/showdb_test.c:
Update copyright
client/sql_string.cc:
Update copyright
client/sql_string.h:
Update copyright
client/ssl_test.c:
Update copyright
client/thimble.cc:
Update copyright
client/thread_test.c:
Update copyright
div/deadlock_test.c:
Update copyright
extra/comp_err.c:
Update copyright
extra/my_print_defaults.c:
Update copyright
extra/perror.c:
Update copyright
extra/replace.c:
Update copyright
extra/resolve_stack_dump.c:
Update copyright
extra/resolveip.c:
Update copyright
fs/database.c:
Update copyright
fs/libmysqlfs.c:
Update copyright
fs/mysqlcorbafs.c:
Update copyright
fs/mysqlcorbafs.h:
Update copyright
fs/mysqlcorbafs_test.c:
Update copyright
heap/_check.c:
Update copyright
heap/_rectest.c:
Update copyright
heap/heapdef.h:
Update copyright
heap/hp_block.c:
Update copyright
heap/hp_clear.c:
Update copyright
heap/hp_close.c:
Update copyright
heap/hp_create.c:
Update copyright
heap/hp_delete.c:
Update copyright
heap/hp_extra.c:
Update copyright
heap/hp_hash.c:
Update copyright
heap/hp_info.c:
Update copyright
heap/hp_open.c:
Update copyright
heap/hp_panic.c:
Update copyright
heap/hp_rename.c:
Update copyright
heap/hp_rfirst.c:
Update copyright
heap/hp_rkey.c:
Update copyright
heap/hp_rlast.c:
Update copyright
heap/hp_rnext.c:
Update copyright
heap/hp_rprev.c:
Update copyright
heap/hp_rrnd.c:
Update copyright
heap/hp_rsame.c:
Update copyright
heap/hp_scan.c:
Update copyright
heap/hp_static.c:
Update copyright
heap/hp_test1.c:
Update copyright
heap/hp_test2.c:
Update copyright
heap/hp_update.c:
Update copyright
heap/hp_write.c:
Update copyright
include/config-win.h:
Update copyright
include/dbug.h:
Update copyright
include/errmsg.h:
Update copyright
include/ft_global.h:
Update copyright
include/getopt.h:
Update copyright
include/hash.h:
Update copyright
include/heap.h:
Update copyright
include/m_ctype.h:
Update copyright
include/m_string.h:
Update copyright
include/md5.h:
Update copyright
include/merge.h:
Update copyright
include/my_alarm.h:
Update copyright
include/my_base.h:
Update copyright
include/my_bitmap.h:
Update copyright
include/my_dir.h:
Update copyright
include/my_global.h:
Update copyright
include/my_list.h:
Update copyright
include/my_net.h:
Update copyright
include/my_no_pthread.h:
Update copyright
include/my_nosys.h:
Update copyright
include/my_pthread.h:
Update copyright
include/my_sys.h:
Update copyright
include/my_tree.h:
Update copyright
include/myisam.h:
Update copyright
include/myisammrg.h:
Update copyright
include/myisampack.h:
Update copyright
include/mysql.h:
Update copyright
include/mysql_com.h:
Update copyright
include/mysql_embed.h:
Update copyright
include/mysqld_error.h:
Update copyright
include/mysys_err.h:
Update copyright
include/nisam.h:
Update copyright
include/queues.h:
Update copyright
include/raid.h:
Update copyright
include/sslopt-case.h:
Update copyright
include/sslopt-longopts.h:
Update copyright
include/sslopt-usage.h:
Update copyright
include/sslopt-vars.h:
Update copyright
include/t_ctype.h:
Update copyright
include/thr_alarm.h:
Update copyright
include/thr_lock.h:
Update copyright
include/violite.h:
Update copyright
isam/_cache.c:
Update copyright
isam/_dbug.c:
Update copyright
isam/_key.c:
Update copyright
isam/_locking.c:
Update copyright
isam/_packrec.c:
Update copyright
isam/_page.c:
Update copyright
isam/_search.c:
Update copyright
isam/_statrec.c:
Update copyright
isam/changed.c:
Update copyright
isam/close.c:
Update copyright
isam/create.c:
Update copyright
isam/delete.c:
Update copyright
isam/extra.c:
Update copyright
isam/info.c:
Update copyright
isam/isamchk.c:
Update copyright
isam/isamdef.h:
Update copyright
isam/log.c:
Update copyright
isam/open.c:
Update copyright
isam/panic.c:
Update copyright
isam/range.c:
Update copyright
isam/rfirst.c:
Update copyright
isam/rkey.c:
Update copyright
isam/rlast.c:
Update copyright
isam/rnext.c:
Update copyright
isam/rprev.c:
Update copyright
isam/rrnd.c:
Update copyright
isam/rsame.c:
Update copyright
isam/rsamepos.c:
Update copyright
isam/sort.c:
Update copyright
isam/static.c:
Update copyright
isam/test1.c:
Update copyright
isam/test2.c:
Update copyright
isam/test3.c:
Update copyright
isam/update.c:
Update copyright
isam/write.c:
Update copyright
libmysql/conf_to_src.c:
Update copyright
libmysql/dll.c:
Update copyright
libmysql/errmsg.c:
Update copyright
libmysql/get_password.c:
Update copyright
libmysql/libmysql.c:
Update copyright
libmysql/manager.c:
Update copyright
libmysql/net.c:
Update copyright
libmysql/password.c:
Update copyright
libmysqld/lib_sql.cc:
Update copyright
libmysqld/lib_vio.c:
Update copyright
libmysqld/libmysqld.c:
Update copyright
merge/mrg_close.c:
Update copyright
merge/mrg_create.c:
Update copyright
merge/mrg_def.h:
Update copyright
merge/mrg_delete.c:
Update copyright
merge/mrg_extra.c:
Update copyright
merge/mrg_info.c:
Update copyright
merge/mrg_locking.c:
Update copyright
merge/mrg_open.c:
Update copyright
merge/mrg_panic.c:
Update copyright
merge/mrg_rrnd.c:
Update copyright
merge/mrg_rsame.c:
Update copyright
merge/mrg_static.c:
Update copyright
merge/mrg_update.c:
Update copyright
myisam/ft_boolean_search.c:
Update copyright
myisam/ft_dump.c:
Update copyright
myisam/ft_eval.h:
Update copyright
myisam/ft_static.c:
Update copyright
myisam/ft_stem.c:
Update copyright
myisam/ft_stopwords.c:
Update copyright
myisam/ft_test1.h:
Update copyright
myisam/mi_cache.c:
Update copyright
myisam/mi_changed.c:
Update copyright
myisam/mi_check.c:
Update copyright
myisam/mi_checksum.c:
Update copyright
myisam/mi_close.c:
Update copyright
myisam/mi_create.c:
Update copyright
myisam/mi_dbug.c:
Update copyright
myisam/mi_delete.c:
Update copyright
myisam/mi_delete_all.c:
Update copyright
myisam/mi_delete_table.c:
Update copyright
myisam/mi_dynrec.c:
Update copyright
myisam/mi_extra.c:
Update copyright
myisam/mi_info.c:
Update copyright
myisam/mi_key.c:
Update copyright
myisam/mi_locking.c:
Update copyright
myisam/mi_log.c:
Update copyright
myisam/mi_open.c:
Update copyright
myisam/mi_packrec.c:
Update copyright
myisam/mi_page.c:
Update copyright
myisam/mi_panic.c:
Update copyright
myisam/mi_range.c:
Update copyright
myisam/mi_rename.c:
Update copyright
myisam/mi_rfirst.c:
Update copyright
myisam/mi_rlast.c:
Update copyright
myisam/mi_rnext_same.c:
Update copyright
myisam/mi_rrnd.c:
Update copyright
myisam/mi_rsame.c:
Update copyright
myisam/mi_rsamepos.c:
Update copyright
myisam/mi_scan.c:
Update copyright
myisam/mi_search.c:
Update copyright
myisam/mi_static.c:
Update copyright
myisam/mi_statrec.c:
Update copyright
myisam/mi_test1.c:
Update copyright
myisam/mi_test2.c:
Update copyright
myisam/mi_test3.c:
Update copyright
myisam/mi_unique.c:
Update copyright
myisam/mi_update.c:
Update copyright
myisam/mi_write.c:
Update copyright
myisam/myisamchk.c:
Update copyright
myisam/myisampack.c:
Update copyright
myisammrg/myrg_close.c:
Update copyright
myisammrg/myrg_create.c:
Update copyright
myisammrg/myrg_def.h:
Update copyright
myisammrg/myrg_delete.c:
Update copyright
myisammrg/myrg_locking.c:
Update copyright
myisammrg/myrg_open.c:
Update copyright
myisammrg/myrg_panic.c:
Update copyright
myisammrg/myrg_rsame.c:
Update copyright
myisammrg/myrg_static.c:
Update copyright
myisammrg/myrg_update.c:
Update copyright
myisammrg/myrg_write.c:
Update copyright
mysql-test/r/gcc296.result:
Update of benchmark results
mysql-test/r/innodb.result:
Update of benchmark results
mysql-test/r/join_outer.result:
Update of benchmark results
mysql-test/r/myisam.result:
Update of benchmark results
mysys/array.c:
Update copyright
mysys/charset.c:
Fix for restart of character sets
mysys/checksum.c:
Update copyright
mysys/default.c:
Update copyright
mysys/errors.c:
Update copyright
mysys/getopt.c:
Cleanup
mysys/getvar.c:
Update copyright
mysys/hash.c:
Update copyright
mysys/list.c:
Update copyright
mysys/make-conf.c:
Update copyright
mysys/md5.c:
Update copyright
mysys/mf_brkhant.c:
Update copyright
mysys/mf_cache.c:
Update copyright
mysys/mf_casecnv.c:
Update copyright
mysys/mf_dirname.c:
Update copyright
mysys/mf_fn_ext.c:
Update copyright
mysys/mf_format.c:
Update copyright
mysys/mf_getdate.c:
Update copyright
mysys/mf_iocache.c:
Update copyright
mysys/mf_iocache2.c:
Update copyright
mysys/mf_keycache.c:
Update copyright
mysys/mf_loadpath.c:
Update copyright
mysys/mf_pack.c:
Update copyright
mysys/mf_path.c:
Update copyright
mysys/mf_qsort.c:
Update copyright
mysys/mf_qsort2.c:
Update copyright
mysys/mf_radix.c:
Update copyright
mysys/mf_same.c:
Update copyright
mysys/mf_sleep.c:
Update copyright
mysys/mf_sort.c:
Update copyright
mysys/mf_soundex.c:
Update copyright
mysys/mf_stripp.c:
Update copyright
mysys/mf_tempfile.c:
Update copyright
mysys/mf_unixpath.c:
Update copyright
mysys/mf_util.c:
Update copyright
mysys/mf_wcomp.c:
Update copyright
mysys/mf_wfile.c:
Update copyright
mysys/mulalloc.c:
Update copyright
mysys/my_alarm.c:
Update copyright
mysys/my_alloc.c:
Update copyright
mysys/my_append.c:
Update copyright
mysys/my_bit.c:
Update copyright
mysys/my_bitmap.c:
Update copyright
mysys/my_chsize.c:
Update copyright
mysys/my_clock.c:
Update copyright
mysys/my_compress.c:
Update copyright
mysys/my_copy.c:
Update copyright
mysys/my_create.c:
Update copyright
mysys/my_delete.c:
Update copyright
mysys/my_div.c:
Update copyright
mysys/my_dup.c:
Update copyright
mysys/my_error.c:
Update copyright
mysys/my_fopen.c:
Update copyright
mysys/my_fstream.c:
Update copyright
mysys/my_getwd.c:
Update copyright
mysys/my_init.c:
Free 'once_alloc' memory at shutdown.
mysys/my_lib.c:
Update copyright
mysys/my_lock.c:
Update copyright
mysys/my_lockmem.c:
Update copyright
mysys/my_lread.c:
Update copyright
mysys/my_lwrite.c:
Update copyright
mysys/my_malloc.c:
Update copyright
mysys/my_messnc.c:
Update copyright
mysys/my_mkdir.c:
Update copyright
mysys/my_net.c:
Update copyright
mysys/my_once.c:
Update copyright
mysys/my_open.c:
Update copyright
mysys/my_pread.c:
Update copyright
mysys/my_pthread.c:
Update copyright
mysys/my_quick.c:
Update copyright
mysys/my_read.c:
Update copyright
mysys/my_realloc.c:
Update copyright
mysys/my_redel.c:
Update copyright
mysys/my_rename.c:
Update copyright
mysys/my_seek.c:
Update copyright
mysys/my_static.c:
Update copyright
mysys/my_static.h:
Update copyright
mysys/my_symlink.c:
Update copyright
mysys/my_symlink2.c:
Update copyright
mysys/my_tempnam.c:
Update copyright
mysys/my_thr_init.c:
Update copyright
mysys/my_vsnprintf.c:
Update copyright
mysys/my_wincond.c:
Update copyright
mysys/my_winthread.c:
Update copyright
mysys/my_write.c:
Update copyright
mysys/mysys_priv.h:
Update copyright
mysys/ptr_cmp.c:
Update copyright
mysys/queues.c:
Update copyright
mysys/raid.cc:
Update copyright
mysys/safemalloc.c:
Update copyright
mysys/string.c:
Update copyright
mysys/test_charset.c:
Update copyright
mysys/test_dir.c:
Update copyright
mysys/test_fn.c:
Update copyright
mysys/testhash.c:
Update copyright
mysys/thr_alarm.c:
Update copyright
mysys/thr_lock.c:
Update copyright
mysys/thr_mutex.c:
Update copyright
mysys/thr_rwlock.c:
Update copyright
mysys/tree.c:
Update copyright
mysys/typelib.c:
Update copyright
pstack/debug.c:
Update copyright
pstack/debug.h:
Update copyright
pstack/demangle.h:
Update copyright
pstack/ieee.c:
Update copyright
pstack/ieee.h:
Update copyright
pstack/pstack.c:
Update copyright
readline/bind.c:
Cleanup empty lines
readline/complete.c:
Cleanup empty lines
readline/display.c:
Cleanup empty lines
readline/funmap.c:
Cleanup empty lines
readline/histexpand.c:
Cleanup empty lines
readline/histfile.c:
Cleanup empty lines
readline/history.c:
Cleanup empty lines
readline/history.h:
Cleanup empty lines
readline/input.c:
Cleanup empty lines
readline/kill.c:
Cleanup empty lines
readline/readline.c:
Cleanup empty lines
readline/readline.h:
Cleanup empty lines
readline/vi_mode.c:
Cleanup empty lines
sql/cache_manager.cc:
Update copyright
sql/cache_manager.h:
Update copyright
sql/convert.cc:
Update copyright
sql/custom_conf.h:
Update copyright
sql/derror.cc:
Update copyright
sql/field.cc:
Update copyright
sql/field.h:
Update copyright
sql/field_conv.cc:
Update copyright
sql/filesort.cc:
Update copyright
sql/frm_crypt.cc:
Update copyright
sql/ha_berkeley.cc:
Update copyright
sql/ha_heap.cc:
Update copyright
sql/ha_heap.h:
Update copyright
sql/ha_innobase.cc:
Update copyright
sql/ha_isam.cc:
Update copyright
sql/ha_isam.h:
Update copyright
sql/ha_isammrg.cc:
Update copyright
sql/ha_isammrg.h:
Update copyright
sql/ha_myisam.cc:
Update copyright
sql/handler.cc:
Update copyright
sql/hash_filo.cc:
Update copyright
sql/hash_filo.h:
Update copyright
sql/hostname.cc:
Update copyright
sql/init.cc:
Update copyright
sql/item.cc:
Update copyright
sql/item.h:
Update copyright
sql/item_buff.cc:
Update copyright
sql/item_cmpfunc.cc:
Update copyright
sql/item_cmpfunc.h:
Update copyright
sql/item_create.cc:
Update copyright
sql/item_create.h:
Update copyright
sql/item_func.cc:
Update copyright
sql/item_strfunc.cc:
Update copyright
sql/item_sum.cc:
Update copyright
sql/item_sum.h:
Update copyright
sql/item_timefunc.cc:
Update copyright
sql/item_timefunc.h:
Update copyright
sql/item_uniq.cc:
Update copyright
sql/item_uniq.h:
Update copyright
sql/key.cc:
Update copyright
sql/lex_symbol.h:
Update copyright
sql/lock.cc:
Update copyright
sql/log.cc:
Update copyright
sql/log_event.cc:
Update copyright
sql/log_event.h:
Update copyright
sql/matherr.c:
Update copyright
sql/mf_iocache.cc:
Update copyright
sql/mini_client.cc:
Update copyright
sql/mini_client.h:
Update copyright
sql/my_lock.c:
Update copyright
sql/mysqld.cc:
Update copyright
sql/net_pkg.cc:
Update copyright
sql/net_serv.cc:
Update copyright
sql/opt_sum.cc:
Update copyright
sql/password.c:
Update copyright
sql/procedure.cc:
Update copyright
sql/procedure.h:
Update copyright
sql/records.cc:
Update copyright
sql/repl_failsafe.cc:
Update copyright
sql/slave.cc:
Update copyright
sql/slave.h:
Update copyright
sql/sql_acl.cc:
Update copyright
sql/sql_acl.h:
Update copyright
sql/sql_analyse.cc:
Update copyright
sql/sql_analyse.h:
Update copyright
sql/sql_base.cc:
Update copyright
sql/sql_cache.cc:
Update copyright
sql/sql_class.cc:
Update copyright
sql/sql_class.h:
Update copyright
sql/sql_crypt.cc:
Update copyright
sql/sql_crypt.h:
Update copyright
sql/sql_db.cc:
Update copyright
sql/sql_delete.cc:
Update copyright
sql/sql_handler.cc:
Update copyright
sql/sql_insert.cc:
Update copyright
sql/sql_lex.cc:
Update copyright
sql/sql_lex.h:
Update copyright
sql/sql_list.cc:
Update copyright
sql/sql_list.h:
Update copyright
sql/sql_load.cc:
Update copyright
sql/sql_map.cc:
Update copyright
sql/sql_map.h:
Update copyright
sql/sql_parse.cc:
Update copyright
sql/sql_rename.cc:
Update copyright
sql/sql_repl.cc:
Update copyright
sql/sql_select.h:
Update copyright
sql/sql_string.cc:
Update copyright
sql/sql_string.h:
Update copyright
sql/sql_table.cc:
Update copyright
sql/sql_test.cc:
Update copyright
sql/sql_udf.cc:
Update copyright
sql/sql_udf.h:
Update copyright
sql/stacktrace.c:
Update copyright
sql/structs.h:
Update copyright
sql/table.cc:
Update copyright
sql/table.h:
Update copyright
sql/thr_malloc.cc:
Update copyright
sql/time.cc:
Update copyright
sql/udf_example.cc:
Update copyright
sql/uniques.cc:
Update copyright
sql/unireg.cc:
Update copyright
sql/unireg.h:
Update copyright
strings/atof.c:
Update copyright
strings/bchange.c:
Update copyright
strings/bcmp.c:
Update copyright
strings/bcopy-duff.c:
Update copyright
strings/bfill.c:
Update copyright
strings/bmove.c:
Update copyright
strings/bmove512.c:
Update copyright
strings/bmove_upp.c:
Update copyright
strings/bzero.c:
Update copyright
strings/conf_to_src.c:
Update copyright
strings/ctype-big5.c:
Update copyright
strings/ctype-czech.c:
Update copyright
strings/ctype-euc_kr.c:
Update copyright
strings/ctype-gb2312.c:
Update copyright
strings/ctype-gbk.c:
Update copyright
strings/ctype-latin1_de.c:
Update copyright
strings/ctype-sjis.c:
Update copyright
strings/ctype-tis620.c:
Update copyright
strings/ctype-ujis.c:
Update copyright
strings/ctype.c:
Update copyright
strings/do_ctype.c:
Update copyright
strings/int2str.c:
Update copyright
strings/is_prefix.c:
Update copyright
strings/llstr.c:
Update copyright
strings/longlong2str.c:
Update copyright
strings/memcmp.c:
Update copyright
strings/memcpy.c:
Update copyright
strings/memset.c:
Update copyright
strings/r_strinstr.c:
Update copyright
strings/str2int.c:
Update copyright
strings/str_test.c:
Update copyright
strings/strappend.c:
Update copyright
strings/strcat.c:
Update copyright
strings/strcend.c:
Update copyright
strings/strchr.c:
Update copyright
strings/strcmp.c:
Update copyright
strings/strcont.c:
Update copyright
strings/strend.c:
Update copyright
strings/strfill.c:
Update copyright
strings/strings-not-used.h:
Update copyright
strings/strinstr.c:
Update copyright
strings/strlen.c:
Update copyright
strings/strmake.c:
Update copyright
strings/strmov.c:
Update copyright
strings/strnlen.c:
Update copyright
strings/strnmov.c:
Update copyright
strings/strrchr.c:
Update copyright
strings/strstr.c:
Update copyright
strings/strto.c:
Update copyright
strings/strtol.c:
Update copyright
strings/strtoll.c:
Update copyright
strings/strtoul.c:
Update copyright
strings/strtoull.c:
Update copyright
strings/strxmov.c:
Update copyright
strings/strxnmov.c:
Update copyright
strings/t_ctype.h:
Update copyright
strings/udiv.c:
Update copyright
tools/mysqlmanager.c:
Update copyright
vio/test-ssl.c:
Update copyright
vio/test-sslclient.c:
Update copyright
vio/test-sslserver.c:
Update copyright
vio/vio.c:
Update copyright
vio/viosocket.c:
Update copyright
vio/viossl.c:
Update copyright
vio/viosslfactories.c:
Update copyright
vio/viotest-ssl.c:
Update copyright
Diffstat (limited to 'fs')
-rw-r--r-- | fs/database.c | 25 | ||||
-rw-r--r-- | fs/libmysqlfs.c | 4 | ||||
-rw-r--r-- | fs/mysqlcorbafs.c | 15 | ||||
-rw-r--r-- | fs/mysqlcorbafs.h | 4 | ||||
-rw-r--r-- | fs/mysqlcorbafs_test.c | 14 |
5 files changed, 28 insertions, 34 deletions
diff --git a/fs/database.c b/fs/database.c index 2e93f87376a..4a328c41618 100644 --- a/fs/database.c +++ b/fs/database.c @@ -110,7 +110,7 @@ void db_show_result(MYSQL* sock, char *b, struct format *f) buffptr=b; OUTPUT(f->tablestart) - + OUTPUT_TOP(f->leftuppercorner); OUTPUT_MIDDLE(f->leftcross); OUTPUT_BOTTOM(f->leftdowncorner); @@ -136,7 +136,7 @@ void db_show_result(MYSQL* sock, char *b, struct format *f) sprintf(hdrptr,"%-*s",field->max_length,field->name); //num_flag[off]= IS_NUM(field->type); - + topptr+=field->max_length; midptr+=field->max_length; botptr+=field->max_length; @@ -161,7 +161,7 @@ void db_show_result(MYSQL* sock, char *b, struct format *f) OUTPUT(middleseparator); while(row=mysql_fetch_row(result)) { mysql_field_seek(result,0); - + OUTPUT(f->contentrowstart); for(i=0 ; i < mysql_field_count(sock); ++i) { field = mysql_fetch_field(result); @@ -242,7 +242,7 @@ int db_show_field(char *b,const char *database,const char *table, const char *fi /* We cant output fields when one of these variables is missing */ if (!(database[0] && table[0] && field[0])) DBUG_RETURN(-1); - + init_dynamic_array(&field_array, sizeof(buff), 4096, 1024); if (mysql_select_db(sock,database)) @@ -459,7 +459,7 @@ db_show_databases(char *b,int size) MYSQL_ROW row; char buff[BUFLEN]; int i=0; - + DBUG_ENTER("db_show_databases"); DBUG_PRINT("enter",("buffer: '%s', size: '%d'", b, size)); result=mysql_list_dbs(sock,NULL); @@ -481,7 +481,7 @@ void db_load_formats() /* HTML output */ HTML.tablestart="<table>\n"; - + HTML.headerrowstart="<tr>"; HTML.headercellstart="<th>"; HTML.headercellseparator="</th><th>"; @@ -499,7 +499,7 @@ void db_load_formats() HTML.leftcross=""; HTML.rightcross=""; HTML.bottomcross=""; - + HTML.contentrowstart="<tr>"; HTML.contentcellstart="<td>"; HTML.contentcellseparator="</td><td>"; @@ -517,16 +517,16 @@ void db_load_formats() HTML.tableend="</table>\n"; /* Nice to look mysql client like output */ - + Human.tablestart="\n"; - + Human.headerrowstart="| "; Human.headercellstart=""; Human.headercellseparator=" | "; Human.headercellend=" |"; Human.headerrowend="\n"; Human.headerformat=1; - + Human.leftuppercorner="/="; Human.rightuppercorner="=\\\n"; Human.leftdowncorner="\\="; @@ -554,9 +554,9 @@ void db_load_formats() Human.tableend="\n"; /* Comma-separated format. For machine reading */ - + /* XML */ - + /* tee_fprintf(PAGER,"<?xml version=\"1.0\"?>\n\n<resultset statement=\"%s\">", statement); (void) tee_fputs("\n <row>\n", PAGER); @@ -626,4 +626,3 @@ gptr db_load_functions() } DBUG_RETURN((gptr)&functions_array); } - diff --git a/fs/libmysqlfs.c b/fs/libmysqlfs.c index 856692d0bd1..fde325c3c42 100644 --- a/fs/libmysqlfs.c +++ b/fs/libmysqlfs.c @@ -141,7 +141,7 @@ int parse(const char * path, char *server, char * database, char *table, if(*funce) *server='\0'; } else *funce=NULL; - + DBUG_PRINT("info",("path: '%s', server: '%s', db: '%s', table: '%s', field: '%s', value: '%s', function: '%x'", buffer, server, database, table, field, value, funce )); if(p && *p) /* Something is in buffer - too deep in levels */ @@ -149,5 +149,3 @@ int parse(const char * path, char *server, char * database, char *table, else DBUG_RETURN(0) } - - diff --git a/fs/mysqlcorbafs.c b/fs/mysqlcorbafs.c index 70db96f64a9..8943c00ed25 100644 --- a/fs/mysqlcorbafs.c +++ b/fs/mysqlcorbafs.c @@ -56,7 +56,7 @@ static my_bool verbose=0,opt_compress=0,extended_insert=0, lock_tables=0, opt_quoted=0, opt_lock=0, opt_delayed=0, ignore_errors=0; gptr fptr; - + static const char *load_default_groups[]= { "mysqlcorbafs","client",0 }; static char *default_charset, *current_host, *current_user, *opt_password, *path,*fields_terminated=0, *lines_terminated=0, *enclosed=0, @@ -314,7 +314,7 @@ char *field_escape(char *to,const char *from,uint length) const char *end; uint end_backslashes=0; DBUG_ENTER("field_escape"); - + { *to++= *from; if (*from == '\\') @@ -442,7 +442,7 @@ static int get_options(int *argc,char ***argv) case OPT_CHARSETS_DIR: charsets_dir= optarg; break; - + ignore_errors=1; break; case 'h': @@ -652,7 +652,7 @@ impl_Inode_getStatus(impl_POA_CorbaFS_Inode * servant, key[BUFLEN], field[BUFLEN], value[BUFLEN]; - + struct func_st *func; DBUG_ENTER("impl_Inode_getStatus"); @@ -675,7 +675,7 @@ impl_Inode_getStatus(impl_POA_CorbaFS_Inode * servant, DBUG_PRINT("info",("Argument is directory, returning S_IFDIR")); *mode = S_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH ; // Dir } - + *mode |= S_IRUSR | S_IRGRP | S_IROTH; *uid = 0; *gid = 0; @@ -685,7 +685,7 @@ impl_Inode_getStatus(impl_POA_CorbaFS_Inode * servant, *atime = 3; *mtime = 2; *ctime = 1; - + // lstat(servant->path, &buf); // *mode = buf.st_mode; /* *uid = buf.st_uid; @@ -922,7 +922,7 @@ impl_FileSystem_readlink(impl_POA_CorbaFS_FileSystem * servant, CORBA_char *retval = CORBA_OBJECT_NIL; char tmp[MAXPATHLEN + 1]; int len; - + DBUG_ENTER("impl_FileSystem_readlink"); DBUG_PRINT("enter",("path: '%s'", filename)); @@ -989,4 +989,3 @@ int main(int argc, char *argv[]) { return 0; } - diff --git a/fs/mysqlcorbafs.h b/fs/mysqlcorbafs.h index 4074d0e07b4..f805a1fb584 100644 --- a/fs/mysqlcorbafs.h +++ b/fs/mysqlcorbafs.h @@ -153,7 +153,5 @@ static struct format { char *middlecross; char *bottomcross; - -} Human, HTML, CSF, XML; - +} Human, HTML, CSF, XML; diff --git a/fs/mysqlcorbafs_test.c b/fs/mysqlcorbafs_test.c index 81b76702303..bd7d9381744 100644 --- a/fs/mysqlcorbafs_test.c +++ b/fs/mysqlcorbafs_test.c @@ -15,7 +15,7 @@ main (int argc, char *argv[]) CorbaFS_Buffer *buffer; CorbaFS_DirEntSeq *dirents; CorbaFS_dirent *dirent; - + CORBA_unsigned_short mode; CORBA_unsigned_long uid; CORBA_unsigned_long gid; @@ -25,9 +25,9 @@ main (int argc, char *argv[]) CORBA_long atime; CORBA_long mtime; CORBA_long ctime; - + int i; - + int niters = 10; CORBA_exception_init(&ev); @@ -45,12 +45,12 @@ main (int argc, char *argv[]) printf("Cannot bind to %s\n", argv[1]); return 1; } - + if (argc >= 3) inode = CorbaFS_FileSystem_getInode(fs, argv[2], &ev); else inode = CorbaFS_FileSystem_getInode(fs, "/proc/cpuinfo", &ev); - + if (!inode) { printf("Cannot get inode\n"); @@ -67,7 +67,7 @@ main (int argc, char *argv[]) &mtime, &ctime, &ev); - + printf("inode = %x\n", inode); CorbaFS_Inode_readpage(inode, &buffer, 100000, 100, &ev); printf("readpage got %d bytes\n", buffer->_length); @@ -84,7 +84,7 @@ main (int argc, char *argv[]) printf("%d = %s\n", dirent->inode, dirent->name); dirent++; } - + CORBA_Object_release(fs, &ev); CORBA_Object_release((CORBA_Object)orb, &ev); |