1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-28 13:01:41 +03:00
unknown a6edf110bc Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1


libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql-common/client.c:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
mysql-test/t/mysqldump.test:
  Manual merge.  (Seems to need null-merging.)
sql/mysqld.cc:
  Manual merge + formatting change.
sql/sql_show.cc:
  Manual merge
2006-07-10 17:20:39 -04:00
..
2006-05-30 10:22:31 +02:00
2006-06-20 17:14:36 +02:00
2006-07-07 03:07:45 +04:00
2006-06-20 17:05:41 +02:00
2006-07-07 13:49:43 +04:00
2006-06-12 14:23:21 +02:00
2006-06-18 14:56:35 +04:00
2006-06-14 10:54:56 +05:00
2006-06-18 14:56:35 +04:00
2005-11-23 22:45:02 +02:00
2006-06-18 14:56:35 +04:00
2006-06-21 14:53:40 +05:00
2006-01-01 22:18:02 +01:00
2006-03-28 19:34:44 +02:00
2006-07-07 03:07:45 +04:00
2006-06-27 00:47:52 +04:00
2006-04-13 13:49:29 -07:00
2006-06-19 12:45:34 +03:00
2005-11-23 22:45:02 +02:00
2006-06-12 06:50:11 -07:00
2006-06-12 06:50:11 -07:00
2006-06-12 06:50:11 -07:00
2006-05-04 22:27:12 +03:00
2005-12-21 10:18:40 -08:00
2006-07-06 20:12:33 +02:00
2006-07-06 15:38:47 +02:00