mariadb

mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Files

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