mariadb/mysys
unknown 75ed6f1a3b Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/log_tables.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
netware/BUILD/mwenv:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
include/my_time.h:
  manual merge.
mysql-test/mysql-test-run.pl:
  manual merge.
mysql-test/r/ps.result:
  manual merge.
mysql-test/t/disabled.def:
  manual merge.
mysql-test/t/ps.test:
  manual merge.
2006-11-02 17:51:59 -05:00
..
.cvsignore
array.c WL1034 update for latest 5.1 sources 2005-12-02 13:07:02 +01:00
base64.c Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2006-10-06 15:31:05 +02:00
ChangeLog
charset-def.c sql_show.cc: 2006-01-18 12:27:02 +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
CMakeLists.txt Remove unused (and incorrect) my_lread() and my_lwrite() 2006-09-14 23:29:44 -06:00
default.c Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2006-05-30 16:07:49 +03:00
default_modify.c This is an implementation of two WL items: 2006-05-18 18:57:50 +04:00
errors.c After merge fixes 2006-05-04 06:28:24 +03:00
hash.c Merge mysql.com:/opt/local/work/mysql-5.0-merge 2006-01-05 00:38:51 +03:00
list.c Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-15 12:37:45 -07:00
make-ccc Remove unused (and incorrect) my_lread() and my_lwrite() 2006-09-14 23:29:44 -06:00
make-conf.c
Makefile.am Remove unused (and incorrect) my_lread() and my_lwrite() 2006-09-14 23:29:44 -06:00
md5.c
mf_brkhant.c
mf_cache.c
mf_dirname.c Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622 2006-06-23 14:59:40 +02:00
mf_fn_ext.c Fixed Bug#19479:mysqldump creates invalid dump. 2006-06-01 12:34:44 +03:00
mf_format.c WL#1324 table name to file name encoding 2005-12-31 09:01:26 +04:00
mf_getdate.c Fix build using --without-server. (Bug #11680) 2005-08-23 11:25:24 -07:00
mf_iocache.c Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint 2006-11-01 17:01:51 +01:00
mf_iocache2.c Fix to make it build on all platforms. 2006-10-10 12:29:24 +02:00
mf_keycache.c unsigned char -> uchar 2006-06-19 12:45:34 +03:00
mf_keycaches.c remove the entry from the list, before freeing 2005-01-24 18:38:46 +01:00
mf_loadpath.c
mf_pack.c Table definition cache, part 2 2005-11-23 22:45:02 +02:00
mf_path.c removing MSDOS defines and code 2006-05-08 14:50:13 -05:00
mf_qsort.c
mf_qsort2.c
mf_radix.c
mf_same.c
mf_sort.c
mf_soundex.c
mf_strip.c
mf_tempdir.c Another long patch to remove the rest of the OS2 support. 2006-04-15 08:49:00 -07:00
mf_tempfile.c removing MSDOS defines and code 2006-05-08 14:50:13 -05:00
mf_unixpath.c
mf_util.c
mf_wcomp.c
mf_wfile.c
mulalloc.c
my_access.c Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-05-08 15:15:05 -05:00
my_aes.c
my_alarm.c
my_alloc.c Table definition cache, part 2 2005-11-23 22:45:02 +02:00
my_append.c Remove unused defined USES_TYPES 2006-04-11 20:12:57 +02:00
my_atomic.c support for xadd emulation, workaround for Darwin 2006-06-29 15:39:53 +02:00
my_bit.c Added support for key_block_size for key and table level (WL#602) 2006-05-03 15:59:17 +03:00
my_bitmap.c Fix after manual merge. 2006-07-29 13:50:08 +04: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 Merge bk-internal:/home/bk/mysql-5.1 2006-06-10 20:33:50 +02:00
my_compress.c C++ comments in C files are not portable. 2006-01-17 21:38:19 +01:00
my_conio.c Small update for lock functions used in my_cgets() 2005-09-20 20:03:51 +04:00
my_copy.c Merge bk-internal:/home/bk/mysql-5.1 2006-06-10 20:33:50 +02:00
my_crc32.c
my_create.c Merge bk-internal:/home/bk/mysql-5.1 2006-06-10 20:33:50 +02: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
my_dup.c Merge bk-internal:/home/bk/mysql-5.1 2006-06-10 20:33:50 +02:00
my_error.c unsigned char -> uchar 2006-06-19 12:45:34 +03:00
my_file.c After merge fixes 2006-05-04 06:28:24 +03:00
my_fopen.c Cleanup during review of new code 2005-06-21 18:18:58 +03:00
my_fstream.c
my_gethostbyname.c removing MSDOS defines and code 2006-05-08 14:50:13 -05:00
my_gethwaddr.c
my_getncpus.c WL#2595 - atomic operations 2006-05-31 18:44:09 +02:00
my_getopt.c Removed wrong ascii codes from source code. 2006-05-23 18:27:54 +03:00
my_getsystime.c
my_getwd.c removing MSDOS defines and code 2006-05-08 14:50:13 -05:00
my_handler.c Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-13 22:09:36 +04:00
my_init.c Merge mysql.com:/home/hf/work/mysql-5.0.19672 2006-06-27 15:22:43 +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 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1 2006-07-05 16:16:09 -04: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 11:55:41 +01:00
my_lockmem.c
my_malloc.c Fixing the prototype for my_strndup() to compile on Windows. 2006-07-07 22:38:57 +02:00
my_memmem.c unsigned char -> uchar 2006-06-19 12:45:34 +03:00
my_messnc.c
my_mkdir.c Another long patch to remove the rest of the OS2 support. 2006-04-15 08:49:00 -07:00
my_mmap.c Bug#17368 General log and slow query log don't work 2006-04-04 09:59:19 +02:00
my_net.c removing MSDOS defines and code 2006-05-08 14:50:13 -05:00
my_netware.c
my_new.cc yassl changeset 2: 2005-04-30 19:48:45 +02:00
my_once.c cleanup 2006-01-04 10:36:49 +01:00
my_open.c Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 2006-08-10 16:11:55 +04:00
my_port.c
my_pread.c Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/50 2006-09-14 23:23:48 -06:00
my_pthread.c UNIXWARE removal 2006-04-17 15:56:59 -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 Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/41 2006-10-16 20:01:30 -06:00
my_realloc.c Building with compile-pentium-valgrind-max (without safemalloc) defines my_free() without flags, 2005-10-13 00:24:14 +02:00
my_redel.c Merge bk-internal:/home/bk/mysql-5.1 2006-06-10 20:33:50 +02:00
my_rename.c Remove unused defined USES_TYPES 2006-04-11 20:12:57 +02:00
my_seek.c Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint 2006-11-02 08:47:21 +01:00
my_semaphore.c
my_sleep.c Another long patch to remove the rest of the OS2 support. 2006-04-15 08:49:00 -07:00
my_static.c Another long patch to remove the rest of the OS2 support. 2006-04-15 08:49:00 -07:00
my_static.h
my_symlink.c Fixed new bug that caused symlink test to fail 2005-01-18 03:49:39 +02:00
my_symlink2.c After merge fixes 2006-02-26 15:11:56 +02:00
my_sync.c Fixed errors found during review 2005-04-06 19:43:35 +03:00
my_thr_init.c This completes the work done in 5.0 to remove mit_pthread support (most was pulled in 5.0, but there were some pieces left in the tree) 2006-04-16 01:50:25 -07:00
my_vle.c WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
my_wincond.c
my_windac.c A fix for Bug#8226 "Cannot connect via shared memory": 2005-03-26 01:21:52 +03:00
my_winsem.c
my_winthread.c pthread_handler_decl() changed to be ctags-friendly 2005-10-08 16:39:55 +02:00
my_write.c Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/40 2006-09-14 23:20:13 -06:00
mysys_priv.h
ptr_cmp.c s/ha_store_ptr/my_store_ptr/ 2004-11-07 22:39:27 +01:00
queues.c Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines 2006-09-29 00:23:43 +05:00
rijndael.c
safemalloc.c Correcting signature for my_strndup to be able to build on Windows 2006-07-07 15:59:17 +02:00
sha1.c A fix for Bug#13944 "libmysqlclient exporting sha1_result function": 2006-01-11 17:31:52 +03:00
string.c fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
test_charset.c
test_dir.c Remove unused defined USES_TYPES 2006-04-11 20:12:57 +02:00
test_fn.c
test_xml.c
testhash.c dbug changes: 2006-02-14 22:36:11 +01:00
thr_alarm.c thr_alarm.c, thr_lock.c, my_global.h: 2006-10-12 19:43:47 +02:00
thr_lock.c thr_alarm.c, thr_lock.c, my_global.h: 2006-10-12 19:43:47 +02:00
thr_mutex.c Merge neptunus.(none):/home/msvensson/mysql/bug16333/my50-bug16333 2006-02-16 10:08:02 +01:00
thr_rwlock.c
tree.c BUG#18160 - Memory-/HEAP Table endless growing indexes 2006-04-19 15:13:50 +05:00
trie.c WL#2466 - Fulltext: "always-index" words 2005-06-07 21:17:09 +05:00
typelib.c