mariadb/client
unknown 66fb56f115 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337
into  example.com:/work/mysql-5.1-runtime-wl3337


BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp_notembedded.result:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/errmsg.txt:
  C
mysql-test/r/events_bugs.result:
  update result
  manual merge
mysql-test/r/ps_1general.result:
  update result
  manual merge
sql/sql_yacc.yy:
  manual merge
2006-08-14 15:26:59 +02: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
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 bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +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 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 ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 2006-08-14 15:26:59 +02: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