mariadb/mysys
unknown 9a10c20ba9 Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/queues.c:
  Auto merged
sql/events.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  manual merge
mysql-test/r/myisam.result:
  manual merge
mysql-test/r/partition.result:
  manual merge
mysql-test/r/user_var.result:
  manual merge
mysql-test/t/myisam.test:
  manual merge
mysql-test/t/partition.test:
  manual merge
mysql-test/t/user_var.test:
  manual merge
sql/item.h:
  manual merge
sql/item_func.cc:
  manual merge
storage/myisammrg/ha_myisammrg.cc:
  manual merge
2007-12-13 15:56:04 +04:00
..
.cvsignore
array.c
base64.c
ChangeLog
charset-def.c
charset.c Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines 2007-10-24 16:39:13 +05:00
checksum.c
CMakeLists.txt Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/50 2007-11-07 15:47:25 -07:00
default.c Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 2007-11-19 13:40:49 -07:00
default_modify.c Slow query log to file now displays queries with microsecond precission 2007-07-30 11:33:50 +03:00
errors.c
hash.c Slow query log to file now displays queries with microsecond precission 2007-07-30 11:33:50 +03:00
list.c
make-ccc
make-conf.c
Makefile.am Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/50 2007-11-07 15:47:25 -07:00
md5.c
mf_arr_appstr.c Bug #20748: Configuration files should not be read more than once 2007-11-07 15:23:50 -07:00
mf_brkhant.c
mf_cache.c
mf_dirname.c
mf_fn_ext.c
mf_format.c
mf_getdate.c Slow query log to file now displays queries with microsecond precission 2007-07-30 11:33:50 +03:00
mf_iocache.c
mf_iocache2.c Correct bad merge, and remove version numbers from test case. 2007-08-08 12:21:04 -04:00
mf_keycache.c Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 2007-10-18 14:32:43 +04:00
mf_keycaches.c
mf_loadpath.c
mf_pack.c Slow query log to file now displays queries with microsecond precission 2007-07-30 11:33:50 +03:00
mf_path.c Slow query log to file now displays queries with microsecond precission 2007-07-30 11:33:50 +03:00
mf_qsort.c Fix for bug #31207: Test "join_nested" shows different strategy on IA64 2007-10-17 20:08:58 +04:00
mf_qsort2.c
mf_radix.c
mf_same.c
mf_sort.c Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 2007-10-18 14:32:43 +04:00
mf_soundex.c
mf_strip.c
mf_tempdir.c
mf_tempfile.c avoid using GetTempFileName in a way it's documented to not work on windows 2007-09-27 08:56:06 +02:00
mf_unixpath.c
mf_util.c
mf_wcomp.c
mf_wfile.c
mulalloc.c
my_access.c
my_aes.c
my_alarm.c
my_alloc.c
my_append.c Slow query log to file now displays queries with microsecond precission 2007-07-30 11:33:50 +03:00
my_atomic.c
my_bit.c
my_bitmap.c
my_chsize.c
my_clock.c
my_compress.c Slow query log to file now displays queries with microsecond precission 2007-07-30 11:33:50 +03:00
my_conio.c
my_copy.c Slow query log to file now displays queries with microsecond precission 2007-07-30 11:33:50 +03:00
my_crc32.c
my_create.c
my_delete.c Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE 2007-11-22 21:39:28 +01:00
my_div.c
my_dup.c
my_error.c
my_file.c
my_fopen.c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
my_fstream.c
my_gethostbyname.c
my_gethwaddr.c mysys/my_gethwaddr.c 2007-08-09 14:56:57 +02:00
my_getncpus.c
my_getopt.c Bug #31177: Server variables can't be set to their current values 2007-12-10 08:12:41 +01:00
my_getpagesize.c
my_getsystime.c Fixes Bug#30127: --debug-info no longer prints memory usage in mysql 2007-08-01 22:59:05 +03:00
my_getwd.c
my_handler.c
my_init.c Merge sita.local:/Users/tsmith/m/bk/maint/50 2007-10-04 13:51:27 -06:00
my_largepage.c Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms. 2007-08-29 19:20:18 +04:00
my_lib.c Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 2007-10-18 14:32:43 +04:00
my_libwrap.c
my_lock.c
my_lockmem.c
my_malloc.c Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms. 2007-08-29 19:20:18 +04:00
my_memmem.c
my_messnc.c
my_mkdir.c
my_mmap.c
my_net.c
my_netware.c
my_new.cc
my_once.c
my_open.c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
my_port.c
my_pread.c
my_pthread.c my_pthread.c: 2007-07-30 20:40:49 +02:00
my_quick.c
my_read.c
my_realloc.c
my_redel.c
my_rename.c
my_seek.c
my_sleep.c
my_static.c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
my_static.h Slow query log to file now displays queries with microsecond precission 2007-07-30 11:33:50 +03:00
my_symlink.c
my_symlink2.c Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines 2007-11-12 15:26:37 +04:00
my_sync.c
my_thr_init.c Merge hynda.mysql.fi:/home/my/mysql-5.0-marvel 2007-08-21 19:09:46 +03:00
my_vle.c
my_wincond.c
my_windac.c
my_winthread.c Bug#30992 Wrong implementation of pthread_mutex_trylock() 2007-10-03 21:38:32 +02:00
my_write.c Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 2007-10-25 08:22:14 +04:00
mysys_priv.h Slow query log to file now displays queries with microsecond precission 2007-07-30 11:33:50 +03:00
ptr_cmp.c
queues.c Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-12-13 15:56:04 +04:00
rijndael.c
safemalloc.c Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms. 2007-08-29 19:20:18 +04:00
sha1.c
string.c
test_charset.c Fix doxygen warnings. 2007-08-15 17:43:08 +04:00
test_dir.c
test_fn.c
test_xml.c
testhash.c
thr_alarm.c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
thr_lock.c Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE 2007-11-15 20:25:43 +01:00
thr_mutex.c Merge moksha.local:/Users/davi/mysql/push/mysql-5.0-runtime 2007-10-09 09:48:49 -03:00
thr_rwlock.c
tree.c
trie.c
typelib.c