Commits · 012ffb5d505cc563ae980bd8cbee9b668f517cac · Kirill Smelkov / mariadb

10 Mar, 2003 6 commits

Merge with 3.23 to get fixes for --user and BACKUP TABLE · 012ffb5d

unknown authored Mar 10, 2003


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Delete: mysql-test/r/delete.result
BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysys/my_copy.c:
  Auto merged
sql/field.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge with 3.23.56
mysql-test/r/backup.result:
  merge (needs to be updated)
mysql-test/r/join.result:
  merge (needs to be updated)
mysql-test/r/type_datetime.result:
  merge (needs to be updated)
mysql-test/t/backup.test:
  merge with 3.23
scripts/mysqld_safe.sh:
  Only use first --user option
sql/ha_myisam.cc:
  Don't let BACKUP TABLE overwrite old files
sql/log_event.h:
  merge
sql/mysql_priv.h:
  merge
sql/mysqld.cc:
  Use first --user option
sql/slave.cc:
  use local version
sql/sql_repl.h:
  use local version

012ffb5d

Don't allow multiple --user options to mysqld · 73c2d4ad

unknown authored Mar 10, 2003

(First one is used)


scripts/safe_mysqld.sh:
  Don't allow multiple --user options
sql/mysqld.cc:
  Don't allow multiple --user options

73c2d4ad

Fix that round(0.1,1) == round(0.1,1) · 66e8db82
unknown authored Mar 10, 2003
```
sql/slave.cc:
  Fixed problem with --debug output in handle_slave
```
66e8db82
Better fix for connect timeout problem. · 281ad254
unknown authored Mar 10, 2003

281ad254
Merge bk-internal.mysql.com:/home/bk/mysql-3.23 · ea826f21
unknown authored Mar 10, 2003
```
into narttu.mysql.fi:/my/mysql-3.23
```
ea826f21

Don't allow BACKUP TABLE to overwrite files · 68ae3653

unknown authored Mar 10, 2003

Fixed memory leak when replication restarts in debug mode


include/my_sys.h:
  Added option to not overwrite files to my_copy()
mysql-test/mysql-test-run.sh:
  Fixed --ddd option
  Fixed that mysqld is restarted if there is a testname-master.sh file
mysql-test/r/backup.result:
  Update for security fix in BACKUP TABLE
mysql-test/t/backup.test:
  Update for security fix in BACKUP TABLE
mysys/my_copy.c:
  Added option to not overwrite files to my_copy()
sql/ha_myisam.cc:
  Don't allow BACKUP TABLE to overwrite files
sql/slave.cc:
  Fixed problem with --debug output from 'handle_slave'
  Fixed memory leak when replication restarts in debug mode

68ae3653

09 Mar, 2003 2 commits

Merge build:/home/bk/mysql-3.23 · aa0f5c8e
unknown authored Mar 10, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql
```
aa0f5c8e

.del-stamp-h.in~4a5d6676232516c5: · 6c366f8d

unknown authored Mar 10, 2003

  Delete: innobase/stamp-h.in


BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5:
  Delete: innobase/stamp-h.in

6c366f8d

08 Mar, 2003 2 commits
- Additional bug fix · ec6bd7a4
  unknown authored Mar 08, 2003
```
libmysql/libmysql.c:
  Additional fix for connection being established during select()
```
  ec6bd7a4
- A correct fix for the timeout problem · f5144a8a
  unknown authored Mar 08, 2003
  
  f5144a8a
07 Mar, 2003 1 commit

Fixed an unlikely optimizer bug that casued a core dump in pt_range.cc::sel_cmp() · 157b3667

unknown authored Mar 07, 2003


mysql-test/r/join.result:
  Test of range optimizer bug
mysql-test/t/join.test:
  Test of range optimizer bug
sql/sql_rename.cc:
  Added missing DEBUG_PRINT()

157b3667

05 Mar, 2003 2 commits
- Merge sinisa@work.mysql.com:/home/bk/mysql · 5861dc5b
  unknown authored Mar 05, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql


sql/mysql_priv.h:
  Auto merged
```
  5861dc5b
- A better, but larger fix for server_id bug .. · a300406b
  unknown authored Mar 05, 2003
  
  a300406b
04 Mar, 2003 8 commits

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql · 4016096b
unknown authored Mar 04, 2003

4016096b

fixed Field::eq() to work with CHAR(0) fields · 8529b744

