mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-11 17:48:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysys
History
unknown 555eb848f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
include/heap.h:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
unittest/mysys/base64-t.c:
  Auto merged
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/t/innodb_mysql.test:
  manual merge
mysql-test/valgrind.supp:
  manual merge
sql/event.cc:
  manual merge
sql/ha_heap.cc:
  manual merge
sql/ha_myisam.cc:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/ha_ndbcluster_binlog.cc:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/handler.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/handler.h:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/item.h:
  automatic merge
sql/item_cmpfunc.cc:
  automatic merge
sql/log_event.cc:
  manual merge
  Trivial cleanup
sql/mysql_priv.h:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/opt_range.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_delete.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_insert.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_load.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_select.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_show.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_table.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_update.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/table.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
storage/blackhole/ha_blackhole.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
storage/csv/ha_tina.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
mysql-test/valgrind.supp.orig:
  Manual merge
2006-06-04 21:05:22 +03:00
..
.cvsignore
array.c
base64.c This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
ChangeLog
charset-def.c sql_show.cc: 2006-01-18 12:27:02 +04:00
charset.c
checksum.c
CMakeLists.txt performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1. 2006-05-11 11:29:08 -05: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
errors.c
hash.c Merge mysql.com:/opt/local/work/mysql-5.0-merge 2006-01-05 00:38:51 +03:00
list.c
make-ccc
make-conf.c
Makefile.am unittest: 2006-06-01 12:25:47 +02:00
md5.c
mf_brkhant.c
mf_cache.c
mf_dirname.c
mf_fn_ext.c
mf_format.c
mf_getdate.c
mf_iocache.c
mf_iocache2.c
mf_keycache.c Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-05-08 15:15:05 -05: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
mf_tempfile.c
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
my_append.c
my_atomic.c
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
my_chsize.c
my_clock.c
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 removing MSDOS defines and code 2006-05-08 14:50:13 -05: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
my_delete.c
my_div.c
my_dup.c removing MSDOS defines and code 2006-05-08 14:50:13 -05:00
my_error.c
my_file.c
my_fopen.c Cleanup during review of new code 2005-06-21 18:18:58 +03:00
my_fstream.c Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
my_gethostbyname.c removing MSDOS defines and code 2006-05-08 14:50:13 -05:00
my_gethwaddr.c
my_getncpus.c
my_getopt.c
my_getsystime.c
my_getwd.c
my_handler.c
my_init.c Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 2006-05-18 17:24:29 +02:00
my_largepage.c
my_lib.c
my_lock.c
my_lockmem.c
my_lread.c
my_lwrite.c Changed %lx -> 0x%lx (for easier comparison of debug files) 2004-08-23 13:46:51 +03:00
my_malloc.c Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup(). 2006-01-25 19:54:42 -08:00
my_memmem.c
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
my_netware.c
my_new.cc
my_once.c cleanup 2006-01-04 10:36:49 +01:00
my_open.c
my_port.c
my_pread.c
my_pthread.c UNIXWARE removal 2006-04-17 15:56:59 -07:00
my_quick.c
my_read.c
my_realloc.c
my_redel.c removing MSDOS defines and code 2006-05-08 14:50:13 -05:00
my_rename.c A fix for Netware. 2005-04-05 13:15:04 +03:00
my_seek.c
my_semaphore.c
my_sleep.c
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
my_symlink2.c
my_sync.c Fixed errors found during review 2005-04-06 19:43:35 +03:00
my_thr_init.c
my_vle.c
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
my_write.c
mysys_priv.h
ptr_cmp.c
queues.c
rijndael.c
safemalloc.c Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup(). 2006-01-25 19:54:42 -08:00
sha1.c
string.c fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
test_charset.c
test_dir.c
test_fn.c
test_xml.c
testhash.c
thr_alarm.c
thr_lock.c This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03: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
trie.c WL#2466 - Fulltext: "always-index" words 2005-06-07 21:17:09 +05:00
typelib.c Changed %lx -> 0x%lx (for easier comparison of debug files) 2004-08-23 13:46:51 +03:00