Commits · 7805e90ff7ce64ebd36aef771697baba2119624a · Kirill Smelkov / mariadb

29 Dec, 2000 3 commits
- Merge · 7805e90f
  unknown authored Dec 29, 2000
  
  7805e90f
- mysqltest.c Clean-ups. · a6ce6d38
  unknown authored Dec 28, 2000
```
client/mysqltest.c:
  Clean-ups.
```
  a6ce6d38
- mysqltest.c Added --no-defaults to usage(). · 080ba3b8
  unknown authored Dec 28, 2000
```
mysql-test-run.sh	Couple more clean-ups.


mysql-test/mysql-test-run.sh:
  Couple more clean-ups.
client/mysqltest.c:
  Added --no-defaults to usage().
```
  080ba3b8
28 Dec, 2000 11 commits

unknown authored Dec 28, 2000


support-files/mysql.server.sh:
  Use -f instead of -e to test for lock file.

c16a006f

Merge work.mysql.com:/home/bk/mysql · 80ed8761
unknown authored Dec 28, 2000
```
into cane.mysql.fi:/usr/home/tim/my/work
```
80ed8761

Don't use subtransactions on write_row() and delete_row() in · ced74d24

unknown authored Dec 28, 2000

ha_berkeley.
A few smaller bug fixes.


sql/ha_berkeley.cc:
  - Don't use subtransactions on write_row() and delete_row()
  - Bug fixes for sharing DB *file
sql/ha_berkeley.h:
  - Don't use subtransactions on write_row() and delete_row()
  - Bug fixes for sharing DB *file
sql/ha_myisam.cc:
  - fix compiler warning
sql/log_event.cc:
  - fix compiler warning

ced74d24

Merge work:/home/bk/mysql · 8c17965e
unknown authored Dec 28, 2000
```
into evoq.home.mwagner.org:/opt/local/x1/work/bk/mysql
```
8c17965e
mysql-test-run.sh Added spit-polish. Also --verbose is default now. · 637cddc7
unknown authored Dec 28, 2000
```
mysql-test/mysql-test-run.sh:
  Added spit-polish. Also --verbose is default now.
```
637cddc7
manual.texi Mirror added in China. · 4656bbb6
unknown authored Dec 27, 2000
```
Docs/manual.texi:
  Mirror added in China.
```
4656bbb6

Merge work.mysql.com:/home/bk/mysql · 03cd236f

unknown authored Dec 28, 2000

into cane.mysql.fi:/usr/home/tim/my/work


sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged

03cd236f

Share DB *file; this fixes a deadlock problem. · 373ab5b3

unknown authored Dec 28, 2000

    While we're at it, share the keyfile and keytype arrays, too.


sql/ha_berkeley.cc:
  Share DB *file; this fixes a deadlock problem.
  While we're at it, share the keyfile and keytype arrays, too.
sql/ha_berkeley.h:
  Share DB *file; this fixes a deadlock problem.
  While we're at it, share the keyfile and keytype arrays, too.

373ab5b3

Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql · 0e89c3a7
unknown authored Dec 28, 2000
```
Docs/manual.texi:
  Auto merged
```
0e89c3a7
Changeset · 6fa0b18e
unknown authored Dec 28, 2000
```
mysql-test/misc/select.res:
  ***MISSING WEAVE***
```
6fa0b18e

Added support for hex strings to mysqlimport · f537319d

unknown authored Dec 28, 2000

A lot of new tests to mysqltest
Fixed bug with BDB tables and autocommit


BitKeeper/deleted/.del-delete.test~389410e29f2cebe5:
  Delete: mysql-test/t/delete.test
BitKeeper/deleted/.del-delete.result~e866a6678e29f186:
  Delete: mysql-test/r/delete.result
BitKeeper/deleted/.del-sel000014.test~74cb8c70f1d73fcc:
  Delete: mysql-test/t/sel000014.test
