mariadb/client
unknown 058cad7848 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
client/mysqldump.c:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysys/my_lib.c:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/func_time.result:
  manual merge
mysql-test/r/mysqldump.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
mysql-test/t/mysqldump.test:
  manual merge
sql/log.cc:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_table.cc:
  manual merge
2006-07-03 11:35:58 -04:00
..
.cvsignore
client_priv.h Removed double enum value. 2006-05-16 01:12:12 +03:00
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
completion_hash.cc few harmless warnings from automated code-checking tools fixed 2005-01-08 21:25:31 +01:00
completion_hash.h upgrade readline to version 4.3 2002-11-19 18:26:53 +04:00
get_password.c This is an implementation of two WL items: 2006-05-18 18:57:50 +04:00
Makefile.am Merge rurik.mysql.com:/home/igor/tmp_merge 2006-06-09 00:23:59 -07:00
my_readline.h mysql.cc: 2004-05-05 22:47:09 +02:00
mysql.cc Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 2006-06-13 16:06:35 -04:00
mysql_upgrade.c Win build fix 2006-05-02 08:59:49 +05:00
mysqladmin.cc Bug#17208 SSL: client does not verify server certificate 2006-04-18 17:58:27 +02:00
mysqlbinlog.cc Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2006-05-30 16:07:49 +03:00
mysqlcheck.c Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 2006-02-17 08:33:47 -06:00
mysqldump.c Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 2006-07-03 11:35:58 -04:00
mysqlimport.c Fix after merge 5.0->5.1 2006-05-12 09:10:04 +02:00
mysqlshow.c Bug#17208 SSL: client does not verify server certificate 2006-04-18 17:58:27 +02:00
mysqlslap.c mysqlslap.c: 2006-04-28 10:44:08 -05:00
mysqltest.c Remove compiler warnings 2006-06-23 02:49:19 +03:00
readline.cc fixed conversion errors (Windows IA64 build) 2005-03-07 09:47:24 +01:00
sql_string.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_string.h Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 2005-06-06 16:54:15 +05:00