mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 07:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge jcole@work.mysql.com:/home/bk/mysql

Browse source 
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


BitKeeper/etc/ignore:
  auto-union
Docs/manual.texi:
  Auto merged
This commit is contained in:
unknown 2000-12-06 12:33:53 -06:00
commit 0a1fcefba7
2 changed files with 88 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

45
.bzrignore
View file

@ -19,10 +19,23 @@ COPYING
COPYING.LIB
Docs/INSTALL-BINARY
Docs/include.texi
Docs/manual.aux
Docs/manual.cp
Docs/manual.cps
Docs/manual.dvi
Docs/manual.fn
Docs/manual.fns
Docs/manual.html
Docs/manual.ky
Docs/manual.log
Docs/manual.pdf
Docs/manual.pg
Docs/manual.toc
Docs/manual.tp
Docs/manual.txt
Docs/manual.vr
Docs/manual_a4.ps
Docs/manual_letter.ps
Docs/manual_toc.html
Docs/mysql.info
INSTALL-SOURCE
@ -40,6 +53,7 @@ PENDING/2000-10-11.06
PENDING/2000-10-25.01
PENDING/2000-10-25.02
PENDING/2000-11-17.01
TAGS
aclocal.m4
client/.mysqladmin.c.swp
client/insert_test
@ -209,6 +223,7 @@ mysql-test/var/lib/mysql-bin.004
mysql-test/var/lib/mysql-bin.005
mysql-test/var/lib/mysql-bin.006
mysql-test/var/lib/mysql-bin.007
mysql-test/var/lib/mysql-bin.008
mysql-test/var/lib/mysql-bin.index
mysql-test/var/lib/mysql-slow.log
mysql-test/var/lib/mysql/*
@ -239,6 +254,12 @@ mysql-test/var/lib/test/t.frm
mysql-test/var/lib/test/test.MYD
mysql-test/var/lib/test/test.MYI
mysql-test/var/lib/test/test.frm
mysql-test/var/lib/test/test1.MYD
mysql-test/var/lib/test/test1.MYI
mysql-test/var/lib/test/test1.frm
mysql-test/var/lib/test/test2.MYD
mysql-test/var/lib/test/test2.MYI
mysql-test/var/lib/test/test2.frm
mysql-test/var/lib/test/words.MYD
mysql-test/var/lib/test/words.MYI
mysql-test/var/lib/test/words.frm
@ -252,6 +273,7 @@ mysql-test/var/log/mysqld-slave.err
mysql-test/var/log/mysqld-slave.log
mysql-test/var/log/mysqld.err
mysql-test/var/log/mysqld.log
mysql-test/var/run/mysqld.pid
mysql-test/var/slave-data/bar/bar.MYD
mysql-test/var/slave-data/bar/bar.MYI
mysql-test/var/slave-data/bar/bar.frm
@ -314,6 +336,7 @@ mysql-test/var/slave-data/test/x.MYD
mysql-test/var/slave-data/test/x.MYI
mysql-test/var/slave-data/test/x.frm
mysql-test/var/tmp/README
mysql-test/var/tmp/mysql.sock
mysys/test_charset
mysys/test_thr_alarm
mysys/test_thr_lock
@ -379,25 +402,3 @@ support-files/mysql-3.23.29-gamma.spec
support-files/mysql-log-rotate
support-files/mysql.server
support-files/mysql.spec
Docs/manual.aux
Docs/manual.cp
Docs/manual.cps
Docs/manual.dvi
Docs/manual.fn
Docs/manual.fns
Docs/manual.ky
Docs/manual.pg
Docs/manual.toc
Docs/manual.tp
Docs/manual.vr
Docs/manual_a4.ps
Docs/manual_letter.ps
mysql-test/var/lib/test/test1.frm
mysql-test/var/lib/test/test1.MYD
mysql-test/var/lib/test/test1.MYI
mysql-test/var/lib/test/test2.frm
mysql-test/var/lib/test/test2.MYD
mysql-test/var/lib/test/test2.MYI
mysql-test/var/run/mysqld.pid
mysql-test/var/tmp/mysql.sock
mysql-test/var/lib/mysql-bin.008