BitKeeper/deleted/.del-sel000015.test~7442bf9cbc96fe07:
  Delete: mysql-test/t/sel000015.test
BitKeeper/deleted/.del-sel000016.test~f495235f14c47ec:
  Delete: mysql-test/t/sel000016.test
BitKeeper/deleted/.del-sel000017.test~7c39f2b45a6aa780:
  Delete: mysql-test/t/sel000017.test
BitKeeper/deleted/.del-sel000018.test~16207f3ad74de75e:
  Delete: mysql-test/t/sel000018.test
BitKeeper/deleted/.del-sel000014.result~fc8de0ec89d9e35:
  Delete: mysql-test/r/sel000014.result
BitKeeper/deleted/.del-sel000015.result~cadbc52051d47bac:
  Delete: mysql-test/r/sel000015.result
BitKeeper/deleted/.del-sel000016.result~6177851869bd5b07:
  Delete: mysql-test/r/sel000016.result
BitKeeper/deleted/.del-sel000017.result~84ebf147850ff31c:
  Delete: mysql-test/r/sel000017.result
BitKeeper/deleted/.del-sel000018.result~562ac9094cf53aba:
  Delete: mysql-test/r/sel000018.result
BitKeeper/deleted/.del-sel000005.test~982fde89a4d6d886:
  Delete: mysql-test/t/sel000005.test
BitKeeper/deleted/.del-sel000006.test~291cc6c8d85e51df:
  Delete: mysql-test/t/sel000006.test
BitKeeper/deleted/.del-sel000005.result~d5410bb765199cc5:
  Delete: mysql-test/r/sel000005.result
BitKeeper/deleted/.del-sel000006.result~d38004d1acfc11a5:
  Delete: mysql-test/r/sel000006.result
BitKeeper/deleted/.del-sel000004.test~daf9ad4a1a31cd3c:
  Delete: mysql-test/t/sel000004.test
BitKeeper/deleted/.del-sel000007.test~f431e4f4739a24c3:
  Delete: mysql-test/t/sel000007.test
BitKeeper/deleted/.del-sel000008.test~b338ef585cadf7ae:
  Delete: mysql-test/t/sel000008.test
BitKeeper/deleted/.del-sel000009.test~a455c38f5c942cd1:
  Delete: mysql-test/t/sel000009.test
BitKeeper/deleted/.del-sel000010.test~ca07085ae92255f1:
  Delete: mysql-test/t/sel000010.test
BitKeeper/deleted/.del-sel000011.test~c2a971726c9d18d6:
  Delete: mysql-test/t/sel000011.test
BitKeeper/deleted/.del-sel000012.test~ae64bff363c42e92:
  Delete: mysql-test/t/sel000012.test
BitKeeper/deleted/.del-sel000013.test~ce8aa504ba4f74ba:
  Delete: mysql-test/t/sel000013.test
BitKeeper/deleted/.del-sel000019.test~8fd63c8dc6be8dbc:
  Delete: mysql-test/t/sel000019.test
BitKeeper/deleted/.del-sel000020.test~c5758ad18a6dff1e:
  Delete: mysql-test/t/sel000020.test
BitKeeper/deleted/.del-sel000021.test~94dd47de2872264a:
  Delete: mysql-test/t/sel000021.test
BitKeeper/deleted/.del-sel000022.test~6e3e5435e66875e9:
  Delete: mysql-test/t/sel000022.test
BitKeeper/deleted/.del-sel000023.test~7bdfcfaa278f837d:
  Delete: mysql-test/t/sel000023.test
BitKeeper/deleted/.del-sel000024.test~849f47e6cbdc4fe3:
  Delete: mysql-test/t/sel000024.test
BitKeeper/deleted/.del-sel000025.test~65b32b4b67e4c77:
  Delete: mysql-test/t/sel000025.test
BitKeeper/deleted/.del-sel000026.test~d8aa2d614f23b1:
  Delete: mysql-test/t/sel000026.test
