mariadb/scripts
unknown 5578506302 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96:
  Auto merged
BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6:
  Auto merged
BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038:
  Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
  Auto merged
BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
  Auto merged
BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
  Auto merged
BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6:
  Auto merged
BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7:
  Auto merged
BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
  Auto merged
BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0:
  Auto merged
BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de:
  Auto merged
BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589:
  Auto merged
BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50:
  Auto merged
BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
  Auto merged
BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
  Auto merged
BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a:
  Auto merged
BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081:
  Auto merged
BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148:
  Auto merged
BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef:
  Auto merged
BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad:
  Auto merged
BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26:
  Auto merged
BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a:
  Auto merged
BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82:
  Auto merged
BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2:
  Auto merged
BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
  Auto merged
BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160:
  Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
  Auto merged
BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
  Auto merged
mysql-test/install_test_db.sh:
  SCCS merged
2007-03-20 17:58:30 +01:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
fill_func_tables.sh Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
fill_help_tables.sh Bug#24270 2007-01-02 09:42:13 -08:00
fill_help_tables.sql More changes to reflect the removal of manual.texi from the sources: 2005-04-13 18:29:23 +02:00
make_binary_distribution.sh Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 2007-03-20 17:58:30 +01:00
make_sharedlib_distribution.sh my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
make_win_bin_dist make_win_bin_dist: 2007-03-19 16:45:37 +01:00
Makefile.am Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 2007-02-28 16:41:30 +01:00
msql2mysql.sh gen_lex_hash.cc: 2007-01-31 00:06:42 +01:00
mysql_config.sh my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysql_convert_table_format.sh Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
mysql_find_rows.sh my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysql_fix_extensions.sh mysql_fix_extensions.sh tool copied from 4.0 tree (referenced in manual). 2002-05-16 10:13:42 +10:00
mysql_fix_privilege_tables.sh Bug#20166 mysql-test-run.pl does not test system privilege tables creation 2007-02-26 11:49:24 +01:00
mysql_install_db.sh Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166 2007-02-28 14:41:57 +01:00
mysql_secure_installation.sh Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 2007-01-01 05:31:23 +01:00
mysql_setpermission.sh - Applied patch provided by Martin Mokrejs <mmokrejs@natur.cuni.cz> 2003-04-25 21:58:25 +02:00
mysql_system_tables.sql Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166 2007-02-28 14:41:57 +01:00
mysql_system_tables_data.sql Bug#20166 mysql-test-run.pl does not test system privilege tables creation 2007-02-28 14:58:19 +01:00
mysql_system_tables_fix.sql Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166 2007-02-28 14:41:57 +01:00
mysql_test_data_timezone.sql Bug#20166 mysql-test-run.pl does not test system privilege tables creation 2007-02-26 11:49:24 +01:00
mysql_zap.sh my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysqlaccess.conf configure fixes 2000-09-14 15:10:06 +03:00
mysqlaccess.sh BUG#24780 workaround for broken installations that depend on using /etc, but were configured differently 2007-01-09 09:32:56 +01:00
mysqlbug.sh Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-11 09:43:44 -05:00
mysqld_multi.sh Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-31 16:23:05 -05:00
mysqld_safe.sh Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 2006-12-14 12:21:37 -08:00
mysqldumpslow.sh Search through options to find where the slow query log actually is. 2006-12-18 21:12:01 -08:00
mysqlhotcopy.sh Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 2006-10-03 09:05:34 +02:00