unknown authored Mar 04, 2003


BitKeeper/etc/ignore:
  Added configure.lineno innobase/configure.lineno to the ignore list

8529b744

Fix for SHOW VARIABLES on 64-bit platforms · 5247c5bf
unknown authored Mar 04, 2003

5247c5bf

Merge with 3.23 to get fix for deadlock when doing LOCK TABLES in one thread... · 065bedc5

unknown authored Mar 04, 2003

Merge with 3.23 to get fix for deadlock when doing LOCK TABLES in one thread and DROP TABLE in another thread


sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_rename.cc:
  merge
sql/sql_table.cc:
  merge

065bedc5

Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 · 7a88d2cc

unknown authored Mar 04, 2003


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/handler.cc:
  Auto merged

7a88d2cc

Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table... · 3446199d

unknown authored Mar 04, 2003

Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped


client/mysqltest.c:
  Fixed bug that comments did a ping
include/thr_lock.h:
  Added function to abort a lock for a specific thread
mysql-test/mysql-test-run.sh:
  Fixed where mysqltest traces are put
mysql-test/r/lock_multi.result:
  Test for LOCK TABLE + DROP TABLE bug
mysql-test/t/lock_multi.test:
  Test for LOCK TABLE + DROP TABLE bug
mysys/thr_lock.c:
  Added function to abort a lock for a specific thread
sql/handler.cc:
  Indentation cleanup
sql/lock.cc:
  Added function to abort a lock for a specific thread
sql/mysql_priv.h:
  Added function to abort a lock for a specific thread
sql/mysqld.cc:
  Use automatic recover even with --safe

3446199d

New build scripts for NetWare · aeee04d2

unknown authored Mar 03, 2003


BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
  Delete: netware/mw/mwenv
BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5:
  Delete: netware/mw/mwasmnlm
BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f:
  Delete: netware/mw/mwccnlm
BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980:
  Delete: netware/mw/mwldnlm

aeee04d2

novell40b.patch · 5de78932

unknown authored Mar 03, 2003


netware/mysql_fix_privilege_tables.pl:
  Import patch novell40b.patch

5de78932

03 Mar, 2003 7 commits

Fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another · 374ea106

unknown authored Mar 03, 2003


sql/lock.cc:
  Added functions to handle list of table name locks
sql/mysql_priv.h:
  Added functions to handle list of named locks
sql/sql_rename.cc:
  Use new general table name lock functions
sql/sql_table.cc:
  Require table name locks when doing drop table.
  This fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another

374ea106

Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0 · dd67a176
unknown authored Mar 03, 2003
```
into mysql.com:/space/my/mysql-4.0
```
dd67a176

ha_innodb.h, ha_innodb.cc, handler.h, handler.cc, sql_class.cc: · e70b22e5

unknown authored Mar 03, 2003

Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

sql/sql_class.cc:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/handler.cc:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/handler.h:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/ha_innodb.cc:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/ha_innodb.h:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

e70b22e5

