Commits · e373f3cccff790fda329de9de13555ef472c86d1 · nexedi / MariaDB

24 Sep, 2003 11 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · e373f3cc
unknown authored Sep 25, 2003
```
into mysql.com:/home/dlenev/src/mysql-4.0-bgrn


sql/log_event.cc:
  Auto merged
```
e373f3cc
Fixed BUG#1357 MySQL too eagerly cleanups temporary files for LOAD DATA (SQL_LOAD-...) · b608c790
unknown authored Sep 25, 2003
```
sql/log_event.cc:
  Now cleaning up only our files during processing of Start_log_event
```
b608c790
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 699f3175
unknown authored Sep 24, 2003
```
into mysql.com:/home/mysql_src/mysql-4.0
```
699f3175

Fix for · 874783ab

unknown authored Sep 24, 2003

Bug #1392 "On Win, slave leaves one temp file after successf. replicating LOAD DATA INFILE"
Windows-specific bug (we forgot to close a file before deleting it).
Patch written by me, tested by Miguel (thanks!) and it works.


sql/log.cc:
  changed the comment to mean the truth
sql/log_event.cc:
  When you finish replicating LOAD DATA INFILE, close the SQL_LOADxxx.data file
  before deleting it, or Windows will refuse to delete.
  No need to do the same thing for the SQL_LOADxxx.data file, it's not opened
  at this moment.

874783ab

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 · 052f9bc3
unknown authored Sep 24, 2003
```
into gw.mysql.r18.ru:/usr/home/ram/work/4.0
```
052f9bc3
Added MYSQL_BINLOG variable. · 97933001
unknown authored Sep 24, 2003

97933001
Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · d3def9c5
unknown authored Sep 24, 2003
```
into narttu.mysql.fi:/my/mysql-4.0
```
d3def9c5
Correct fix for buffer overruns for compressed blobs. · 931633bb
unknown authored Sep 24, 2003
```
(Bugs #770, #1304 and maybe #1295)
```
931633bb
#1169: Add --exec command to mysqltest · 9e2b97fb
unknown authored Sep 24, 2003

9e2b97fb
A fix. Please never use 'ulong' here! · 272b8d24
unknown authored Sep 24, 2003
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
272b8d24

Merge script with 4.1 · addd5364

unknown authored Sep 24, 2003


scripts/mysql_fix_privilege_tables.sql:
  Merge with 4.1
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

addd5364

23 Sep, 2003 3 commits

Code cleanup of new patches · 792aa09e
unknown authored Sep 23, 2003
```
mysys/mf_dirname.c:
  Added comments
```
792aa09e
Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 58ec8f35
unknown authored Sep 23, 2003
```
into narttu.mysql.fi:/my/mysql-4.0


extra/comp_err.c:
  Auto merged
```
58ec8f35

Block SIGPIPE also for not threaded client programs. · a86e11ef

unknown authored Sep 23, 2003

Added --include and --libs_r options to mysql_config.
Added mysql_get_client_version() to client library
Fixed some minor benchmark issues



acinclude.m4:
  Fixed that 'no' is printed if openssl not used
configure.in:
  Fixed error message