BitKeeper/deleted/.del-sel000027.test~ab44bb57a580de9:
  Delete: mysql-test/t/sel000027.test
BitKeeper/deleted/.del-sel000028.test~db9bfc0a808fb629:
  Delete: mysql-test/t/sel000028.test
BitKeeper/deleted/.del-sel000029.test~6aae34dbb3ee86d9:
  Delete: mysql-test/t/sel000029.test
BitKeeper/deleted/.del-sel000030.test~a29683eac3e7b706:
  Delete: mysql-test/t/sel000030.test
BitKeeper/deleted/.del-sel000004.result~1f8d1265be521c17:
  Delete: mysql-test/r/sel000004.result
BitKeeper/deleted/.del-sel000007.result~df455e49f9727c4f:
  Delete: mysql-test/r/sel000007.result
BitKeeper/deleted/.del-sel000008.result~67a459ff62c84d6a:
  Delete: mysql-test/r/sel000008.result
BitKeeper/deleted/.del-sel000009.result~e042b35ab131fb3:
  Delete: mysql-test/r/sel000009.result
BitKeeper/deleted/.del-sel000010.result~eee5b9631a1e0066:
  Delete: mysql-test/r/sel000010.result
BitKeeper/deleted/.del-sel000011.result~6907fe356973ed25:
  Delete: mysql-test/r/sel000011.result
BitKeeper/deleted/.del-sel000012.result~be18991fc28954c2:
  Delete: mysql-test/r/sel000012.result
BitKeeper/deleted/.del-sel000013.result~513389e06c96af73:
  Delete: mysql-test/r/sel000013.result
BitKeeper/deleted/.del-sel000019.result~2870fe1c4998d929:
  Delete: mysql-test/r/sel000019.result
BitKeeper/deleted/.del-sel000020.result~faa670294ef5fa91:
  Delete: mysql-test/r/sel000020.result
BitKeeper/deleted/.del-sel000021.result~8f0ce4ec26e0c21d:
  Delete: mysql-test/r/sel000021.result
BitKeeper/deleted/.del-sel000022.result~34828a43753ee767:
  Delete: mysql-test/r/sel000022.result
BitKeeper/deleted/.del-sel000023.result~13e112d77573bf17:
  Delete: mysql-test/r/sel000023.result
BitKeeper/deleted/.del-sel000024.result~b10d449624f48d07:
  Delete: mysql-test/r/sel000024.result
BitKeeper/deleted/.del-sel000025.result~f31e08fcca805f35:
  Delete: mysql-test/r/sel000025.result
BitKeeper/deleted/.del-sel000026.result~854fa951666b7982:
  Delete: mysql-test/r/sel000026.result
BitKeeper/deleted/.del-sel000027.result~cfd73fe738f27da:
  Delete: mysql-test/r/sel000027.result
BitKeeper/deleted/.del-sel000028.result~13ff5add6ac24908:
  Delete: mysql-test/r/sel000028.result
BitKeeper/deleted/.del-sel000029.result~c6d071781808aa26:
  Delete: mysql-test/r/sel000029.result
BitKeeper/deleted/.del-sel000030.result~98d496948e15064d:
  Delete: mysql-test/r/sel000030.result
BitKeeper/deleted/.del-alt000001.test~633aed61c4bad94c:
  Delete: mysql-test/t/alt000001.test
BitKeeper/deleted/.del-alt000001.result~393103dbf15f35c9:
  Delete: mysql-test/r/alt000001.result
BitKeeper/deleted/.del-mrg000001.dummy.result~bf7e6d609f22b897:
  Delete: mysql-test/r/mrg000001.dummy.result
BitKeeper/deleted/.del-mrg000001.result~db2ef2e717ab8332:
  Delete: mysql-test/r/mrg000001.result
BitKeeper/deleted/.del-mrg000002.result~745be0854aaaaf5e:
  Delete: mysql-test/r/mrg000002.result
BitKeeper/deleted/.del-mrg000001.test~e0327f9d1e6cb4e:
  Delete: mysql-test/t/mrg000001.test
