mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/scripts
History
unknown baddc8bdca Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
BitKeeper/deleted/.del-mysqld.cc.rej:
  Delete: sql/mysqld.cc.rej
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
  Auto merged
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
  Auto merged
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
  Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Null merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Null merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
  Auto merged
BUILD/SETUP.sh:
  Manual merged
Makefile.am:
  Manual merged
configure.in:
  Manual merged
include/my_pthread.h:
  Manual merged
mysql-test/Makefile.am:
  Manual merged
sql/mysqld.cc:
  Manual merged
support-files/mysql.spec.sh:
  Manual merged
2007-02-01 19:41:04 +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 siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 2007-01-18 08:30:35 -07:00
make_sharedlib_distribution.sh my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
make_win_bin_dist Many files: 2006-12-31 02:29:11 +01:00
Makefile.am Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +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_create_system_tables.sh Bug#24270 2007-01-02 09:42:13 -08: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 Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
mysql_fix_privilege_tables.sql Bug#24270 2007-01-02 09:42:13 -08:00
mysql_install_db.sh Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build 2007-01-11 13:50:48 -07: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_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 kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-24780 2007-01-22 16:38:54 +01: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