mariadb/client
unknown 336f2c7e51 Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged


client/mysqltest.c:
  Auto merged
mysql-test/r/view.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_connect.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
  Manually merged.
mysql-test/t/disabled.def:
  Manually merged.
2008-02-26 19:34:02 +03:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 2008-01-31 17:46:50 +01:00
CMakeLists.txt Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004 2007-11-01 16:49:39 +01:00
completion_hash.cc WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03: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 fixes for build failures due to my yesterday's changeset forbidding 2008-02-19 18:45:11 +01:00
Makefile.am Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004 2007-11-01 16:49:39 +01:00
my_readline.h WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
mysql.cc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug24624/my50-bug24624 2008-01-30 18:15:00 -05:00
mysql_upgrade.c Merge alf.(none):/src/bug28774/my50-bug28774 2007-10-08 22:32:26 -04:00
mysqladmin.cc Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 2007-09-15 05:12:02 +02:00
mysqlbinlog.cc BUG#33247: mysqlbinlog does not clean up after itself on abnormal termination 2008-02-08 18:17:00 +01:00
mysqlcheck.c Patch contributed by Jocelyn Fournier. CLA received 2007-02-27. 2008-01-23 11:37:46 -05:00
mysqldump.c Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> 2008-02-18 23:29:39 +01:00
mysqlimport.c Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 2007-09-15 05:12:02 +02:00
mysqlshow.c Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 2007-09-15 05:12:02 +02:00
mysqlslap.c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 2007-12-20 12:32:16 -08:00
mysqltest.c Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 2008-02-26 19:34:02 +03:00
readline.cc WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
sql_string.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
sql_string.h Fixed compiler warnings 2007-02-23 13:13:55 +02:00