BitKeeper/deleted/.del-mrg000002.test~16b3a176adc0f311:
  Delete: mysql-test/t/mrg000002.test
Docs/manual.texi:
  Changelog
client/mysqlimport.c:
  Added support for hex strings
client/mysqltest.c:
  Added linenumbers in output
  Only allow '{' first on a row (Conflicts with ODBC {} syntax).
  Handle bigger queries.
  Handle double ''
  Truncate result files.
mysql-test/mysql-test-run.sh:
  Added --verbose
  cleanup
mysql-test/r/bdb.result:
  Updating of test
mysql-test/r/func_crypt.result:
  Updating of test
mysql-test/r/func_equal.result:
  Updating of test
mysql-test/r/func_str.result:
  Updating of test
mysql-test/r/ins000001.result:
  Updating of test
mysql-test/t/bdb.test:
  Updating of test
mysql-test/t/err000001.test:
  Updating of test
mysql-test/t/func_crypt.test:
  Updating of test
mysql-test/t/func_equal.test:
  Updating of test
mysql-test/t/func_str.test:
  Updating of test
mysql-test/t/ins000001.test:
  Updating of test
sql/gen_lex_hash.cc:
  Smaller table
sql/handler.cc:
  Fixed bug in auto_commit

f537319d

27 Dec, 2000 2 commits

manual.texi Updated contrib link. · bf68afa8
unknown authored Dec 27, 2000
```
Docs/manual.texi:
  Updated contrib link.
```
bf68afa8

Extended mysqltest with --commands and 'require' · e56db858

unknown authored Dec 27, 2000

Fixed test results.
Added mysqld variable 'have_isam'


BitKeeper/deleted/.del-master-slave.inc~556fd038c3a3d54:
  Delete: mysql-test/t/include/master-slave.inc
BitKeeper/deleted/.del-README~f9fd36f3c3711305:
  Delete: mysql-test/r/3.23/README
Docs/manual.texi:
  Fixed typos
client/mysqltest.c:
  Changed internal commands to accept -- before them.
  Added command 'require' to make it possible to skip tests if the
  mysqld server lacks some capabilites.
  Removed extra \t at end of lines
configure.in:
  Update
myisam/myisamlog.c:
  cleanup
mysql-test/mysql-test-run.sh:
  Added support for 'not supported' tests
mysql-test/r/alt000001.result:
  Removed end tab
mysql-test/r/bdb.result:
  Removed end tab
mysql-test/r/crypt.result:
  Removed end tab
mysql-test/r/equal.result:
  Removed end tab
mysql-test/r/ft0000001.a.result:
  Removed end tab
mysql-test/r/ft0000001.b.result:
  Removed end tab
mysql-test/r/ft0000001.c.result:
  Removed end tab
mysql-test/r/ft0000001.d.result:
  Removed end tab
mysql-test/r/ft0000001.e.result:
  Removed end tab
mysql-test/r/ft0000002.a.result:
  Removed end tab
mysql-test/r/ft0000002.b.result:
  Removed end tab
mysql-test/r/ft0000002.c.result:
  Removed end tab
mysql-test/r/ins000001.result:
  Removed end tab
mysql-test/r/mrg000001.dummy.result:
  Removed end tab
mysql-test/r/mrg000001.result:
  Removed end tab
mysql-test/r/mrg000002.result:
  Removed end tab
mysql-test/r/rpl000001.a.result:
  Removed end tab
mysql-test/r/rpl000001.b.result:
  Removed end tab
mysql-test/r/rpl000002.result:
  Removed end tab
mysql-test/r/rpl000003.result:
  Removed end tab
mysql-test/r/rpl000004.a.result:
  Removed end tab
mysql-test/r/rpl000004.b.result:
  Removed end tab
mysql-test/r/rpl000005.result:
  Removed end tab
mysql-test/r/rpl000006.result:
  Removed end tab
