database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00
Code Activity
Files
cd53e516362cd6aa94e5a1051a49a739f883b64b
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
WL1034 update for latest 5.1 sources
2005-12-02 13:07:02 +01:00
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
Merge mysql.com:/usr/home/bar/mysql-4.1
2005-10-20 11:12:34 +05:00
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_modify.c
This is an implementation of two WL items:
2006-05-18 18:57:50 +04: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
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
…
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
Merge mysql.com:/home/my/mysql-5.0
2006-02-25 21:54:34 +02:00
mf_fn_ext.c
…
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_iocache2.c
SECURITY FIX
2006-05-01 22:10:50 -04:00
mf_iocache.c
Merge mysql.com:/home/mydev/mysql-4.1-bug11527
2006-02-16 19:51:09 +01:00
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_qsort2.c
…
mf_qsort.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
…
my_atomic.c
WL#2595 - atomic operations
2006-05-31 18:44:09 +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
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
my_chsize.c
post-review fixes
2005-05-16 01:54:02 +04:00
my_clock.c
removing MSDOS defines and code
2006-05-08 14:50:13 -05: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
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
removing MSDOS defines and code
2006-05-08 14:50:13 -05:00
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
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01: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
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
Review of all code pushed since last review
2004-10-20 01:28:42 +03:00
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 4.1 - 5.0
2005-10-28 02:36:19 +03:00
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
Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0
2004-12-14 22:26:31 +03:00
my_lib.c
removing MSDOS defines and code
2006-05-08 14:50:13 -05:00
my_lock.c
Another long patch to remove the rest of the OS2 support.
2006-04-15 08:49:00 -07:00
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
Fix a bunch of non-Linux compile failures.
2006-05-02 09:19:54 +02: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 rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-05-08 15:15:05 -05:00
my_port.c
…
my_pread.c
Merge with 4.0 for 4.1 release
2004-10-06 19:14:33 +03:00
my_pthread.c
UNIXWARE removal
2006-04-17 15:56:59 -07:00
my_quick.c
…
my_read.c
Changed %lx -> 0x%lx (for easier comparison of debug files)
2004-08-23 13:46:51 +03: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
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
Bug #17722 Test 'partition_02myisam' hangs on Windows
2006-03-15 10:25:42 +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_symlink2.c
After merge fixes
2006-02-26 15:11:56 +02:00
my_symlink.c
Fixed new bug that caused symlink test to fail
2005-01-18 03:49:39 +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 mysql.com:/home/mysql_src/mysql-4.0
2005-01-06 21:31:47 +01: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
WL#1034 update
2005-12-12 21:19:19 +01:00
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
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
…
test_fn.c
…
test_xml.c
…
testhash.c
dbug changes:
2006-02-14 22:36:11 +01:00
thr_alarm.c
Another long patch to remove the rest of the OS2 support.
2006-04-15 08:49:00 -07:00
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
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
Changed %lx -> 0x%lx (for easier comparison of debug files)
2004-08-23 13:46:51 +03:00