mariadb/scripts
unknown 4bd33a0d72 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2006-10-11 10:01:43 +02:00
..
.cvsignore
fill_func_tables.sh Merge zim.(none):/home/brian/mysql/dep-5.0 2006-08-14 15:24:29 -07:00
fill_help_tables.sh
fill_help_tables.sql
make_binary_distribution.sh mysql.spec.sh: 2006-09-24 00:41:20 +02:00
make_sharedlib_distribution.sh
make_win_bin_dist Fixes for crashes and test failures 2006-09-01 14:34:37 +02:00
Makefile.am included make_win_bin_dist (required for pushbuild) into distribution (make dist) 2006-09-01 16:55:35 +02:00
msql2mysql.sh
mysql_config.sh Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 2006-09-25 01:32:55 +02:00
mysql_convert_table_format.sh
mysql_create_system_tables.sh
mysql_find_rows.sh
mysql_fix_extensions.sh
mysql_fix_privilege_tables.sh
mysql_fix_privilege_tables.sql
mysql_install_db.sh Merge zim.(none):/home/brian/mysql/dep-5.1 2006-08-14 21:26:33 -07:00
mysql_secure_installation.sh
mysql_setpermission.sh
mysql_zap.sh
mysqlaccess.conf
mysqlaccess.sh
mysqlbug.sh
mysqld_multi.sh
mysqld_safe.sh
mysqldumpslow.sh
mysqlhotcopy.sh Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 2006-10-03 09:05:34 +02:00