mysql-test/r/rpl000007.result:
  Removed end tab
mysql-test/r/rpl000008.result:
  Removed end tab
mysql-test/r/rpl000009.result:
  Removed end tab
mysql-test/r/rpl000010.result:
  Removed end tab
mysql-test/r/rpl000011.result:
  Removed end tab
mysql-test/r/rpl000012.result:
  Removed end tab
mysql-test/r/rpl000012.status.result:
  Removed end tab
mysql-test/r/rpl000013.result:
  Removed end tab
mysql-test/r/rpl000013.status.result:
  Removed end tab
mysql-test/r/rpl000014.result:
  Removed end tab
mysql-test/r/rpl000015.result:
  Removed end tab
mysql-test/r/rpl000016.result:
  Removed end tab
mysql-test/r/sel000001.result:
  Removed end tab
mysql-test/r/sel000002.result:
  Removed end tab
mysql-test/r/sel000003.result:
  Removed end tab
mysql-test/r/sel000004.result:
  Removed end tab
mysql-test/r/sel000005.result:
  Removed end tab
mysql-test/r/sel000006.result:
  Removed end tab
mysql-test/r/sel000007.result:
  Removed end tab
mysql-test/r/sel000008.result:
  Removed end tab
mysql-test/r/sel000009.result:
  Removed end tab
mysql-test/r/sel000010.result:
  Removed end tab
mysql-test/r/sel000011.result:
  Removed end tab
mysql-test/r/sel000012.result:
  Removed end tab
mysql-test/r/sel000013.result:
  Removed end tab
mysql-test/r/sel000014.result:
  Removed end tab
mysql-test/r/sel000015.result:
  Removed end tab
mysql-test/r/sel000016.result:
  Removed end tab
mysql-test/r/sel000017.result:
  Removed end tab
mysql-test/r/sel000018.result:
  Removed end tab
mysql-test/r/sel000019.result:
  Removed end tab
mysql-test/r/sel000020.result:
  Removed end tab
mysql-test/r/sel000021.result:
  Removed end tab
mysql-test/r/sel000022.result:
  Removed end tab
mysql-test/r/sel000023.result:
  Removed end tab
mysql-test/r/sel000024.result:
  Removed end tab
mysql-test/r/sel000025.result:
  Removed end tab
mysql-test/r/sel000026.result:
  Removed end tab
mysql-test/r/sel000027.result:
  Removed end tab
mysql-test/r/sel000028.result:
  Removed end tab
mysql-test/r/sel000029.result:
  Removed end tab
mysql-test/r/sel000030.result:
  Removed end tab
mysql-test/r/sel000031.result:
  Removed end tab
mysql-test/r/sel000032.result:
  Removed end tab
mysql-test/r/sel000033.result:
  Removed end tab
mysql-test/r/sel000100.result:
  Removed end tab
mysql-test/r/shw000001.result:
  Removed end tab
mysql-test/r/slave-running.result:
  Removed end tab
mysql-test/r/slave-stopped.result:
  Removed end tab
mysql-test/t/bdb.test:
  Check that we have BDB support
mysql-test/t/replace.test:
  Check if we support ISAM tables
sql/gen_lex_hash.cc:
  Fixed bug in last output
sql/ha_berkeley.cc:
  Bug fix
sql/ha_berkeley.h:
  Initialize using_ignore
sql/handler.h:
  Fixed typo
sql/mysqld.cc:
  Fixed typos;  Added variable 'have_isam'
sql/sql_class.h:
  Fixed typo
BitKeeper/etc/ignore:
  Added sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686 to the ignore list

e56db858

26 Dec, 2000 6 commits

Merge · c493b5ec
unknown authored Dec 26, 2000
```
sql/sql_show.cc:
  merged
```
c493b5ec
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql · 74bb64d3
unknown authored Dec 26, 2000
```
BitKeeper/etc/ignore:
  added sql-bench/output/*
Docs/manual.texi:
  Auto merged
```
74bb64d3

