mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/extra
History
unknown 63a454d4f4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


configure.in:
  Auto merged
extra/resolveip.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
client/mysqlcheck.c:
  manual merge
mysql-test/r/mysqlcheck.result:
  manual merge
mysql-test/t/mysqlcheck.test:
  manual merge
2008-01-23 11:53:06 -05:00
..
yassl Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 2007-08-28 11:36:10 +02:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
charset2html.c Fixed compiler warnings 2007-02-23 13:13:55 +02:00
CMakeLists.txt Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new 2007-08-03 22:57:21 +02:00
comp_err.c Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint 2007-10-05 19:58:20 +02:00
innochecksum.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
Makefile.am Makefile.am: 2007-09-26 18:47:55 +02:00
my_print_defaults.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
mysql_waitpid.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
perror.c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 2007-06-17 17:21:27 +02:00
replace.c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
resolve_stack_dump.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
resolveip.c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 2008-01-23 11:53:06 -05:00