List:Internals« Previous MessageNext Message »
From:sasha Date:August 28 2001 12:01am
Subject:bk commit into 4.0 tree
View as plain text  
Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated to 
the main repository and within 24 hours after the push to the public repository. 
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-08-27 18:01:06-06:00, sasha@stripped
  fixed compile error

  vio/test-ssl
    1.1 01/08/27 18:01:05 sasha@stripped +937 -0

  sql/mysqld.cc
    1.206 01/08/27 18:01:05 sasha@stripped +2 -0
    fixed compile error

  vio/test-ssl
    1.0 01/08/27 18:01:05 sasha@stripped +0 -0
    BitKeeper file /home/sasha/src/bk/mysql-4.0/vio/test-ssl

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql-4.0

--- 1.205/sql/mysqld.cc	Sun Aug 26 13:34:52 2001
+++ 1.206/sql/mysqld.cc	Mon Aug 27 18:01:05 2001
@@ -2605,9 +2605,11 @@
   {"master-port",           required_argument, 0, (int) OPT_MASTER_PORT},
   {"master-connect-retry",  required_argument, 0, (int) OPT_MASTER_CONNECT_RETRY},
   {"master-info-file",      required_argument, 0, (int) OPT_MASTER_INFO_FILE},
+#ifdef HAVE_SSL  
   {"master-ssl",      	    optional_argument, 0, (int) OPT_MASTER_SSL},
   {"master-ssl-key",        optional_argument, 0, (int) OPT_MASTER_SSL_KEY},
   {"master-ssl-cert",       optional_argument, 0, (int) OPT_MASTER_SSL_CERT},
+#endif  
   {"myisam-recover",	    optional_argument, 0, (int) OPT_MYISAM_RECOVER},
   {"memlock",		    no_argument,       0, (int) OPT_MEMLOCK},
     // needs to be available for the test case to pass in non-debugging mode
--- New file ---
+++ vio/test-ssl	01/08/27 18:01:05
ELF