--safe-show-db and have_xxx variables · d70e5caa

unknown authored Dec 26, 2000


Docs/manual.texi:
  Added MySQL usage & MySQL supporters
sql/gen_lex_hash.cc:
  Smaller region
sql/mysql_priv.h:
  --safe-show-db

d70e5caa

ha_berkeley.cc - Don't use subtransactions in update_row by default · 3417bf64

unknown authored Dec 26, 2000

ha_berkeley.cc	- Use the DB_RMW (read, modify, write) flag when removing a key
ha_berkeley.h	- Don't use subtransactions in update_row by default
sql_table.cc	- Don't use subtransactions in update_row by default
bdb.result	BitKeeper file /usr/home/tim/my/work/mysql-test/r/bdb.result
bdb.test	BitKeeper file /usr/home/tim/my/work/mysql-test/t/bdb.test


sql/ha_berkeley.cc:
  - Don't use subtransactions in update_row by default
  - Use the DB_RMW (read, modify, write) flag when removing a key
sql/ha_berkeley.h:
  - Don't use subtransactions in update_row by default
sql/sql_table.cc:
  - Don't use subtransactions in update_row by default

3417bf64

Merge · 9b3ebee2
unknown authored Dec 26, 2000
```
configure.in:
  SCCS merged
```
9b3ebee2
configure.in --without-raid should not #define USE_RAID · 70c7b3c0
unknown authored Dec 26, 2000
```
configure.in:
  --without-raid should not #define USE_RAID
```
70c7b3c0

24 Dec, 2000 5 commits

manual.texi Contrib entry. · 910e932d
unknown authored Dec 24, 2000
```
Docs/manual.texi:
  Contrib entry.
```
910e932d

Merge · c0965de3

unknown authored Dec 24, 2000


include/raid.h:
  merged
sql/sql_show.cc:
  merged

c0965de3

Fix duplicate symbol problem · 740f328e
unknown authored Dec 24, 2000

740f328e

merge · 967c1b04

unknown authored Dec 24, 2000


configure.in:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

967c1b04

New benchmark test · 78cf07c8

unknown authored Dec 24, 2000

Fixed bug in REPLACE with BDB tables
Prepare for write lock on read for BDB
Inform the handler when we want to use IGNORE / REPLACE
New manual pages


Docs/manual.texi:
  Updates for BDB tables and new changes
client/mysql.cc:
  Cleanup
configure.in:
  Added sys/ioctl.h
heap/hp_rkey.c:
  Fixed bug when reading next on not unique key
include/my_base.h:
  Added new extra options
man/mysql.1:
  Added example
mysys/my_write.c:
  Safety fix
scripts/mysqlaccess.sh:
  Removed debug output
scripts/safe_mysqld.sh:
  Added --open-files-limit
sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686:
  Updated to new benchmark
sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686:
  Updated to new benchmark
sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686:
  Updated to new benchmark
sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686:
  Updated to new benchmark
sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686:
  Updated to new benchmark
sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686:
  Updated to new benchmark
sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686:
  Updated to new benchmark
sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686:
  Updated to new benchmark
sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686:
  Updated to new benchmark
sql-bench/bench-init.pl.sh:
  Updated to new benchmark
sql-bench/server-cfg.sh:
  Fixes for HEAP tables
sql-bench/test-ATIS.sh:
  Fix for heap tables
sql-bench/test-insert.sh:
  Added some ORDER BY benchmarks to test more things
sql/ha_berkeley.cc:
  Fix a bug in REPLACE
sql/ha_berkeley.h:
  Fix to handle lock_on_read
sql/mysql_priv.h:
  Prepare for internal subtransactions in BDB
sql/mysqld.cc:
  Added -O open_files_limit=#
sql/sql_insert.cc:
  Inform the handler when we want to use IGNORE / REPLACE
sql/sql_load.cc:
  Inform the handler when we want to use IGNORE / REPLACE
