Commit graph

5876 commits

Author SHA1 Message Date
unknown
5dd8180a8e Fix for bug . We must write the
INSERT into u SELECT * from t
to the binlog
BEFORE unlocking t (which was read-locked at least in MyISAM),
and not the contrary.
2003-03-12 01:05:04 +01:00
unknown
3223245de3 Handling of log-error added in embedded server
libmysqld/lib_sql.cc:
  handling of log-error added to embedded server
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-10 14:06:21 +04:00
unknown
64cf72900c Made it possible to use --max-delayed-threads=0 in order to disable
INSERT DELAYED.
2003-03-09 19:03:55 +02:00
unknown
44c9a3893d Clearer error message when one forgot to grant REPLICATION SLAVE :
now we'll have something like this :
030308 18:46:58  Slave I/O thread: connected to master 'gb@localhost:3306',  replication started in log 'FIRST' at position 4
030308 18:46:58  While trying to obtain the list of slaves from the master 'localhost:3306', user 'gb' got the following error: 'Access denied. You need the REPLICATION SLAVE privilege for this operation'
030308 18:46:58  Slave I/O thread exiting, read up to log 'FIRST', position 4
instead of "Error updating slave list: Query error".
This fixes bug .


sql/repl_failsafe.cc:
  Clearer error message when one forgot to grant REPLICATION SLAVE
sql/repl_failsafe.h:
  Clearer error message when one forgot to grant REPLICATION SLAVE
sql/slave.cc:
  Updated for new syntax of update_slave_list
2003-03-08 18:53:32 +01:00
unknown
20bb527b80 error messages translated by Egor 2003-03-07 15:22:05 +01:00
unknown
6b941726f9 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2003-03-07 11:58:07 +01:00
unknown
5776261a3e missing grant check added 2003-03-07 11:55:07 +01:00
unknown
19a5b45477 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
2003-03-07 12:37:18 +02:00
unknown
efadca6441 Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
Some after merge fixes


mysql-test/r/ctype_latin1_de.result:
  Changed test to have more relevant results
mysql-test/r/delete.result:
  Updated results after merge
mysql-test/r/select.result:
  Remove explicit database usage
mysql-test/r/type_datetime.result:
  Updated results after merge
mysql-test/t/ctype_latin1_de.test:
  Changed test to have more relevant results
mysql-test/t/select.test:
  Remove explicit database usage
sql/ha_myisam.cc:
  Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
2003-03-07 12:36:52 +02:00
unknown
8dc4215d44 os0file.c:
Fix bug in previous push


innobase/os/os0file.c:
  Fix bug in previous push
2003-03-07 10:20:44 +02:00
unknown
f821f4c2f7 os0file.c:
Print and error message also if a read from file results in the Linux error EEXIST; may happen if the disk is broken


innobase/os/os0file.c:
  Print and error message also if a read from file results in the Linux error EEXIST; may happen if the disk is broken
2003-03-07 10:07:06 +02:00
unknown
81f368cc54 Merge to get fix for LOCK TABLES + DROP TABLE in another thread
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Delete: mysql-test/r/delete.result
client/mysqlbinlog.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/field.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/type_datetime.result:
  Update results after merge
sql/log_event.h:
  Use local version
sql/mysql_priv.h:
  Use local version
sql/mysqld.cc:
  Use local version
sql/sql_repl.h:
  Use local version
2003-03-07 01:20:56 +02:00
unknown
7ae420a4a1 Portability fix for IBM compiler on AIX
configure.in:
  Remove duplicated configure line
sql-bench/crash-me.sh:
  Fix for connect test
