Commit graph

5866 commits

Author SHA1 Message Date
monty@mashka.mysql.fi
c0c3a5f357 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-03-07 12:37:18 +02:00
monty@mashka.mysql.fi
987f4c4d8b Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
Some after merge fixes
2003-03-07 12:36:52 +02:00
heikki@hundin.mysql.fi
2f81f083d1 os0file.c:
Fix bug in previous push
2003-03-07 10:20:44 +02:00
heikki@hundin.mysql.fi
184c7fee8d 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
monty@mashka.mysql.fi
d56e2acf50 Merge to get fix for LOCK TABLES + DROP TABLE in another thread 2003-03-07 01:20:56 +02:00
monty@mashka.mysql.fi
13de61cc3a Portability fix for IBM compiler on AIX 2003-03-07 01:00:58 +02:00
guilhem@mysql.com
6b40954a5e remove spaces according to coding rules 2003-03-06 22:53:58 +01:00
guilhem@mysql.com
0a8f3e19a5 Fix so that INSERT DELAYED cares about SQL_LOG_BIN=0 (bug #104) 2003-03-06 22:46:24 +01:00
guilhem@mysql.com
ea4f0c383f 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 #52 (If only transactions are run on the master then t
2003-03-06 16:22:31 +01:00
greg@mysql.com
8a86f31635 Remove netware.patch (not needed) 2003-03-05 18:47:08 -05:00
Sinisa@sinisa.nasamreza.org
c643298984 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-05 15:45:11 +02:00
Sinisa@sinisa.nasamreza.org
9034ed296b A better, but larger fix for server_id bug .. 2003-03-05 15:34:58 +02:00
lenz@mysql.com
908bf23cfc - 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
lenz@mysql.com
f2c4b6c981 - safeguard against an endless loop when MIT pthreads are not installed
(Bug #121)
2003-03-05 09:49:28 +01:00
serg@serg.mysql.com
887553913f 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
lenz@mysql.com
8cd2e70900 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
gweir@work.mysql.com
2cd7bf9969 Many files:
Change mode to -rwxrwxr-x
2003-03-04 18:20:11 +01:00
lenz@mysql.com
905ce89dc5 - 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
heikki@hundin.mysql.fi
404116fd1d 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
heikki@hundin.mysql.fi
14749b89bb 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
serg@serg.mysql.com
e5daf6486c Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-03-04 18:03:11 +01:00
serg@serg.mysql.com
80c34b2aef fixed Field::eq() to work with CHAR(0) fields 2003-03-04 18:02:56 +01:00
Sinisa@sinisa.nasamreza.org
4d83bdef2a Fix for SHOW VARIABLES on 64-bit platforms 2003-03-04 18:23:15 +02:00
heikki@hundin.mysql.fi
ac5135860d 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
monty@narttu.mysql.fi
28b6e0269a Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 2003-03-04 12:32:28 +02:00
monty@narttu.mysql.fi
2a7dfa172c Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped 2003-03-04 12:22:35 +02:00
greg@mysql.com
61f280a978 New build scripts for NetWare 2003-03-03 23:04:36 -05:00
greg@mysql.com[greg]
8fb09059c1 novell40b.patch 2003-03-03 23:00:49 -05:00
monty@narttu.mysql.fi
8c51eb2c12 Fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another 2003-03-03 20:42:49 +02:00
lenz@mysql.com
3e3fa76919 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
heikki@hundin.mysql.fi
6ef0f4ad41 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
2003-03-03 19:31:01 +02:00
Sinisa@sinisa.nasamreza.org
7dc464ea07 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-03 17:16:09 +02:00
lenz@mysql.com
1612991220 - 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
heikki@hundin.mysql.fi
177f584f90 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
guilhem@mysql.com
6b4f438ddb Replication: small bug fixes in mysql-test-run.sh and in replication code (more reinitializations)
+ fix for #70 
+ test result fix for LOAD DATA LOCAL bug #82
2003-03-03 14:57:02 +01:00
heikki@hundin.mysql.fi
a70dcd404c trx0sys.c, trx0roll.c, srv0start.h:
Print trx rollback progress info in crash recovery
2003-03-02 22:34:09 +02:00
guilhem@mysql.com
49788cf2e1 ChangeSet 1.1625 was faulty as regards sql/mf_iocache.cc and LOAD DATA LOCAL replication tests 2003-03-02 18:20:32 +01:00
serg@serg.mysql.com
31d87cd50c optimizer should check for "field LIKE const" not "field like STRING" 2003-03-02 14:07:32 +01:00
serg@serg.mysql.com
d77cd3835d 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
serg@serg.mysql.com
be580475be fix auto-increment in sub-key and insert ... select 2003-03-02 01:48:57 +01:00
guilhem@mysql.com
e66992aef5 Replication: simplification of init_relay_log_pos: always initialize,
remove variable rli->log_pos_current.
2003-03-02 00:45:19 +01:00
guilhem@mysql.com
10735252ee When the SQL thread cannot read an event from the relay log
("Event too big" etc), stop this thread instead of going on
with the next event, which would certainly lead to slave's data
corruption.
2003-03-02 00:34:44 +01:00
monty@narttu.mysql.fi
065bcf92fb Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 2003-02-28 22:24:57 +02:00
monty@narttu.mysql.fi
e8aa21c8d3 LOAD DATA INFILE is not replicated if replicate_*_table is set
LOAD DATA LOCAL INFILE was not replicated correctly
2003-02-28 22:24:00 +02:00
bell@sanja.is.com.ua
e087f900e5 used correct function (SCRUM) 2003-02-28 21:17:44 +02:00
monty@narttu.mysql.fi
c908b0ed16 merge (use local version) 2003-02-28 20:00:19 +02:00
monty@narttu.mysql.fi
ddb13eef8a Always include errno.h 2003-02-28 19:52:14 +02:00
monty@narttu.mysql.fi
7eccd99e54 LOAD DATA INFILE is not replicated by slave if replicate_*_table is set 2003-02-28 19:50:05 +02:00
lenz@mysql.com
609445e73f - Changed version number from "4.0.12-gamma" to "4.0.12" (confirmed by
Monty)
2003-02-28 12:47:26 +01:00
monty@narttu.mysql.fi
41e2309259 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-02-28 12:33:10 +02:00