sql/sql_parse.cc:
  Cleanup
sql/sql_show.cc:
  Cleanup
sql/sql_table.cc:
  Inform the handler when we want to use IGNORE / REPLACE
sql/sql_update.cc:
  Inform the handler when we want to use IGNORE / REPLACE
support-files/binary-configure.sh:
  Better message

78cf07c8

23 Dec, 2000 1 commit

raid.h moved my_raid_type() out of #ifdef USE_RAID · 88551708

unknown authored Dec 23, 2000

sql_show.cc	#define USE_RAID removed


sql/sql_show.cc:
  #define USE_RAID removed
include/raid.h:
  moved my_raid_type() out of #ifdef USE_RAID

88551708

22 Dec, 2000 9 commits

gone fixed (hopefully) · 25e911fa
unknown authored Dec 22, 2000
```
BitKeeper/etc/gone:
  fixed (hopefully)
```
25e911fa

Merge · 7e681f11

unknown authored Dec 22, 2000


BitKeeper/etc/gone:
  auto-merge
mysql-test/mysql-test-run.sh:
  merged

7e681f11

mysql-test-run.sh remove *.reject before testing · a93f2941

unknown authored Dec 22, 2000

mrg000001.test	clean merge tables for other tests to work
mysqltest.c	always compare vs. @result if any
mrg000002.result	corrected


mysql-test/r/mrg000002.result:
  corrected
client/mysqltest.c:
  always compare vs. @result if any
mysql-test/t/mrg000001.test:
  clean merge tables for other tests to work
mysql-test/mysql-test-run.sh:
  remove *.reject before testing

a93f2941

Style fix - keep os-specific stuff together. · c80fe386

unknown authored Dec 22, 2000


configure.in:
  - move extra bsdi fix up with other os-specific hacks
include/global.h:
  - move extra bsdi fix up with other os-specific hacks

c80fe386

Merge work.mysql.com:/home/bk/mysql · 19399bab
unknown authored Dec 22, 2000
```
into cane.mysql.fi:/usr/home/tim/my/work
```
19399bab
Fatfinger fix: SLAVE_MASTER_INF -> INFO. · 11df2ead
unknown authored Dec 22, 2000
```
mysql-test/mysql-test-run.sh:
  - fix typo introduced in previous commit
```
11df2ead

Fix replace bug w/ BDB tables by passing key_length to index_read_idx. · c326c649

unknown authored Dec 22, 2000


mysql-test/t/replace.test:
  - test replace with an extra row that has a higher key value
sql/sql_insert.cc:
  - pass real key length to index_read_idx, instead of relying on the
    table handler to convert 0 -> key_length (fixes replace bug in BDB)

c326c649

Fix bug in FINISH.sh that kept CFLAGS from being used. · 4a1f883b

unknown authored Dec 22, 2000

Allow multiple options to be passed to mysql-test-run.


BUILD/FINISH.sh:
  - use CFLAGS properly
mysql-test/mysql-test-run.sh:
  - allow multiple options (e.g., --gcov --force)

4a1f883b

sql_show.cc added RAID_* options to SHOW CREATE output · a5dcfbf9
unknown authored Dec 22, 2000
```
sql/sql_show.cc:
  added RAID_* options to SHOW CREATE output
```
a5dcfbf9

21 Dec, 2000 3 commits

Merge work.mysql.com:/home/bk/mysql · a09659dd

unknown authored Dec 21, 2000

into cane.mysql.fi:/usr/home/tim/my/work


acconfig.h:
  Auto merged
configure.in:
  Auto merged

a09659dd

Test replace on all table types. · 9cecbe9b
unknown authored Dec 21, 2000
```
Test delete from BDB table using hidden primary key.
```
9cecbe9b

Makefile bug fixes. · 97679a92

unknown authored Dec 21, 2000


libmysql/Makefile.am:
  - Makefile.shared should be part of the distribution
libmysql/Makefile.shared:
  - strto.lo should not be built

97679a92