mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysys
History
unknown 5c0dc1ace8 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1


BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
  Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
  Auto merged
BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc:
  Auto merged
BitKeeper/deleted/.del-Makefile~b293ae88e4394490:
  Auto merged
BitKeeper/deleted/.del-Makefile~e0b7d67078f0fae0:
  Auto merged
BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62:
  Auto merged
BitKeeper/etc/config:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-testGrep.cpp~2106eb0a6bf2a1b5:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/innobase/btr/btr0pcur.c:
  Auto merged
storage/innobase/btr/btr0sea.c:
  Auto merged
storage/innobase/include/read0read.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/read/read0read.c:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/row/row0umod.c:
  Auto merged
storage/innobase/row/row0upd.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/myrg_static.c:
  Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  Auto merged
storage/ndb/include/kernel/BlockNumbers.h:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/kernel/kernel_types.h:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/include/portlib/NdbTCP.h:
  Auto merged
storage/ndb/src/common/debugger/BlockNames.cpp:
  Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbTCP.c:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/Makefile.am:
  Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Manual 5.0 - 5.1 merge
configure.in:
  Manual 5.0 - 5.1 merge
sql/mysql_priv.h:
  Manual 5.0 - 5.1 merge
sql/share/errmsg.txt:
  Manual 5.0 - 5.1 merge
sql/sql_base.cc:
  Manual 5.0 - 5.1 merge
sql/sql_prepare.cc:
  Manual 5.0 - 5.1 merge
storage/ndb/src/common/util/version.c:
  Manual 5.0 - 5.1 merge
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
  Manual 5.0 - 5.1 merge
2005-08-25 13:11:38 -04: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
ChangeLog Fix skipp -> skip once and for all. 2004-06-03 11:52:54 -05:00
charset-def.c Added cp932 character set 2005-05-05 11:37:52 -07:00
charset.c Merge xiphis.org:/usr/home/antony/work2/mysql-4.1 2005-08-11 12:18:53 +01:00
checksum.c Remove 'extern' references from .cc files 2003-09-13 11:35:29 +03:00
default.c Ensure we free all items for prepared statements 2005-07-29 05:06:35 +03:00
default_modify.c Cleanups during review 2005-07-18 15:33:18 +03:00
errors.c fix compilation failure on sunfire280 2005-03-01 01:38:04 +03:00
hash.c Fixes during review of new code 2005-07-04 03:42:33 +03:00
list.c Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-15 12:37:45 -07: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 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04: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#5439 : mysql_server_init() crashes if ShiftJIS path is passed 2005-08-08 19:52:30 +05:00
mf_fn_ext.c Fixed searching after ssl directories. 2002-09-05 16:17:08 +03:00
mf_format.c A set of mysql_home_path-related fixes 2004-09-07 11:55:34 +05:00
mf_getdate.c Fix build using --without-server. (Bug #11680) 2005-08-23 11:25:24 -07:00
mf_iocache.c fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
mf_iocache2.c Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
mf_keycache.c fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
mf_keycaches.c remove the entry from the list, before freeing 2005-01-24 18:38:46 +01: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 with 4.1 2005-07-03 14:17:52 +03: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 fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +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 merge 2005-07-20 00:40:49 +02:00
my_chsize.c post-review fixes 2005-05-16 01:54:02 +04: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_copy.c Making rpl_until more robust if machine is slow. Removing rpl_trunc_binlog 2005-07-04 22:27:16 +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 Update copyright 2001-12-06 14:10:51 +02:00
my_delete.c Update copyright 2001-12-06 14:10:51 +02: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 Max open files handling moved to my_set_max_open_files() 2004-02-19 19:33:09 +02:00
my_error.c WL#1895 - Print message to error log in case of detected MyISAM corruption 2004-12-23 20:11:38 +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 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 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 fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
my_getsystime.c Fixes for prior commit 2004-05-05 10:54:11 -03:00
my_getwd.c BUG#10687 - Merge engine fails under Windows 2005-05-23 12:31:22 -05:00
my_handler.c fixes for compiler warnings from VC6 2005-06-06 11:34:52 -05:00
my_init.c Added missing cast. 2005-08-09 16:57:35 +03: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 Fix warning VC++ and fix applied fisrt to source 4.1 2004-08-24 10:40:20 -03:00
my_lock.c Prevent potential problems on 32-Bit machines. 2004-06-25 11:35:37 +02:00
my_lockmem.c Update copyright 2001-12-06 14:10:51 +02:00
my_lread.c Update copyright 2001-12-06 14:10:51 +02:00
my_lwrite.c Changed %lx -> 0x%lx (for easier comparison of debug files) 2004-08-23 13:46:51 +03:00
my_malloc.c Changed %lx -> 0x%lx (for easier comparison of debug files) 2004-08-23 13:46:51 +03: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 fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02: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 Merge from 4.1 2005-05-26 21:01:55 +02:00
my_os2cond.c Get rid of checking for ETIME return value of pthread_cond_timedwait. 2005-07-14 19:42:56 +04: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 Fixes for Netware 2003-01-28 08:38:28 +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 Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
my_pthread.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_quick.c Update copyright 2001-12-06 14:10:51 +02:00
my_read.c Changed %lx -> 0x%lx (for easier comparison of debug files) 2004-08-23 13:46:51 +03:00
my_realloc.c Changed %lx -> 0x%lx (for easier comparison of debug files) 2004-08-23 13:46:51 +03: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 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_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 Fixes while reviewing new code 2005-05-06 11:39:30 +03: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 Update copyright 2001-12-06 14:10:51 +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 Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02: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 Changed %lx -> 0x%lx (for easier comparison of debug files) 2004-08-23 13:46:51 +03:00
sha1.c Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 2004-05-19 16:38:12 +03: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 SCRUM 2003-09-19 14:44:31 +05:00
thr_alarm.c Move reset of insert_values to ensure it's done also during error conditions 2005-06-28 15:06:16 +03:00
thr_lock.c Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-15 12:37:45 -07:00
thr_mutex.c Step 2 of the switch to support configuration with NPTL: 2005-04-20 20:38:57 +02:00
thr_rwlock.c merge with 3.23.52 2002-08-12 04:04:43 +03:00
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 Changed %lx -> 0x%lx (for easier comparison of debug files) 2004-08-23 13:46:51 +03:00