extra/comp_err.c:
  Skip lines before first {
include/mysql.h:
  Indentation cleanup
libmysql/libmysql.c:
  Block SIGPIPE also for not threaded programs.
  This is now done once in mysql_server_init() and not for every call to mysql_init().
  Added mysql_get_client_version()
libmysql/libmysql.def:
  added mysql_get_client_version
scripts/Makefile.am:
  Add openssl libraries to mysql_config
scripts/mysql_config.sh:
  Added options --include and --libs_r
  Added C compiler options to 'cflags'
scripts/mysql_install_db.sh:
  Fixed tests with IN_RPM to not give warnings
sql-bench/bench-init.pl.sh:
  Updated version number
sql-bench/server-cfg.sh:
  Remove duplicate line
sql-bench/test-alter-table.sh:
  Increase loops for more relevant test
sql-bench/test-select.sh:
  Fix wrong test for count_distinct_2
tests/mail_to_db.pl:
  Default db and table for easier usage

a86e11ef

20 Sep, 2003 1 commit
- Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · f46ca5fb
  unknown authored Sep 20, 2003
```
into mysql.com:/home/dlenev/src/mysql-4.0-opssl
```
  f46ca5fb
19 Sep, 2003 8 commits

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 0a58c2ae
unknown authored Sep 19, 2003
```
into mysql.com:/home/mysql_src/mysql-4.0
```
0a58c2ae

removing my chmods so that the test can be run on non-Unix platforms · 11c19587

unknown authored Sep 19, 2003

(kind request from the Novell team).
Note that old chmods in rpl_rotate_logs remain.


mysql-test/r/rpl000009.result:
  result update
mysql-test/t/rpl000009.test:
  removing my chmods so that the test can be run on non-Unix platforms.

11c19587

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 077cea73
unknown authored Sep 19, 2003
```
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340
```
077cea73
Bugfix for bug #1340, style fix before push · 992587f4
unknown authored Sep 19, 2003
```
client/mysqlbinlog.cc:
  Small fix to avoid double initialization
```
992587f4

- fixed several typos ("uppdate"->"update" and "tryed"->"tried") · d59e2b8f

unknown authored Sep 19, 2003


extra/comp_err.c:
   - fixed typo: "uppdate" -> "update"
heap/hp_test2.c:
   - fixed typo: "uppdate" -> "update"
   - fixed typo: "tryed" -> "tryed"
isam/test2.c:
   - fixed typo: "uppdate" -> "update"
   - fixed typo: "tryed" -> "tryed"
myisam/mi_test2.c:
   - fixed typo: "uppdate" -> "update"
   - fixed typo: "tryed" -> "tryed"

d59e2b8f

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · f89e03fd
unknown authored Sep 19, 2003
```
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340


client/mysqlbinlog.cc:
  Auto merged
```
f89e03fd
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 · eac3b068
unknown authored Sep 19, 2003
```
into eagle.mysql.r18.ru:/home/vva/work/BUG_1073/mysql-4.0


client/mysqlbinlog.cc:
  Auto merged
```
eac3b068

Fix for bug #1340 (More careful checks if we met proper Create_file_log_event... · 2a036dfa

unknown authored Sep 19, 2003

Fix for bug #1340 (More careful checks if we met proper Create_file_log_event before Append or Exec event we are processing now)

client/mysqlbinlog.cc:
More accurate checks if Create_file_log_event is absent for this Append or Exec event...

2a036dfa

17 Sep, 2003 8 commits
- - force the removal of /var/lock/subsys/mysql on MySQL shutdown · 31109b2c
  unknown authored Sep 17, 2003
  
  31109b2c
- Fixed Bug#1291, client displays wrong prompt when in the middle of · 49372683
  unknown authored Sep 17, 2003
```
backticks.
```
  49372683
- Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 5df627d4
  unknown authored Sep 17, 2003
```
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
```
  5df627d4
- Fixed a bug in default.c, which caused quoted arguments not · b60a71c6
  unknown authored Sep 17, 2003
```
being read correctly from my.cnf.
```
  b60a71c6
- Applied Monty corrections to the FULL SCAN · c5e6bcea
  unknown authored Sep 17, 2003
```
optimiser bug patch.


mysql-test/r/distinct.result:
  test results reverted
mysql-test/r/order_by.result:
  test results reverted
sql/sql_select.cc:
  found_constrain renamed to found_constraint
  We don't perform full cartesian product in 
  case when JOIN BUFFER is used: it was taken
  into account.
  s->read_time may contain range index read time,
  so to get full table scan time is necessary to
  call s->table->file->scan_time().
```
  c5e6bcea
- Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0 · d8fd2ad9
  unknown authored Sep 17, 2003
```
into oak.local:/home/kostja/mysql/mysql-4.0-root
```
  d8fd2ad9
- fixed test result to be in sync with the optimiser · 524fe47d
  unknown authored Sep 17, 2003
  
  524fe47d
- Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · cfdd9890
  unknown authored Sep 17, 2003
```
into narttu.mysql.fi:/my/mysql-4.0
```
  cfdd9890
16 Sep, 2003 6 commits

Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0 · 65cf37d3
unknown authored Sep 16, 2003
```
into mysql.com:/space/my/mysql-4.0
```
65cf37d3
Merge oak.local:/home/kostja/mysql/mysql-4.0-root · a3056ade
unknown authored Sep 16, 2003
```
into oak.local:/home/kostja/mysql/mysql-4.0-rightnow
```
a3056ade
comment made more explanatory · 8c3e900e
unknown authored Sep 16, 2003

8c3e900e

select.test cleanup · cac860c7

unknown authored Sep 16, 2003


mysql-test/r/select.result:
  unnecessary info removed from result
mysql-test/t/select.test:
  unnecessary info don't get into result any more

cac860c7

More explicit error messages from myisamchk · bfc155f0
unknown authored Sep 16, 2003
```
myisam/mi_check.c:
  More explicit error messages
myisam/mi_dynrec.c:
  More comments
```
bfc155f0

join buffer cache usage/not usage is taken · 4a32d2e1

unknown authored Sep 16, 2003

into account to increase the cost of FULL SCAN


sql/sql_select.cc:
  more accurate FULL SCAN cost estimation:
  join buffer cache usage/not usage is taken
  into account to increase the cost

4a32d2e1

15 Sep, 2003 3 commits

Merge oak.local:/home/kostja/mysql/mysql-4.0-root · 447f3981
unknown authored Sep 16, 2003
```
into oak.local:/home/kostja/mysql/mysql-4.0-rightnow
```
447f3981
Merge gweir@build.mysql.com:/home/bk/mysql-4.0 · dae83b4a
unknown authored Sep 15, 2003
```
into mysql.com:/home/greg/bk/4.0
```
dae83b4a

Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra... · 4c8bc54b

unknown authored Sep 15, 2003

Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra myTest.dsp to be copied into distributions as a fix for BUG#999

BitKeeper/deleted/.del-.fgl~c7d07ad3164a2b48:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl
BitKeeper/deleted/.del-Clients and Tools.fgl~cfedc4432bdca9d:
Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~aa4045acaf293d36:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fdf~89b2af9ae5059f62:
Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.fgl~46b97f4278325e8:
Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fgl
BitKeeper/deleted/.del-Default.fgl~b9558db492415763:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Development.fgl~8207e98594fe0bee:
Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Development.fgl
BitKeeper/deleted/.del-Documentation.fgl~dbd86cfa42705734:
Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~1c366d3557e024bf:
Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-Default.rge~d816fd8cef3f06d5:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Registry Entries/Default.rge
BitKeeper/deleted/.del-MySQL 3.23.XX-GPL.ipr~3116ab4aa52a6b44:
Delete: VC++Files/InstallShield/3.23.XX-gpl/MySQL 3.23.XX-GPL.ipr
BitKeeper/deleted/.del-Servers.fgl~c809b9515fd51041:
Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Servers.fgl
BitKeeper/deleted/.del-Setup.dbg~f8ba4a87c5dd90a9:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~cb1fefacb45841a:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ino
BitKeeper/deleted/.del-Setup.ins~6946c5065a12572d:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~33bf58c825ff3ac8:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.obs
BitKeeper/deleted/.del-Setup.rul~8cc4dee41dcb733f:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.rul
BitKeeper/deleted/.del-Build.tsb~43a1c0d54abb5a44:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Default.shl~4bc5f71f8f0bd822:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Shell Objects/Default.shl
BitKeeper/deleted/.del-Default.shl~8b61f648197f5de3:
Delete: VC++Files/InstallShield/3.23.XX-gpl/String Tables/Default.shl
BitKeeper/deleted/.del-SETUP.BMP~1e85725234603bfe:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
BitKeeper/deleted/.del-Setup.tsb~5344bdc39c0e9884:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-infolist.txt~58b203247936d266:
Delete: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-value.shl~98c2851db96b919e:
Delete: VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl
BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d:
Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/.fgl
BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365:
Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e:
Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477:
Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131:
Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4:
Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fgl
BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81:
Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Development.fgl
BitKeeper/deleted/.del-Default.rge~2218627c2a901409:
Delete: VC++Files/InstallShield/3.23.XXcom/Registry Entries/Default.rge
BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d:
Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90:
Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e:
Delete: VC++Files/InstallShield/3.23.XXcom/MySQL 3.23.com.ipr
BitKeeper/deleted/.del-Servers.fgl~36147accb82f759:
Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Servers.fgl
BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34:
Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722:
Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ino
BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9:
Delete: VC++Files/InstallShield/3.23.XXcom/Shell Objects/Default.shl
BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903:
Delete: VC++Files/InstallShield/3.23.XXcom/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e:
Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6:
Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.obs
BitKeeper/deleted/.del-Setup.rul~14510a994d515f19:
Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.rul
BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97:
Delete: VC++Files/InstallShield/3.23.XXcom/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74:
Delete: VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28:
Delete: VC++Files/InstallShield/3.23.XXcom/String Tables/Default.shl
BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a:
Delete: VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d:
Delete: VC++Files/InstallShield/3.23.XXcom/String Tables/0009-English/value.shl
BitKeeper/etc/ignore:
Added hardcopy.0 to the ignore list
VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl:
Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl:
Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl:
Add VERSION tags for automation
scripts/make_win_src_distribution.sh:
Improved unix to DOS conversion, add processing of version tags in InstallShield files

4c8bc54b