mariadb/mysys
unknown 2bcbffa0c5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0


client/mysql.cc:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/yassl/include/yassl_imp.hpp:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
extra/yassl/taocrypt/include/des.hpp:
  Auto merged
extra/yassl/taocrypt/include/modes.hpp:
  Auto merged
extra/yassl/taocrypt/src/aes.cpp:
  Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
  Auto merged
extra/yassl/taocrypt/test/test.cpp:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
ndb/src/common/util/File.cpp:
  Auto merged
ndb/src/common/util/socket_io.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
strings/strtod.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
extra/yassl/taocrypt/include/rsa.hpp:
  manual merge
mysql-test/t/mysql.test:
  manual merge
sql/sql_parse.cc:
  manual merge
2006-12-15 01:01:52 +02:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
array.c Rewrite function comments 2002-07-09 18:59:52 +03:00
base64.c Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
ChangeLog Fix skipp -> skip once and for all. 2004-06-03 11:52:54 -05:00
charset-def.c ctype_uca.result, ctype_uca.test: 2005-12-23 14:20:00 +04:00
charset.c Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/41 2006-09-14 23:22:25 -06:00
checksum.c Remove 'extern' references from .cc files 2003-09-13 11:35:29 +03:00
CMakeLists.txt Rework my_getpagesize function 2006-11-23 17:23:29 +01:00
default.c Fixed compiler warnings detected by option -Wshadow and -Wunused: 2006-12-15 00:51:37 +02:00
default_modify.c many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
errors.c fix compilation failure on sunfire280 2005-03-01 01:38:04 +03:00
hash.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
list.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
make-ccc Import changeset 2000-07-31 21:29:14 +02:00
make-conf.c Update copyright 2001-12-06 14:10:51 +02:00
Makefile.am Rework my_getpagesize function 2006-11-23 17:23:29 +01:00
md5.c Update copyright 2001-12-06 14:10:51 +02:00
mf_brkhant.c Update copyright 2001-12-06 14:10:51 +02:00
mf_cache.c Update copyright 2001-12-06 14:10:51 +02:00
mf_dirname.c BUG#20622: Fix one-byte buffer overrun in IM directory string handling. 2006-06-23 14:50:02 +02:00
mf_fn_ext.c Fixed Bug#19479:mysqldump creates invalid dump. 2006-06-01 12:34:44 +03:00
mf_format.c Review of code pushed since last 5.0 pull: 2005-10-06 17:54:43 +03:00
mf_getdate.c Fix build using --without-server. (Bug #11680) 2005-08-23 11:25:24 -07:00
mf_iocache.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
mf_iocache2.c Fixed compiler warnings detected by option -Wshadow and -Wunused: 2006-12-15 00:51:37 +02:00
mf_keycache.c Fixed compiler warnings detected by option -Wshadow and -Wunused: 2006-12-15 00:51:37 +02:00
mf_keycaches.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
mf_loadpath.c Fixed testcases and bug introduced by last changeset 2003-07-01 17:59:42 +03:00
mf_pack.c Bug#5439 : mysql_server_init() crashes if ShiftJIS path is passed 2005-08-08 19:52:30 +05:00
mf_path.c Changes from Novell for NetWare platform 2003-04-24 20:48:54 -04:00
mf_qsort.c mf_qsort.c: 2002-02-23 15:22:19 +00:00
mf_qsort2.c Update copyright 2001-12-06 14:10:51 +02:00
mf_radix.c Update copyright 2001-12-06 14:10:51 +02:00
mf_same.c Update copyright 2001-12-06 14:10:51 +02:00
mf_sort.c Update copyright 2001-12-06 14:10:51 +02:00
mf_soundex.c Fix skipp -> skip once and for all. 2004-06-03 11:52:54 -05:00
mf_strip.c merge with 3.23.51 2002-05-27 23:52:21 +03:00
mf_tempdir.c in netware ':' is also a valid path character 2004-02-24 23:15:38 +01:00
mf_tempfile.c merge 2005-03-03 23:07:20 +01:00
mf_unixpath.c Update copyright 2001-12-06 14:10:51 +02:00
mf_util.c Update copyright 2001-12-06 14:10:51 +02:00
mf_wcomp.c backport wild_compare fix from 4.1 - bug#3924 2004-05-29 17:52:20 +02:00
mf_wfile.c Fix skipp -> skip once and for all. 2004-06-03 11:52:54 -05:00
mulalloc.c Two-level index structure for FULLTEXT indexes 2003-01-21 19:24:34 +01:00
my_access.c Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-31 19:12:16 -07:00
my_aes.c Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. 2002-11-07 03:54:00 +02:00
my_alarm.c Update copyright 2001-12-06 14:10:51 +02:00
my_alloc.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_append.c Added missing SSL library (Should be in source distribution) 2003-11-28 12:18:13 +02:00
my_bit.c This is first cset for WL#1394 "Optimize index merge when all involved index ranges include only values with equal keys" 2004-05-13 01:38:40 +04:00
my_bitmap.c Fixed compiler warnings detected by option -Wshadow and -Wunused: 2006-12-15 00:51:37 +02:00
my_chsize.c Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint 2006-11-01 17:01:51 +01:00
my_clock.c Fixes for Netware 2003-01-28 08:38:28 +02:00
my_compress.c Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
my_conio.c Small update for lock functions used in my_cgets() 2005-09-20 20:03:51 +04:00
my_copy.c Avoiding conditional jump on uninitialized variable (BUG#14904). 2005-12-27 02:01:58 +02:00
my_crc32.c First step of implementation of WL#1518 "make bundled zlib 2004-07-21 17:36:26 -07:00
my_create.c Fixes bug #13377. my_open() & my_create() functions changed to use 2005-11-14 16:01:10 +03:00
my_delete.c Fixing BUG#17719 "Delete of binlog files fails on Windows" 2006-06-28 10:21:01 +04:00
my_div.c Max open files handling moved to my_set_max_open_files() 2004-02-19 19:33:09 +02:00
my_dup.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_error.c many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
my_file.c Max open files handling moved to my_set_max_open_files() 2004-02-19 19:33:09 +02:00
my_fopen.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_fstream.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_gethostbyname.c assert.h needed for my_dbug.h now is included in my_dbug.h, where it for 2004-06-10 23:58:39 +04:00
my_gethwaddr.c Review of all code pushed since last review 2004-10-20 01:28:42 +03:00
my_getopt.c Flush stderr after print of error message to get predictable output 2006-12-06 22:03:56 +01:00
my_getpagesize.c Rework my_getpagesize function 2006-11-23 17:23:29 +01:00
my_getsystime.c Fixes for prior commit 2004-05-05 10:54:11 -03:00
my_getwd.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_handler.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_init.c Bug #18275 invalid file descriptor causes crash on windows 2006-06-05 13:37:06 -05:00
my_largepage.c Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0 2004-12-14 22:26:31 +03:00
my_lib.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_libwrap.c Bug #18246: compilation error with tcp_wrapper 2006-09-11 16:23:45 -07:00
my_lock.c Bug#22828 complementary patch: 2006-11-02 13:33:26 +01:00
my_lockmem.c Update copyright 2001-12-06 14:10:51 +02:00
my_lread.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_lwrite.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_malloc.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_memmem.c Fix a bunch of non-Linux compile failures. 2006-05-02 09:19:54 +02:00
my_messnc.c Fixes for Netware 2003-01-28 08:38:28 +02:00
my_mkdir.c Update copyright 2001-12-06 14:10:51 +02:00
my_mmap.c Rework my_getpagesize function 2006-11-23 17:23:29 +01:00
my_net.c merge with 3.23.52 2002-08-12 04:04:43 +03:00
my_netware.c Added patches from Novell 2004-05-25 22:00:14 +03:00
my_new.cc yassl changeset 2: 2005-04-30 19:48:45 +02:00
my_once.c fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
my_open.c Bug #21396: Wrong error number generated for a missing table 2006-08-02 10:00:28 +02:00
my_os2cond.c Reviewing new pushed code 2005-10-12 00:58:22 +03:00
my_os2dirsrch.c Fixes for Netware 2003-01-28 08:38:28 +02:00
my_os2dirsrch.h Fixes for Netware 2003-01-28 08:38:28 +02:00
my_os2dlfcn.c Fixed problem with BIGINT and shutdown on AIX 2002-08-12 03:28:02 +03:00
my_os2dlfcn.h0 Fixes for OS2. 2001-08-22 01:45:07 +03:00
my_os2file64.c Fixes for Netware 2003-01-28 08:38:28 +02:00
my_os2mutex.c Fixes for Netware 2003-01-28 08:38:28 +02:00
my_os2thread.c pthread_handler_decl() changed to be ctags-friendly 2005-10-08 16:39:55 +02:00
my_os2tls.c Fixes for Netware 2003-01-28 08:38:28 +02:00
my_port.c Fixed typo so that ulonglong are properly converted to double on AIX with gcc 3.1 2002-08-16 12:50:21 +03:00
my_pread.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_pthread.c Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how 2005-10-11 09:12:12 -07:00
my_quick.c Bug #4053: too many of "error 1236: 'binlog truncated in the middle of event' from master" 2006-09-14 23:19:24 -06:00
my_read.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_realloc.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_redel.c Added missing SSL library (Should be in source distribution) 2003-11-28 12:18:13 +02:00
my_rename.c A fix for Netware. 2005-04-05 13:15:04 +03:00
my_seek.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
my_semaphore.c more #ifdef THREAD added 2003-04-30 12:32:43 +02:00
my_sleep.c my_sleep.c: 2005-01-05 16:35:43 +01:00
my_static.c Fixes during review of new pushed code 2005-07-31 12:49:55 +03:00
my_static.h Changed prototype of killed_ptr() to make it more portable 2004-05-26 19:12:49 +03:00
my_symlink.c Fixed new bug that caused symlink test to fail 2005-01-18 03:49:39 +02:00
my_symlink2.c myisam/ft_parser.c 2005-03-06 12:31:40 +01:00
my_sync.c Fixed errors found during review 2005-04-06 19:43:35 +03:00
my_thr_init.c Fixed compiler warnings 2006-11-30 21:56:03 +02:00
my_wincond.c Update copyright 2001-12-06 14:10:51 +02:00
my_windac.c A fix for Bug#8226 "Cannot connect via shared memory": 2005-03-26 01:21:52 +03:00
my_winsem.c Added support for semaphores in mysys. 2002-06-29 00:16:15 +03:00
my_winthread.c pthread_handler_decl() changed to be ctags-friendly 2005-10-08 16:39:55 +02:00
my_write.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
mysys_priv.h Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
ptr_cmp.c s/ha_store_ptr/my_store_ptr/ 2004-11-07 22:39:27 +01:00
queues.c BUG#21617 - crash when selecting from merge table with inconsistent indexes 2006-09-28 22:10:06 +05:00
raid.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
raid2.c Split raid C function to separate file to make things more portable. 2002-05-27 10:02:00 +03:00
rijndael.c assert.h needed for my_dbug.h now is included in my_dbug.h, where it for 2004-06-10 23:58:39 +04:00
safemalloc.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
sha1.c Fixed compiler warnings detected by option -Wshadow and -Wunused: 2006-12-15 00:51:37 +02:00
string.c fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
test_charset.c Removed some warnings reported by valgrind 2003-11-04 14:09:03 +02:00
test_dir.c Update copyright 2001-12-06 14:10:51 +02:00
test_fn.c Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882) 2004-03-10 13:46:11 +02:00
test_xml.c license has been added 2002-12-31 13:06:30 +04:00
testhash.c A fix for Bug#7209 "Client error with "Access Denied" on updates 2006-01-04 17:35:30 +03:00
thr_alarm.c locking issues, 2005-12-23 20:50:28 +01:00
thr_lock.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
thr_mutex.c Bug#16333 Assertion failure in lock.cc in the sysbench test 2006-02-14 11:34:46 +01:00
thr_rwlock.c merge with 3.23.52 2002-08-12 04:04:43 +03:00
tree.c Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
typelib.c Remove compiler warnings 2006-11-20 22:42:06 +02:00