2837 Jim Winstead 2009-04-08
Fix missing my_ prefix on some calls to base64 routines.
modified:
storage/ndb/src/mgmsrv/Services.cpp
2836 Jim Winstead 2009-04-07 [merge]
Merge from main
removed:
mysql-test/suite/backup/r/backup_view_on_view.result
mysql-test/suite/backup/t/backup_view_on_view.test
mysql-test/suite/backup_engines/r/backup_procedures.result
mysql-test/suite/backup_engines/r/backup_ptr_commit_mixed.result
mysql-test/suite/backup_engines/r/backup_ptr_commit_stmt.result
mysql-test/suite/backup_engines/r/backup_ptr_mixed.result
mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result
mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result
mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result
mysql-test/suite/backup_engines/r/backup_ptr_row.result
mysql-test/suite/backup_engines/r/backup_ptr_stmt.result
mysql-test/suite/backup_engines/t/backup_procedures.test
mysql-test/suite/backup_engines/t/backup_ptr_commit_mixed.test
mysql-test/suite/backup_engines/t/backup_ptr_commit_row.test
mysql-test/suite/backup_engines/t/backup_ptr_commit_stmt.test
mysql-test/suite/backup_engines/t/backup_ptr_mixed.test
mysql-test/suite/backup_engines/t/backup_ptr_objects_mixed.test
mysql-test/suite/backup_engines/t/backup_ptr_objects_row.test
mysql-test/suite/backup_engines/t/backup_ptr_objects_stmt.test
mysql-test/suite/backup_engines/t/backup_ptr_row.test
mysql-test/suite/backup_engines/t/backup_ptr_stmt.test
mysql-test/suite/backup_engines/t/disabled.def
added:
client/backup_stream.c
client/backup_stream.h
client/mysqlbackup.cc
mysql-test/extra/binlog_tests/drop_table.test
mysql-test/include/UnicodeData.txt
mysql-test/include/bug38347.inc
mysql-test/r/myisamlog_coverage.result
mysql-test/suite/backup/README
mysql-test/suite/backup/include/
mysql-test/suite/backup/include/backup_client_regex_output.inc
mysql-test/suite/backup/include/backup_client_regex_usage.inc
mysql-test/suite/backup/include/bml_test.inc
mysql-test/suite/backup/include/objects_dependency_use.inc
mysql-test/suite/backup/r/backup_accented.result
mysql-test/suite/backup/r/backup_client.result
mysql-test/suite/backup/r/backup_client_binlog.result
mysql-test/suite/backup/r/backup_client_coverage.result
mysql-test/suite/backup/r/backup_compression_non_win.result
mysql-test/suite/backup/r/backup_db_grants_extra.result
mysql-test/suite/backup/r/backup_dbname_lctn0.result
mysql-test/suite/backup/r/backup_dbname_lctn1.result
mysql-test/suite/backup/r/backup_dbname_lctn2.result
mysql-test/suite/backup/r/backup_errors_compression.result
mysql-test/suite/backup/r/backup_image_name_notwin.result
mysql-test/suite/backup/r/backup_image_name_win.result
mysql-test/suite/backup/r/backup_mysql_upgrade.result
mysql-test/suite/backup/r/backup_object_count.result
mysql-test/suite/backup/r/backup_objects_dependency.result
mysql-test/suite/backup/r/backup_pipe.result
mysql-test/suite/backup/r/backup_special_characters.result
mysql-test/suite/backup/r/backup_stream_pipe.result
mysql-test/suite/backup/r/backup_table_grants.result
mysql-test/suite/backup/t/backup_accented.test
mysql-test/suite/backup/t/backup_client.test
mysql-test/suite/backup/t/backup_client_binlog.test
mysql-test/suite/backup/t/backup_client_coverage.test
mysql-test/suite/backup/t/backup_compression_non_win.test
mysql-test/suite/backup/t/backup_db_grants_extra.test
mysql-test/suite/backup/t/backup_dbname_lctn0-master.opt
mysql-test/suite/backup/t/backup_dbname_lctn0.test
mysql-test/suite/backup/t/backup_dbname_lctn1-master.opt
mysql-test/suite/backup/t/backup_dbname_lctn1.test
mysql-test/suite/backup/t/backup_dbname_lctn2-master.opt
mysql-test/suite/backup/t/backup_dbname_lctn2.test
mysql-test/suite/backup/t/backup_errors_compression.test
mysql-test/suite/backup/t/backup_image_name_notwin.test
mysql-test/suite/backup/t/backup_image_name_win.test
mysql-test/suite/backup/t/backup_mysql_upgrade.test
mysql-test/suite/backup/t/backup_object_count.test
mysql-test/suite/backup/t/backup_objects_dependency.test
mysql-test/suite/backup/t/backup_pipe.test
mysql-test/suite/backup/t/backup_special_characters.test
mysql-test/suite/backup/t/backup_stream_pipe.test
mysql-test/suite/backup/t/backup_table_grants.test
mysql-test/suite/backup_engines/README
mysql-test/suite/backup_engines/include/not_archive.inc
mysql-test/suite/backup_engines/include/not_csv.inc
mysql-test/suite/backup_ptr/
mysql-test/suite/backup_ptr/README
mysql-test/suite/backup_ptr/combinations
mysql-test/suite/backup_ptr/include/
mysql-test/suite/backup_ptr/r/
mysql-test/suite/backup_ptr/r/backup_ptr.result
mysql-test/suite/backup_ptr/r/backup_ptr_objects.result
mysql-test/suite/backup_ptr/t/
mysql-test/suite/binlog/r/binlog_row_drop_tbl.result
mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result
mysql-test/suite/binlog/t/binlog_row_drop_tbl.test
mysql-test/suite/binlog/t/binlog_stm_drop_tbl.test
mysql-test/suite/falcon/r/falcon_bug_40950.result
mysql-test/suite/falcon/r/falcon_bug_43452.result
mysql-test/suite/falcon/t/falcon_bug_40950.test
mysql-test/suite/falcon/t/falcon_bug_43452.test
mysql-test/suite/maria/r/maria4.result
mysql-test/suite/maria/t/maria-autozerofill-master.opt
mysql-test/suite/maria/t/maria-no-logging-master.opt
mysql-test/suite/maria/t/maria4.test
mysql-test/t/myisamlog_coverage-master.opt
mysql-test/t/myisamlog_coverage.test
storage/falcon/CycleLock.cpp
storage/falcon/CycleLock.h
storage/falcon/CycleManager.cpp
storage/falcon/CycleManager.h
storage/falcon/ErrorInjector.cpp
storage/falcon/ErrorInjector.h
storage/falcon/TransactionState.cpp
storage/falcon/TransactionState.h
renamed:
mysql-test/suite/backup/r/backup_ddl_blocker.result => mysql-test/suite/backup/r/backup_bml.result
mysql-test/suite/backup/r/backup_securefilepriv.result => mysql-test/suite/backup/r/backup_securebackup.result
mysql-test/suite/backup/t/backup_ddl_blocker.test => mysql-test/suite/backup/t/backup_bml.test
mysql-test/suite/backup/t/backup_securefilepriv-master.opt => mysql-test/suite/backup/t/backup_securebackup-master.opt
mysql-test/suite/backup/t/backup_securefilepriv.test => mysql-test/suite/backup/t/backup_securebackup.test
mysql-test/suite/backup_engines/include/backup_ptr.inc => mysql-test/suite/backup_ptr/t/backup_ptr.test
mysql-test/suite/backup_engines/include/backup_ptr_commit.inc => mysql-test/suite/backup_ptr/t/backup_ptr_commits.test
mysql-test/suite/backup_engines/include/backup_ptr_objects.inc => mysql-test/suite/backup_ptr/t/backup_ptr_objects.test
mysql-test/suite/backup_engines/include/not_have_falcon.inc => mysql-test/suite/backup_engines/include/not_falcon.inc
mysql-test/suite/backup_engines/include/not_have_innodb.inc => mysql-test/suite/backup_engines/include/not_innodb.inc
mysql-test/suite/backup_engines/include/not_have_memory.inc => mysql-test/suite/backup_engines/include/not_memory.inc
mysql-test/suite/backup_engines/include/not_have_myisam.inc => mysql-test/suite/backup_engines/include/not_myisam.inc
mysql-test/suite/backup_engines/r/backup_functions.result => mysql-test/suite/backup/r/backup_functions.result
mysql-test/suite/backup_engines/r/backup_online_testing.result => mysql-test/suite/backup/r/backup_online_testing.result
mysql-test/suite/backup_engines/r/backup_ptr_commit_row.result => mysql-test/suite/backup_ptr/r/backup_ptr_commits.result
mysql-test/suite/backup_engines/r/backup_tmp_tables.result => mysql-test/suite/backup/r/backup_tmp_tables.result
mysql-test/suite/backup_engines/t/backup_functions.test => mysql-test/suite/backup/t/backup_functions.test
mysql-test/suite/backup_engines/t/backup_online_testing.test => mysql-test/suite/backup/t/backup_online_testing.test
mysql-test/suite/backup_engines/t/backup_tmp_tables.test => mysql-test/suite/backup/t/backup_tmp_tables.test
mysql-test/suite/falcon_team/r/falcon_bug_36294-big.result => mysql-test/suite/falcon/r/falcon_bug_36294-big.result
mysql-test/suite/falcon_team/t/falcon_bug_36294-big.test => mysql-test/suite/falcon/t/falcon_bug_36294-big.test
sql/ddl_blocker.cc => sql/bml.cc
sql/ddl_blocker.h => sql/bml.h
modified:
.bzr-mysql/default.conf
.bzrignore
client/CMakeLists.txt
client/Makefile.am
client/mysqldump.c
client/mysqltest.cc
dbug/dbug.c
include/lf.h
include/my_sys.h
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
mysql-test/Makefile.am
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
mysql-test/include/locktrans.inc
mysql-test/include/mix1.inc
mysql-test/include/mix2.inc
mysql-test/lib/My/CoreDump.pm
mysql-test/mysql-test-run.pl
mysql-test/r/ddl_i18n_koi8r.result
mysql-test/r/ddl_i18n_utf8.result
mysql-test/r/debug_sync.result
mysql-test/r/events_1.result
mysql-test/r/events_2.result
mysql-test/r/flush_block_commit.result
mysql-test/r/flush_block_commit_notembedded.result
mysql-test/r/grant.result
mysql-test/r/innodb.result
mysql-test/r/innodb_mysql.result
mysql-test/r/lock.result
mysql-test/r/locktrans_innodb.result
mysql-test/r/locktrans_myisam.result
mysql-test/r/mix2_myisam.result
mysql-test/r/myisam_keycache_coverage.result
mysql-test/r/myisamlog.result
mysql-test/r/mysqldump.result
mysql-test/r/not_embedded_server.result
mysql-test/r/partition_innodb_semi_consistent.result
mysql-test/r/ps.result
mysql-test/r/read_only_innodb.result
mysql-test/r/show_check.result
mysql-test/r/variables_debug.result
mysql-test/suite/backup/r/backup.result
mysql-test/suite/backup/r/backup_backupdir.result
mysql-test/suite/backup/r/backup_compression.result
mysql-test/suite/backup/r/backup_db_grants.result
mysql-test/suite/backup/r/backup_errors.result
mysql-test/suite/backup/r/backup_lock_myisam.result
mysql-test/suite/backup/r/backup_logs.result
mysql-test/suite/backup/r/backup_logs_output.result
mysql-test/suite/backup/r/backup_procedures.result
mysql-test/suite/backup/r/backup_tablespace.result
mysql-test/suite/backup/r/backup_timeout.result
mysql-test/suite/backup/r/backup_views.result
mysql-test/suite/backup/t/backup.test
mysql-test/suite/backup/t/backup_backupdir.test
mysql-test/suite/backup/t/backup_charsets.test
mysql-test/suite/backup/t/backup_compression.test
mysql-test/suite/backup/t/backup_concurrent.test
mysql-test/suite/backup/t/backup_datatypes.test
mysql-test/suite/backup/t/backup_db_grants.test
mysql-test/suite/backup/t/backup_default.test
mysql-test/suite/backup/t/backup_errors.test
mysql-test/suite/backup/t/backup_fkey.test
mysql-test/suite/backup/t/backup_lock_myisam.test
mysql-test/suite/backup/t/backup_logs.test
mysql-test/suite/backup/t/backup_logs_output-master.opt
mysql-test/suite/backup/t/backup_logs_output.test
mysql-test/suite/backup/t/backup_logs_purge.test
mysql-test/suite/backup/t/backup_many_dbs.test
mysql-test/suite/backup/t/backup_maria.test
mysql-test/suite/backup/t/backup_maria_other_instance.test
mysql-test/suite/backup/t/backup_multi_blocks.test
mysql-test/suite/backup/t/backup_myisam.test
mysql-test/suite/backup/t/backup_myisam_coverage.test
mysql-test/suite/backup/t/backup_myisam_extlocking.test
mysql-test/suite/backup/t/backup_myisam_sync.test
mysql-test/suite/backup/t/backup_no_be.test
mysql-test/suite/backup/t/backup_no_data.test
mysql-test/suite/backup/t/backup_no_engine.test
mysql-test/suite/backup/t/backup_nodata_driver.test
mysql-test/suite/backup/t/backup_objects.test
mysql-test/suite/backup/t/backup_procedures.test
mysql-test/suite/backup/t/backup_security.test
mysql-test/suite/backup/t/backup_snapshot.test
mysql-test/suite/backup/t/backup_tablespace.test
mysql-test/suite/backup/t/backup_timeout.test
mysql-test/suite/backup/t/backup_triggers_and_events.test
mysql-test/suite/backup/t/backup_views.test
mysql-test/suite/backup/t/disabled.def
mysql-test/suite/backup_engines/combinations
mysql-test/suite/backup_engines/r/backup_partition.result
mysql-test/suite/backup_engines/r/backup_partitioning.result
mysql-test/suite/backup_engines/t/backup_partition.test
mysql-test/suite/backup_engines/t/backup_partitioning.test
mysql-test/suite/backup_engines/t/backup_triggers.test
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/falcon/r/falcon_bugs2.result
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
mysql-test/suite/falcon/r/falcon_unicode-big.result
mysql-test/suite/falcon/t/disabled.def
mysql-test/suite/falcon/t/falcon_bugs2.test
mysql-test/suite/falcon/t/falcon_unicode-big.test
mysql-test/suite/falcon_team/r/falcon_deadlock.result
mysql-test/suite/falcon_team/t/falcon_bug_34174.test
mysql-test/suite/falcon_team/t/falcon_deadlock.test
mysql-test/suite/falcon_team/t/test2bug.def
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
mysql-test/suite/maria/r/maria-recovery-bitmap.result
mysql-test/suite/maria/r/maria-recovery2.result
mysql-test/suite/maria/r/maria.result
mysql-test/suite/maria/t/disabled.def
mysql-test/suite/maria/t/maria-recovery-bitmap.test
mysql-test/suite/maria/t/maria-recovery2.test
mysql-test/suite/ndb/r/ndb_index_ordered.result
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/ndb/t/ndb_index_ordered.test
mysql-test/suite/parts/r/partition_special_innodb.result
mysql-test/suite/parts/t/partition_special_innodb.test
mysql-test/suite/rpl/r/rpl_backup.result
mysql-test/suite/rpl/r/rpl_locktrans_falcon.result
mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_backup.test
mysql-test/suite/sys_vars/t/autocommit_func.test
mysql-test/t/debug_sync.test
mysql-test/t/disabled.def
mysql-test/t/flush_block_commit.test
mysql-test/t/flush_block_commit_notembedded.test
mysql-test/t/grant.test
mysql-test/t/innodb.test
mysql-test/t/lock.test
mysql-test/t/myisam_keycache_coverage.test
mysql-test/t/myisamlog.test
mysql-test/t/not_embedded_server.test
mysql-test/t/partition_innodb_semi_consistent.test
mysql-test/t/ps.test
mysql-test/t/read_only_innodb.test
mysql-test/t/union.test
mysql-test/t/user_limits.test
mysql-test/t/variables_debug.test
mysql-test/t/xa.test
mysql-test/valgrind.supp
mysys/lf_alloc-pin.c
mysys/my_lock.c
mysys/my_malloc.c
mysys/my_static.c
mysys/safemalloc.c
mysys/tests/testhash.c
mysys/thr_lock.c
scripts/mysql_system_tables.sql
sql/CMakeLists.txt
sql/Makefile.am
sql/backup/backup_aux.h
sql/backup/backup_engine.h
sql/backup/backup_info.cc
sql/backup/backup_kernel.h
sql/backup/backup_test.cc
sql/backup/be_default.cc
sql/backup/be_nodata.cc
sql/backup/be_nodata.h
sql/backup/be_snapshot.cc
sql/backup/be_thread.cc
sql/backup/data_backup.cc
sql/backup/image_info.cc
sql/backup/image_info.h
sql/backup/kernel.cc
sql/backup/logger.cc
sql/backup/logger.h
sql/backup/stream.cc
sql/backup/stream.h
sql/backup/stream_v1.c
sql/backup/stream_v1_services.h
sql/backup/stream_v1_transport.c
sql/debug_sync.cc
sql/debug_sync.h
sql/event_data_objects.cc
sql/handler.cc
sql/lex.h
sql/log.cc
sql/log_event.cc
sql/mdl.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/rpl_injector.cc
sql/rpl_rli.cc
sql/scheduler.cc
sql/set_var.cc
sql/share/errmsg.txt
sql/si_objects.cc
sql/si_objects.h
sql/slave.cc
sql/sql_acl.cc
sql/sql_acl.h
sql/sql_base.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_lex.cc
sql/sql_parse.cc
sql/sql_prepare.cc
sql/sql_repl.cc
sql/sql_servers.cc
sql/sql_table.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/table.h
sql/transaction.cc
storage/archive/CMakeLists.txt
storage/falcon/BDB.cpp
storage/falcon/BDB.h
storage/falcon/BackLog.cpp
storage/falcon/BigInt.cpp
storage/falcon/BigInt.h
storage/falcon/CMakeLists.txt
storage/falcon/Cache.cpp
storage/falcon/Cache.h
storage/falcon/CmdGen.cpp
storage/falcon/Configuration.cpp
storage/falcon/Connection.cpp
storage/falcon/Context.cpp
storage/falcon/Database.cpp
storage/falcon/Database.h
storage/falcon/Dbb.cpp
storage/falcon/Dbb.h
storage/falcon/Debug.cpp
storage/falcon/EncodedRecord.cpp
storage/falcon/FsbSort.cpp
storage/falcon/IO.cpp
storage/falcon/ImageManager.cpp
storage/falcon/Index.cpp
storage/falcon/Index.h
storage/falcon/Index2Page.cpp
storage/falcon/IndexPage.cpp
storage/falcon/IndexPage.h
storage/falcon/IndexRootPage.cpp
storage/falcon/IndexRootPage.h
storage/falcon/IndexWalker.cpp
storage/falcon/JString.cpp
storage/falcon/JString.h
storage/falcon/Makefile.am
storage/falcon/MemControl.cpp
storage/falcon/MemControl.h
storage/falcon/MemMgr.cpp
storage/falcon/MemMgr.h
storage/falcon/MemoryManager.h
storage/falcon/PageInventoryPage.cpp
storage/falcon/Record.cpp
storage/falcon/Record.h
storage/falcon/RecordLeaf.cpp
storage/falcon/RecordLocatorPage.cpp
storage/falcon/RecordScavenge.cpp
storage/falcon/RecordVersion.cpp
storage/falcon/RecordVersion.h
storage/falcon/Repository.cpp
storage/falcon/Repository.h
storage/falcon/RepositoryVolume.cpp
storage/falcon/RepositoryVolume.h
storage/falcon/SQLError.cpp
storage/falcon/SQLError.h
storage/falcon/SRLIndexPage.cpp
storage/falcon/SRLIndexPage.h
storage/falcon/SRLUpdateRecords.cpp
storage/falcon/SRLVersion.h
storage/falcon/SavePoint.cpp
storage/falcon/Scavenger.cpp
storage/falcon/Schedule.cpp
storage/falcon/Section.cpp
storage/falcon/SerialLog.cpp
storage/falcon/SerialLogRecord.h
storage/falcon/SortRecord.cpp
storage/falcon/Statement.cpp
storage/falcon/StorageDatabase.cpp
storage/falcon/StorageHandler.cpp
storage/falcon/StorageTable.cpp
storage/falcon/StorageTable.h
storage/falcon/StorageTableShare.h
storage/falcon/StorageVersion.h
storage/falcon/SyncObject.cpp
storage/falcon/Table.cpp
storage/falcon/Table.h
storage/falcon/TableSpaceManager.cpp
storage/falcon/Thread.cpp
storage/falcon/Thread.h
storage/falcon/Transaction.cpp
storage/falcon/Transaction.h
storage/falcon/TransactionManager.cpp
storage/falcon/Value.cpp
storage/falcon/WalkIndex.cpp
storage/falcon/ha_falcon.cpp
storage/maria/ha_maria.cc
storage/maria/ma_examine_non_trans_log.c
storage/maria/ma_key.c
storage/maria/ma_locking.c
storage/maria/ma_loghandler.c
storage/maria/ma_non_trans_log.c
storage/maria/ma_recovery.c
storage/maria/ma_rkey.c
storage/maria/ma_test_force_start.pl
storage/maria/maria_chk.c
storage/maria/maria_non_trans_log.c
storage/maria/trnman.c
storage/myisam/mi_close.c
storage/myisam/mi_examine_log.c
storage/myisam/mi_locking.c
storage/myisam/mi_log.c
storage/myisam/myisamlog.c
storage/myisammrg/ha_myisammrg.cc
unittest/mysys/CMakeLists.txt
unittest/mysys/waiting_threads-t.c
mysql-test/suite/backup/r/backup_bml.result
mysql-test/suite/backup/r/backup_securebackup.result
mysql-test/suite/backup/t/backup_bml.test
mysql-test/suite/backup/t/backup_securebackup-master.opt
mysql-test/suite/backup/t/backup_securebackup.test
mysql-test/suite/backup_ptr/t/backup_ptr.test
mysql-test/suite/backup_ptr/t/backup_ptr_commits.test
mysql-test/suite/backup_ptr/t/backup_ptr_objects.test
mysql-test/suite/backup_engines/include/not_falcon.inc
mysql-test/suite/backup_engines/include/not_innodb.inc
mysql-test/suite/backup_engines/include/not_memory.inc
mysql-test/suite/backup_engines/include/not_myisam.inc
mysql-test/suite/backup/r/backup_functions.result
mysql-test/suite/backup_ptr/r/backup_ptr_commits.result
mysql-test/suite/backup/t/backup_functions.test
mysql-test/suite/backup/t/backup_online_testing.test
sql/bml.cc
sql/bml.h
=== modified file 'include/base64.h'
--- a/include/base64.h 2006-12-23 19:20:40 +0000
+++ b/include/base64.h 2009-03-25 00:04:41 +0000
@@ -23,23 +23,24 @@ extern "C" {
/*
Calculate how much memory needed for dst of base64_encode()
*/
-int base64_needed_encoded_length(int length_of_data);
+int my_base64_needed_encoded_length(int length_of_data);
/*
Calculate how much memory needed for dst of base64_decode()
*/
-int base64_needed_decoded_length(int length_of_encoded_data);
+int my_base64_needed_decoded_length(int length_of_encoded_data);
+
/*
Encode data as a base64 string
*/
-int base64_encode(const void *src, size_t src_len, char *dst);
+int my_base64_encode(const void *src, size_t src_len, char *dst);
/*
Decode a base64 string into data
*/
-int base64_decode(const char *src, size_t src_len,
- void *dst, const char **end_ptr);
+int my_base64_decode(const char *src, size_t src_len,
+ void *dst, const char **end_ptr);
#ifdef __cplusplus
=== modified file 'mysys/base64.c'
--- a/mysys/base64.c 2008-01-15 12:23:14 +0000
+++ b/mysys/base64.c 2009-03-25 00:04:41 +0000
@@ -26,7 +26,7 @@ static char base64_table[] = "ABCDEFGHIJ
int
-base64_needed_encoded_length(int length_of_data)
+my_base64_needed_encoded_length(int length_of_data)
{
int nb_base64_chars;
nb_base64_chars= (length_of_data + 2) / 3 * 4;
@@ -39,7 +39,7 @@ base64_needed_encoded_length(int length_
int
-base64_needed_decoded_length(int length_of_encoded_data)
+my_base64_needed_decoded_length(int length_of_encoded_data)
{
return (int) ceil(length_of_encoded_data * 3 / 4);
}
@@ -49,11 +49,11 @@ base64_needed_decoded_length(int length_
Encode a data as base64.
Note: We require that dst is pre-allocated to correct size.
- See base64_needed_encoded_length().
+ See my_base64_needed_encoded_length().
*/
int
-base64_encode(const void *src, size_t src_len, char *dst)
+my_base64_encode(const void *src, size_t src_len, char *dst)
{
const unsigned char *s= (const unsigned char*)src;
size_t i= 0;
@@ -146,14 +146,14 @@ pos(unsigned char c)
We require that 'dst' is pre-allocated to correct size.
SEE ALSO
- base64_needed_decoded_length().
+ my_base64_needed_decoded_length().
RETURN VALUE
Number of bytes written at 'dst' or -1 in case of failure
*/
int
-base64_decode(const char *src_base, size_t len,
- void *dst, const char **end_ptr)
+my_base64_decode(const char *src_base, size_t len,
+ void *dst, const char **end_ptr)
{
char b[3];
size_t i= 0;
@@ -264,18 +264,18 @@ main(void)
}
/* Encode */
- needed_length= base64_needed_encoded_length(src_len);
+ needed_length= my_base64_needed_encoded_length(src_len);
str= (char *) malloc(needed_length);
require(str);
for (k= 0; k < needed_length; k++)
str[k]= 0xff; /* Fill memory to check correct NUL termination */
- require(base64_encode(src, src_len, str) == 0);
+ require(my_base64_encode(src, src_len, str) == 0);
require(needed_length == strlen(str) + 1);
/* Decode */
- dst= (char *) malloc(base64_needed_decoded_length(strlen(str)));
+ dst= (char *) malloc(my_base64_needed_decoded_length(strlen(str)));
require(dst);
- dst_len= base64_decode(str, strlen(str), dst, NULL);
+ dst_len= my_base64_decode(str, strlen(str), dst, NULL);
require(dst_len == src_len);
if (memcmp(src, dst, src_len) != 0)
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc 2009-04-01 21:36:07 +0000
+++ b/sql/log_event.cc 2009-04-07 18:34:22 +0000
@@ -1903,7 +1903,7 @@ void Log_event::print_base64(IO_CACHE* f
uint32 size= uint4korr(ptr + EVENT_LEN_OFFSET);
DBUG_ENTER("Log_event::print_base64");
- size_t const tmp_str_sz= base64_needed_encoded_length((int) size);
+ size_t const tmp_str_sz= my_base64_needed_encoded_length((int) size);
char *const tmp_str= (char *) my_malloc(tmp_str_sz, MYF(MY_WME));
if (!tmp_str) {
fprintf(stderr, "\nError: Out of memory. "
@@ -1911,7 +1911,7 @@ void Log_event::print_base64(IO_CACHE* f
DBUG_VOID_RETURN;
}
- if (base64_encode(ptr, (size_t) size, tmp_str))
+ if (my_base64_encode(ptr, (size_t) size, tmp_str))
{
DBUG_ASSERT(0);
}
=== modified file 'sql/sql_binlog.cc'
--- a/sql/sql_binlog.cc 2009-02-17 23:06:00 +0000
+++ b/sql/sql_binlog.cc 2009-03-25 00:04:41 +0000
@@ -43,7 +43,7 @@ void mysql_client_binlog_statement(THD*
DBUG_VOID_RETURN;
size_t coded_len= thd->lex->comment.length + 1;
- size_t decoded_len= base64_needed_decoded_length(coded_len);
+ size_t decoded_len= my_base64_needed_decoded_length(coded_len);
DBUG_ASSERT(coded_len > 0);
/*
@@ -93,7 +93,7 @@ void mysql_client_binlog_statement(THD*
strptr < thd->lex->comment.str + thd->lex->comment.length ; )
{
char const *endptr= 0;
- int bytes_decoded= base64_decode(strptr, coded_len, buf, &endptr);
+ int bytes_decoded= my_base64_decode(strptr, coded_len, buf, &endptr);
#ifndef HAVE_purify
/*
=== modified file 'storage/ndb/src/mgmapi/mgmapi.cpp'
--- a/storage/ndb/src/mgmapi/mgmapi.cpp 2009-01-08 11:57:59 +0000
+++ b/storage/ndb/src/mgmapi/mgmapi.cpp 2009-03-25 00:04:41 +0000
@@ -2229,8 +2229,8 @@ ndb_mgm_get_configuration(NdbMgmHandle h
if(buf64 == 0)
break;
- void *tmp_data = malloc(base64_needed_decoded_length((size_t) (len - 1)));
- const int res = base64_decode(buf64, len-1, tmp_data, NULL);
+ void *tmp_data = malloc(my_base64_needed_decoded_length((size_t)(len - 1)));
+ const int res = my_base64_decode(buf64, len-1, tmp_data, NULL);
delete[] buf64;
UtilBuffer tmp;
tmp.append((void *) tmp_data, res);
=== modified file 'storage/ndb/src/mgmsrv/Services.cpp'
--- a/storage/ndb/src/mgmsrv/Services.cpp 2009-01-23 11:03:00 +0000
+++ b/storage/ndb/src/mgmsrv/Services.cpp 2009-04-08 19:45:22 +0000
@@ -614,8 +614,8 @@ MgmApiSession::getConfig(Parser_t::Conte
cfg->pack(src);
NdbMutex_Unlock(m_mgmsrv.m_configMutex);
- char *tmp_str = (char *) malloc(base64_needed_encoded_length(src.length()));
- (void) base64_encode(src.get_data(), src.length(), tmp_str);
+ char *tmp_str = (char *) malloc(my_base64_needed_encoded_length(src.length()));
+ (void) my_base64_encode(src.get_data(), src.length(), tmp_str);
SLEEP_ERROR_INSERTED(1);
=== modified file 'unittest/mysys/base64-t.c'
--- a/unittest/mysys/base64-t.c 2007-08-01 19:59:05 +0000
+++ b/unittest/mysys/base64-t.c 2009-03-25 00:04:41 +0000
@@ -48,18 +48,18 @@ main(void)
}
/* Encode */
- needed_length= base64_needed_encoded_length(src_len);
+ needed_length= my_base64_needed_encoded_length(src_len);
str= (char *) malloc(needed_length);
for (k= 0; k < needed_length; k++)
str[k]= 0xff; /* Fill memory to check correct NUL termination */
- ok(base64_encode(src, src_len, str) == 0,
- "base64_encode: size %d", i);
+ ok(my_base64_encode(src, src_len, str) == 0,
+ "my_base64_encode: size %d", i);
ok(needed_length == strlen(str) + 1,
- "base64_needed_encoded_length: size %d", i);
+ "my_base64_needed_encoded_length: size %d", i);
/* Decode */
- dst= (char *) malloc(base64_needed_decoded_length(strlen(str)));
- dst_len= base64_decode(str, strlen(str), dst, NULL);
+ dst= (char *) malloc(my_base64_needed_decoded_length(strlen(str)));
+ dst_len= my_base64_decode(str, strlen(str), dst, NULL);
ok(dst_len == src_len, "Comparing lengths");
cmp= memcmp(src, dst, src_len);
Attachment: [text/bzr-bundle] bzr/jimw@mysql.com-20090408194522-lqgich3cstc1okj2.bundle
| Thread |
|---|
| • bzr push into mysql-6.0 branch (alik:2836 to 2837) | Alexander Nozdrin | 9 Apr |
