mariadb/client
unknown 8479eb1db7 Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge
2007-10-23 18:51:43 +05:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h Fixed bug #31077. 2007-10-01 20:35:51 +05:00
CMakeLists.txt CMakeLists.txt (several), make_win_bin_dist: 2007-08-02 12:49:27 +02:00
completion_hash.cc Many files: 2006-12-23 20:17:15 +01:00
completion_hash.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
echo.c echo.c: 2007-03-20 18:31:49 +01:00
get_password.c Many files: 2006-12-23 20:17:15 +01:00
Makefile.am Format corrections for various "Makefile.am": Leading tab, no trailing blank. 2007-05-02 14:01:49 +02:00
my_readline.h Many files: 2006-12-23 20:17:15 +01:00
mysql.cc Merge sita.local:/Users/tsmith/m/bk/50 2007-09-24 11:33:27 +02:00
mysql_upgrade.c Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and 2007-10-08 22:30:41 -04:00
mysqladmin.cc Bug #15327: configure: --with-tcp-port option being partially ignored 2007-09-13 16:19:46 +02:00
mysqlbinlog.cc Bug #15327: configure: --with-tcp-port option being partially ignored 2007-09-13 16:19:46 +02:00
mysqlcheck.c Bug #15327: configure: --with-tcp-port option being partially ignored 2007-09-13 16:19:46 +02:00
mysqldump.c Merge mysql.com:/home/gluh/MySQL/Merge/5.0 2007-10-23 18:51:43 +05:00
mysqlimport.c Bug #15327: configure: --with-tcp-port option being partially ignored 2007-09-13 16:19:46 +02:00
mysqlmanager-pwgen.c Avoid the name conflict between the system-provided "md5.h" and the MySQL one 2007-07-19 14:14:03 +02:00
mysqlmanagerc.c Bug #15327: configure: --with-tcp-port option being partially ignored 2007-09-13 16:19:46 +02:00
mysqlshow.c Bug #15327: configure: --with-tcp-port option being partially ignored 2007-09-13 16:19:46 +02:00
mysqltest.c Bug#31398 problems with mysql-test-run, part2 2007-10-05 18:18:50 +02:00
readline.cc Many files: 2006-12-23 20:17:15 +01:00
sql_string.cc Fixed compiler warnings. 2007-03-22 20:32:07 +02:00
sql_string.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00