p
7)=(4,4)
hread_spinlock_t:t(9,22)=(0,1)
34),32,32;__flags:(0,1),64,32;__invocation_counter:(0,1),96,32;__internal_use:(0,1),128,32;__statep:(17,35)=*(13,1),160,32;__state:(13,1),192,64;__trans:(17,28),256,32;;
=(0,3)
32;tm_yday:(0,1),224,32;tm_isdst:(0,1),256,32;tm_gmtoff:(0,3),288,32;tm_zone:(14,6)=*(0,2),320,32;;
_IS_LAST:1,__GCONV_IGNORE_ERRORS:2,;
O_read_base:(8,35),96,32;_IO_write_base:(8,35),128,32;_IO_write_ptr:(8,35),160,32;_IO_write_end:(8,35),192,32;_IO_buf_base:(8,35),224,32;_IO_buf_end:(8,35),256,32;_IO_save_base:(8,35),288,32;_IO_backup_base:(8,35),320,32;_IO_save_end:(8,35),352,32;_markers:(24,3),384,32;_chain:(24,4),416,32;_fileno:(0,1),448,32;_blksize:(0,1),480,32;_old_offset:(8,23),512,32;_cur_column:(0,9),544,16;_vtable_offset:(0,10),560,8;_shortbuf:(24,6)=ar(0,1);0;0;(0,2),568,8;_lock:(24,7)=*(24,1),576,32;_offset:(8,53),608,64;__pad1:(10,6),672,32;__pad2:(10,6),704,32;_mode:(0,1),736,32;_unused2:(24,8)=ar(0,1);0;51;(0,2),768,416;;
416,32;__ctype_tolower:(43,6)=*(0,1),448,32;__ctype_toupper:(43,6),480,32;;
_NAN:0,FP_INFINITE:1,FP_ZERO:2,FP_SUBNORMAL:3,FP_NORMAL:4,;
)=s12time:(14,2),0,32;millitm:(0,9),32,16;timezone:(0,8),48,16;dstflag:(0,8),64,16;;
_IOV_MAX:60,_SC_PII_INTERNET_STREAM:61,_SC_PII_INTERNET_DGRAM:62,_SC_PII_OSI_COTS:63,_SC_PII_OSI_CLTS:64,_SC_PII_OSI_M:65,_SC_T_IOV_MAX:66,_SC_THREADS:67,_SC_THREAD_SAFE_FUNCTIONS:68,_SC_GETGR_R_SIZE_MAX:69,_SC_GETPW_R_SIZE_MAX:70,_SC_LOGIN_NAME_MAX:71,_SC_TTY_NAME_MAX:72,_SC_THREAD_DESTRUCTOR_ITERATIONS:73,_SC_THREAD_KEYS_MAX:74,_SC_THREAD_STACK_MIN:75,_SC_THREAD_THREADS_MAX:76,_SC_THREAD_ATTR_STACKADDR:77,_SC_THREAD_ATTR_STACKSIZE:78,_SC_THREAD_PRIORITY_SCHEDULING:79,_SC_THREAD_PRIO_INHERIT:80,_SC_THREAD_PRIO_PROTECT:81,_SC_THREAD_PROCESS_SHARED:82,_SC_NPROCESSORS_CONF:83,_SC_NPROCESSORS_ONLN:84,_SC_PHYS_PAGES:85,_SC_AVPHYS_PAGES:86,_SC_ATEXIT_MAX:87,_SC_PASS_MAX:88,_SC_XOPEN_VERSION:89,_SC_XOPEN_XCU_VERSION:90,_SC_XOPEN_UNIX:91,_SC_XOPEN_CRYPT:92,_SC_XOPEN_ENH_I18N:93,_SC_XOPEN_SHM:94,_SC_2_CHAR_TERM:95,_SC_2_C_VERSION:96,_SC_2_UPE:97,_SC_XOPEN_XPG2:98,_SC_XOPEN_XPG3:99,_SC_XOPEN_XPG4:100,_SC_CHAR_BIT:101,_SC_CHAR_MAX:102,_SC_CHAR_MIN:103,_SC_INT_MAX:104,_SC_INT_MIN:105,_!
 SC_LONG_BIT:106,_SC_WORD_BIT:107,_SC_MB_LEN_MAX:108,_SC_NZERO:109,_SC_SSIZE_MAX:110,_SC_SCHAR_MAX:111,_SC_SCHAR_MIN:112,_SC_SHRT_MAX:113,_SC_SHRT_MIN:114,_SC_UCHAR_MAX:115,_SC_UINT_MAX:116,_SC_ULONG_MAX:117,_SC_USHRT_MAX:118,_SC_NL_ARGMAX:119,_SC_NL_LANGMAX:120,_SC_NL_MSGMAX:121,_SC_NL_NMAX:122,_SC_NL_SETMAX:123,_SC_NL_TEXTMAX:124,_SC_XBS5_ILP32_OFF32:125,_SC_XBS5_ILP32_OFFBIG:126,_SC_XBS5_LP64_OFF64:127,_SC_XBS5_LPBIG_OFFBIG:128,_SC_XOPEN_LEGACY:129,_SC_XOPEN_REALTIME:130,_SC_XOPEN_REALTIME_THREADS:131,_SC_ADVISORY_INFO:132,_SC_BARRIERS:133,_SC_BASE:134,_SC_C_LANG_SUPPORT:135,_SC_C_LANG_SUPPORT_R:136,_SC_CLOCK_SELECTION:137,_SC_CPUTIME:138,_SC_THREAD_CPUTIME:139,_SC_DEVICE_IO:140,_SC_DEVICE_SPECIFIC:141,_SC_DEVICE_SPECIFIC_R:142,_SC_FD_MGMT:143,_SC_FIFO:144,_SC_PIPE:145,_SC_FILE_ATTRIBUTES:146,_SC_FILE_LOCKING:147,_SC_FILE_SYSTEM:148,_SC_MONOTONIC_CLOCK:149,_SC_MULTIPLE_PROCESS:150,_SC_SINGLE_PROCESS:151,_SC_NETWORKING:152,_SC_READER_WRITER_LOCKS:153,_SC_SPIN_LOCKS:154,_SC!
 _REGEXP:155,_SC_REGEX_VERSION:156,_SC_SHELL:157,_SC_SIGNALS:158,_SC_SP
AWN:159,_SC_SPORADIC_SERVER:160,_SC_THREAD_SPORADIC_SERVER:161,_SC_SYSTEM_DATABASE:162,_SC_SYSTEM_DATABASE_R:163,_SC_TIMEOUTS:164,_SC_TYPED_MEMORY_OBJECTS:165,_SC_USER_GROUPS:166,_SC_USER_GROUPS_R:167,_SC_2_PBS:168,_SC_2_PBS_ACCOUNTING:169,_SC_2_PBS_LOCATE:170,_SC_2_PBS_MESSAGE:171,_SC_2_PBS_TRACK:172,_SC_SYMLOOP:173,_SC_STREAMS:174,_SC_2_PBS_CHECKPOINT:175,;
ar(0,1);0;119;(0,2),64,960;;
r_ipx__:(90,41)=*(90,22),0,32;__sockaddr_iso__:(90,42)=*(90,24),0,32;__sockaddr_ns__:(90,43)=*(90,26),0,32;__sockaddr_un__:(90,44)=*(90,28),0,32;__sockaddr_x25__:(90,45)=*(90,30),0,32;;
|


Thread
bk commit into 4.0 treesasha28 Aug