Merge sinisa@work.mysql.com:/home/bk/mysql · 8aff7ae9
unknown authored Mar 03, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql
```
8aff7ae9

- added option "--skip-dmg" to skip the building of the disk image after · 8c689249

unknown authored Mar 03, 2003

   packaging
 - enclosed some variables in quotes for safeguarding
 - add a license file (GPL or MySQLEULA) to the package so it will be
   displayed during installation (needs to be tested)

8c689249

srv0start.c: · 9ca8f137

unknown authored Mar 03, 2003

Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf

innobase/srv/srv0start.c:
Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf

9ca8f137

Replication: small bug fixes in mysql-test-run.sh and in replication code (more reinitializations) · 28554150

unknown authored Mar 03, 2003

+ fix for #70 
+ test result fix for LOAD DATA LOCAL bug #82


client/mysqltest.c:
  Removed wrong comment and useless sleep
mysql-test/mysql-test-run.sh:
  Fix $slave_datadir variable because this
    if [ -n "$1" ] ; 
     slave_datadir="var/$slave_ident-data/"
    else
      slave_datadir=$SLAVE_MYDDIR
  was not coherent and led to problems of master.info not being deleted.
  Delete relay-log.info too.
mysql-test/r/rpl000001.result:
  SUM is 1022 (1021 was when we had the LOAD DATA LOCAL bug #82).
  It's logical to have an even number as we load the same file twice.
sql/slave.cc:
  When we RESET SLAVE, clear rli->master_log_* to give a good display in SHOW SLAVE STATUS ;
  seeing the old values may confuse the user.
  When we START SLAVE, clear rli->master_log_name, not only rli->master_log_pos.
sql/sql_repl.cc:
  When we RESET SLAVE, clear mi->master_log_* to give a good display in SHOW SLAVE STATUS (bug #70)

28554150

02 Mar, 2003 4 commits

trx0sys.c, trx0roll.c, srv0start.h: · 5387425a

unknown authored Mar 02, 2003

  Print trx rollback progress info in crash recovery


innobase/include/srv0start.h:
  Print trx rollback progress info in crash recovery
innobase/trx/trx0roll.c:
  Print trx rollback progress info in crash recovery
innobase/trx/trx0sys.c:
  Print trx rollback progress info in crash recovery

5387425a

ChangeSet 1.1625 was faulty as regards sql/mf_iocache.cc and LOAD DATA LOCAL replication tests · b331fe92

unknown authored Mar 02, 2003


mysql-test/r/rpl_loaddatalocal.result:
  ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)
mysql-test/t/rpl_loaddatalocal.test:
  ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)
sql/mf_iocache.cc:
  ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)

b331fe92

Merge work:/home/bk/mysql-4.0 · a2cc8218
unknown authored Mar 02, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
a2cc8218
fix auto-increment in sub-key and insert ... select · 6a933b2e
unknown authored Mar 02, 2003

6a933b2e

01 Mar, 2003 2 commits

Replication: simplification of init_relay_log_pos: always initialize, · 14ea63cd

unknown authored Mar 02, 2003

remove variable rli->log_pos_current.


sql/slave.cc:
  Simplification of init_relay_log_pos : always initialize,
  remove variable rli->log_pos_current.
sql/slave.h:
  Simplification of init_relay_log_pos : always initialize,
  remove variable rli->log_pos_current.

14ea63cd

When the SQL thread cannot read an event from the relay log · f29fb98d

unknown authored Mar 02, 2003

("Event too big" etc), stop this thread instead of going on
with the next event, which would certainly lead to slave's data
corruption.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

f29fb98d

28 Feb, 2003 6 commits

Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 · 4c0f2f45
unknown authored Feb 28, 2003

4c0f2f45

LOAD DATA INFILE is not replicated if replicate_*_table is set · b276b60e

unknown authored Feb 28, 2003

LOAD DATA LOCAL INFILE was not replicated correctly


VC++Files/bdb/bdb.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/Berkeley_DB.dsw:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_archive.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_buildall.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_checkpoint.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_deadlock.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_dll.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_dump.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_java.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_load.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_printlog.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_recover.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_stat.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_static.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_static1.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_tcl.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_test.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_upgrade.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_verify.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_access.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_btrec.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_env.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_lock.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_mpool.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_tpcb.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_access.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_btrec.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_env.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_lock.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_mpool.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_tpcb.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysql.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysqladmin.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysqlcheck.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysqlclient.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysqlclient.dsw:
  Updated VC++ files +end space removed
VC++Files/client/mysqldump.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysqlimport.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysqlshow.dsp:
  Updated VC++ files +end space removed
VC++Files/comp_err/comp_err.dsp:
  Updated VC++ files +end space removed
VC++Files/contrib/asm386/zlibvc.dsp:
  Updated VC++ files +end space removed
VC++Files/contrib/asm386/zlibvc.dsw:
  Updated VC++ files +end space removed
VC++Files/contrib/minizip/zlibvc.dsp:
  Updated VC++ files +end space removed
VC++Files/contrib/minizip/zlibvc.dsw:
  Updated VC++ files +end space removed
VC++Files/dbug/dbug.dsp:
  Updated VC++ files +end space removed
VC++Files/dbug/dbug.dsw:
  Updated VC++ files +end space removed
VC++Files/heap/heap.dsp:
  Updated VC++ files +end space removed
VC++Files/innobase/innobase.dsp:
  Updated VC++ files +end space removed
VC++Files/isam/isam.dsp:
  Updated VC++ files +end space removed
VC++Files/isam/isam.dsw:
  Updated VC++ files +end space removed
VC++Files/isamchk/isamchk.dsp:
  Updated VC++ files +end space removed
VC++Files/libmysql/libmysql.dsp:
  Updated VC++ files +end space removed
VC++Files/libmysql/libmysql.dsw:
  Updated VC++ files +end space removed
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Updated VC++ files +end space removed
VC++Files/libmysqld/libmysqld.dsp:
  Updated VC++ files +end space removed
VC++Files/libmysqltest/myTest.dsp:
  Updated VC++ files +end space removed
VC++Files/libmysqltest/mytest.dsw:
  Updated VC++ files +end space removed
VC++Files/merge/merge.dsp:
  Updated VC++ files +end space removed
VC++Files/merge/merge.dsw:
  Updated VC++ files +end space removed
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Updated VC++ files +end space removed
VC++Files/myisam/myisam.dsp:
  Updated VC++ files +end space removed
VC++Files/myisamchk/myisamchk.dsp:
  Updated VC++ files +end space removed
VC++Files/myisamlog/myisamlog.dsp:
  Updated VC++ files +end space removed
VC++Files/myisammrg/myisammrg.dsp:
  Updated VC++ files +end space removed
VC++Files/myisampack/myisampack.dsp:
  Updated VC++ files +end space removed
VC++Files/mysql.dsp:
  Updated VC++ files +end space removed
VC++Files/mysql.dsw:
  Updated VC++ files +end space removed
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqldemb/mysqldemb.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqlmanager/MySqlManager.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqlmanager/mysqlmanager.dsw:
  Updated VC++ files +end space removed
VC++Files/mysqlserver/mysqlserver.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqlshutdown/myshutdown.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Updated VC++ files +end space removed
VC++Files/mysys/mysys.dsp:
  Updated VC++ files +end space removed
VC++Files/mysys/mysys.dsw:
  Updated VC++ files +end space removed
VC++Files/pack_isam/pack_isam.dsp:
  Updated VC++ files +end space removed
VC++Files/perror/perror.dsp:
  Updated VC++ files +end space removed
VC++Files/regex/regex.dsp:
  Updated VC++ files +end space removed
VC++Files/regex/regex.dsw:
  Updated VC++ files +end space removed
VC++Files/replace/replace.dsp:
  Updated VC++ files +end space removed
VC++Files/sql/mysqld.dsp:
  Updated VC++ files +end space removed
VC++Files/sql/mysqld.dsw:
  Updated VC++ files +end space removed
VC++Files/sql/mysqldmax.dsp:
  Updated VC++ files +end space removed
VC++Files/sql/old/mysqld.dsw:
  Updated VC++ files +end space removed
VC++Files/strings/MASM6x/strings.dsp:
  Updated VC++ files +end space removed
VC++Files/strings/MASM6x/strings.dsw:
  Updated VC++ files +end space removed
VC++Files/strings/backup/strings.dsp:
  Updated VC++ files +end space removed
VC++Files/strings/backup/strings.dsw:
  Updated VC++ files +end space removed
VC++Files/strings/noMASM/strings.dsp:
  Updated VC++ files +end space removed
VC++Files/strings/noMASM/strings.dsw:
  Updated VC++ files +end space removed
VC++Files/strings/strings.dsp:
  Updated VC++ files +end space removed
VC++Files/strings/strings.dsw:
  Updated VC++ files +end space removed
VC++Files/test1/test1.dsp:
  Updated VC++ files +end space removed
VC++Files/thr_insert_test/thr_insert_test.dsp:
  Updated VC++ files +end space removed
VC++Files/thr_test/thr_test.dsp:
  Updated VC++ files +end space removed
VC++Files/vio/vio.dsp:
  Updated VC++ files +end space removed
VC++Files/zlib/zlib.dsp:
  Updated VC++ files +end space removed
include/my_global.h:
  Always include errno.h
sql/log_event.cc:
  LOAD DATA INFILE is not replicated if replicate_*_table is set
sql/mf_iocache.cc:
  LOAD DATA LOCAL INFILE was not replicated correctly

b276b60e

used correct function (SCRUM) · c56f268f
unknown authored Feb 28, 2003
```
sql/sql_show.cc:
  used correct function
```
c56f268f
merge (use local version) · 94d8decf
unknown authored Feb 28, 2003
```
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
```
94d8decf

Always include errno.h · 391bc11a

unknown authored Feb 28, 2003


include/global.h:
  Portability fix
  (Using errno before including errno.h can give big problems on Linux)

391bc11a

LOAD DATA INFILE is not replicated by slave if replicate_*_table is set · 40fbd0fc
unknown authored Feb 28, 2003

40fbd0fc