mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysys
History
unknown d297a221fe Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/ndb/ndbcluster.sh:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ft_update.c:
  Auto merged
storage/ndb/include/logger/LogHandler.hpp:
  Auto merged
storage/ndb/include/logger/Logger.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/Logger.cpp:
  Auto merged
storage/ndb/src/common/logger/SysLogHandler.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
zlib/Makefile.am:
  Auto merged
mysql-test/r/information_schema.result:
  SCCS merged
mysql-test/t/information_schema.test:
  Manual merge.
sql/ha_archive.cc:
  Manual merge.
sql/share/errmsg.txt:
  SCCS merged
tests/mysql_client_test.c:
  Manual merge.
2006-02-02 23:27:06 +03:00
..
.cvsignore
array.c WL1034 update for latest 5.1 sources 2005-12-02 13:07:02 +01:00
base64.c WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01: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
default.c Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 2005-09-30 12:25:39 +02:00
default_modify.c many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
errors.c
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 WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
md5.c
mf_brkhant.c
mf_cache.c
mf_dirname.c Table definition cache, part 2 2005-11-23 22:45:02 +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_iocache.c Several fixes revelaled by Intel compiler. 2005-09-23 16:47:08 +03:00
mf_iocache2.c many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
mf_keycache.c Reviewing new pushed code 2005-10-12 00:58:22 +03:00
mf_keycaches.c
mf_loadpath.c
mf_pack.c Table definition cache, part 2 2005-11-23 22:45:02 +02:00
mf_path.c
mf_qsort.c
mf_qsort2.c
mf_radix.c
mf_same.c
mf_sort.c
mf_soundex.c
mf_strip.c
mf_tempdir.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
mf_tempfile.c
mf_unixpath.c
mf_util.c
mf_wcomp.c
mf_wfile.c
mulalloc.c
my_access.c Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-31 19:12:16 -07: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_bit.c
my_bitmap.c Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
my_chsize.c post-review fixes 2005-05-16 01:54:02 +04:00
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 Avoiding conditional jump on uninitialized variable (BUG#14904). 2005-12-27 02:01:58 +02:00
my_crc32.c
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
my_div.c
my_dup.c
my_error.c many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
my_file.c
my_fopen.c Cleanup during review of new code 2005-06-21 18:18:58 +03:00
my_fstream.c
my_gethostbyname.c
my_gethwaddr.c
my_getopt.c Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
my_getsystime.c
my_getwd.c BUG#10687 - Merge engine fails under Windows 2005-05-23 12:31:22 -05:00
my_handler.c Merge 4.1 - 5.0 2005-10-28 02:36:19 +03:00
my_init.c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 2005-09-28 11:34:53 +02:00
my_largepage.c
my_lib.c Fix for bug#15851 Unlistable directories yield no info from information_schema 2006-01-24 15:59:08 +04:00
my_lock.c
my_lockmem.c
my_lread.c
my_lwrite.c
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_messnc.c
my_mkdir.c
my_mmap.c fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
my_net.c
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 Polishing: get rid of C++-style comments. 2005-11-24 18:27:14 +03:00
my_os2cond.c Reviewing new pushed code 2005-10-12 00:58:22 +03:00
my_os2dirsrch.c
my_os2dirsrch.h
my_os2dlfcn.c
my_os2dlfcn.h0
my_os2file64.c
my_os2mutex.c
my_os2thread.c pthread_handler_decl() changed to be ctags-friendly 2005-10-08 16:39:55 +02:00
my_os2tls.c
my_port.c
my_pread.c
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
my_read.c
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
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 Fixes during review of new pushed code 2005-07-31 12:49:55 +03:00
my_static.h
my_symlink.c
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 Fixes while reviewing new code 2005-05-06 11:39:30 +03: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
mysys_priv.h
ptr_cmp.c
queues.c WL#1034 update 2005-12-12 21:19:19 +01:00
raid.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
raid2.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 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 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 WL #2604: Partition Management 2006-01-17 08:40:00 +01:00
thr_mutex.c Fast mutexes implementation 2005-12-20 14:56:45 +01:00
thr_rwlock.c
tree.c Bug#8321 - myisampack bug in compression algorithm 2005-06-24 19:34:55 +02:00
trie.c WL#2466 - Fulltext: "always-index" words 2005-06-07 21:17:09 +05:00
typelib.c