mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/client
History
unknown 95a8bb20fb Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


client/client_priv.h:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/query_cache.result:
  manual merge
mysql-test/include/mix1.inc:
  manual merge
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/query_cache.test:
  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 19:08:21 +05:00
..
.cvsignore
client_priv.h after merge fix 2007-10-04 15:35:45 +05:00
CMakeLists.txt Bug#29903 The CMake build method does not produce the embedded library. 2007-08-03 14:43:12 -04: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 Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
Makefile.am Manual merge: Makefile lines must start with tab, not blank. 2007-05-02 14:16:21 +02: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 sita.local:/Users/tsmith/m/bk/51 2007-09-24 11:37:26 +02: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 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 2007-09-15 05:12:02 +02:00
mysqlcheck.c Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base 2007-10-18 16:57:51 -06:00
mysqldump.c Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-10-23 19:08:21 +05: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 Fixed bug #29985. 2007-09-17 21:39:07 +05:00
mysqltest.c Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-10-18 19:21:07 -06: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