mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/client
History
unknown 167aaaa5a4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1


mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
server-tools/instance-manager/portability.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysql.cc:
  Manual merge.
mysql-test/mysql-test-run.pl:
  Manual merge.
2006-08-21 12:59:46 -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 bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
my_readline.h mysql.cc: 2004-05-05 22:47:09 +02:00
mysql.cc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 2006-08-21 12:59:46 -04:00
mysql_upgrade.c Merge bk@192.168.21.1:mysql-5.0-kt 2006-08-02 14:17:16 +05:00
mysqladmin.cc Bug#17208 SSL: client does not verify server certificate 2006-04-18 17:58:27 +02:00
mysqlbinlog.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
mysqlcheck.c Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
mysqldump.c Manual merge 5.0->5.1. Post-merge fixes. 2006-08-14 13:27:11 +04:00
mysqlimport.c Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
mysqlshow.c Bug #19147: mysqlshow INFORMATION_SCHEMA does not work 2006-07-21 20:29:25 -07:00
mysqlslap.c Bug#21297 rpl_insert fails randomly 2006-07-27 10:54:04 +02:00
mysqltest.c Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04: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