2003-03-07 01:00:58 +02:00
unknown
2395cd9805 remove spaces according to coding rules 2003-03-06 22:53:58 +01:00
unknown
65b62bd474 Fix so that INSERT DELAYED cares about SQL_LOG_BIN=0 (bug ) 2003-03-06 22:46:24 +01:00
unknown
92e6a9fcf2 Make log_pos be non-zero in the binary log, for BEGIN and COMMIT Query_log_events.
Now log_pos is the real position of the event. For events that are between BEGIN and COMMIT,
log_pos is still the BEGIN's log_pos.
This fixes bug  (If only transactions are run on the master then t
2003-03-06 16:22:31 +01:00
unknown
62ada91165 disable partial timestamps in --new mode 2003-03-06 10:54:27 +01:00
unknown
b2ded34fbc Remove netware.patch (not needed)
BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee:
  Delete: netware/netware.patch
2003-03-05 18:47:08 -05:00
unknown
e5382ef74f --new option and local variable to optionally turn on
"very new functions" - for now 4.1-compatible TIMESTAMT format
2003-03-05 18:43:56 +01:00
unknown
5861dc5b8b Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql


sql/mysql_priv.h:
  Auto merged
2003-03-05 15:45:11 +02:00
unknown
a300406b4f A better, but larger fix for server_id bug .. 2003-03-05 15:34:58 +02:00
unknown
121d4f478f my_dir.h is included by raid.h 2003-03-05 13:10:23 +01:00
unknown
dbb8c13d7a - Fixed URL to Using_stack_trace.html (the old one still works, but gets
redirected to the new location
2003-03-05 12:42:10 +01:00
unknown
4c1782eab7 - safeguard against an endless loop when MIT pthreads are not installed
(Bug )
2003-03-05 09:49:28 +01:00
unknown
abd0343512 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-04 21:33:32 +01:00
unknown
9aa77b56c6 Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-03-04 18:26:22 +01:00
unknown
230147990d Many files:
Change mode to -rwxrwxr-x


netware/BUILD/compile-AUTOTOOLS:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-linux-tools:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-END:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-START:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-all:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-debug:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-standard:
  Change mode to -rwxrwxr-x
netware/BUILD/mwasmnlm:
  Change mode to -rwxrwxr-x
netware/BUILD/mwccnlm:
  Change mode to -rwxrwxr-x
netware/BUILD/mwenv:
  Change mode to -rwxrwxr-x
netware/BUILD/mwldnlm:
  Change mode to -rwxrwxr-x
netware/BUILD/nwbootstrap:
  Change mode to -rwxrwxr-x
2003-03-04 18:20:11 +01:00
unknown
37d1dd03d8 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 18:18:05 +01:00
unknown
b1a8b36394 ha_innodb.cc:
Add comment that Guilhem should check master_log_name, pending etc are right if the master log gets rotated


sql/ha_innodb.cc:
  Add comment that Guilhem should check master_log_name, pending etc are right if the master log gets rotated
2003-03-04 19:14:37 +02:00
unknown
9541dd83c6 ha_innodb.cc:
Remove (already commented out) code about storing the latest relay log pos info to InnoDB: we will probably use only the master log pos info when we restart a slave after a crash


sql/ha_innodb.cc:
  Remove (already commented out) code about storing the latest relay log pos info to InnoDB: we will probably use only the master log pos info when we restart a slave after a crash
2003-03-04 19:06:40 +02:00
unknown
4016096bac Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-03-04 18:03:11 +01:00
unknown
8529b744b7 fixed Field::eq() to work with CHAR(0) fields
BitKeeper/etc/ignore:
  Added configure.lineno innobase/configure.lineno to the ignore list
2003-03-04 18:02:56 +01:00
unknown
5247c5bf51 Fix for SHOW VARIABLES on 64-bit platforms 2003-03-04 18:23:15 +02:00
unknown
b308fe3b59 buf0buf.c:
Do not try to resolve the table name of a corrupt page if the code is in ibbackup, i.e., the dict system is not initialized


innobase/buf/buf0buf.c:
  Do not try to resolve the table name of a corrupt page if the code is in ibbackup, i.e., the dict system is not initialized
2003-03-04 14:05:23 +02:00
unknown
7a88d2ccbd Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/handler.cc:
  Auto merged
2003-03-04 12:32:28 +02:00
unknown
3446199d8e 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
2003-03-04 12:22:35 +02:00
unknown
aeee04d278 New build scripts for NetWare
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
2003-03-03 23:04:36 -05:00
unknown
5de78932d1 novell40b.patch
netware/mysql_fix_privilege_tables.pl:
  Import patch novell40b.patch
2003-03-03 23:00:49 -05:00
unknown
374ea106f5 Fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another
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
2003-03-03 20:42:49 +02:00
unknown
dd67a1768e Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-03-03 18:42:57 +01:00
unknown
e70b22e55c ha_innodb.h, ha_innodb.cc, handler.h, handler.cc, 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/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
2003-03-03 19:31:01 +02:00
unknown
8aff7ae9a6 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-03 17:16:09 +02:00
unknown
8c689249af - added option "--skip-dmg" to skip the building of the disk image after
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)
2003-03-03 16:01:05 +01:00
unknown
9ca8f13734 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


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
2003-03-03 16:29:16 +02:00
unknown
2855415058 Replication: small bug fixes in mysql-test-run.sh and in replication code (more reinitializations)
+ fix for  
+ test result fix for LOAD DATA LOCAL bug 


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 ).
  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 )
2003-03-03 14:57:02 +01:00
unknown
5387425aeb trx0sys.c, trx0roll.c, srv0start.h:
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
2003-03-02 22:34:09 +02:00
unknown
b331fe928c ChangeSet 1.1625 was faulty as regards sql/mf_iocache.cc and LOAD DATA LOCAL replication tests
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)
2003-03-02 18:20:32 +01:00
unknown
c5cd20fe8f optimizer should check for "field LIKE const" not "field like STRING"
BitKeeper/etc/ignore:
  Added configure.lineno innobase/configure.lineno to the ignore list
2003-03-02 14:07:32 +01:00
unknown
a2cc82182b Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-02 01:52:02 +01:00
unknown
6a933b2e08 fix auto-increment in sub-key and insert ... select 2003-03-02 01:48:57 +01:00