mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7632 commits 2791 branches 343 tags 1.7 GiB
Commit graph

7632 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sinisa@sinisa.nasamreza.org
91386f63de after merge fixes. 2004-03-13 21:22:55 +02:00
Sinisa@sinisa.nasamreza.org
639f411a82 multi_update.result: 
Fix for a bug in the result
multi_update.test:
  Fix for a bug in the test
 2004-03-13 21:06:36 +02:00
marko@hundin.mysql.fi
9eede1c6bc Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/l/mysql-4.0
 2004-03-12 23:30:06 +02:00
marko@hundin.mysql.fi
27243b2b08 InnoDB: disable unreachable debug functions unless #ifdef UNIV_MEM_DEBUG 2004-03-12 23:26:13 +02:00
guilhem@mysql.com
cf94cd506f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-03-12 22:03:27 +01:00
guilhem@mysql.com
c421527dee Force mysqlbinlog to require an argument if --local-load is used 
(--local-load alone means "I want files to be prepared for LOAD 
DATA INFILE, in the default temp directory", and mysqlbinlog already
does this without --local-load).
 2004-03-12 22:01:29 +01:00
marko@hundin.mysql.fi
6e57e23b9c InnoDB: remove redundant functions mach_write() and mach_read() 2004-03-12 22:55:46 +02:00
marko@hundin.mysql.fi
9287264b6b Remove constant parameter MLOG_8BYTES from mtr_read_dulint() and mlog_write_dulint() 2004-03-12 17:44:25 +02:00
marko@hundin.mysql.fi
4573eb566c Allow UNIV_SYNC_DEBUG to be disabled while UNIV_DEBUG is enabled 2004-03-12 17:14:51 +02:00
marko@hundin.mysql.fi
7362b9a9ee Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/l/mysql-4.0
 2004-03-12 15:56:29 +02:00
monty@mysql.com
e9e9ce659e Fixes to newly pushed code 2004-03-12 15:56:28 +02:00
vva@eagle.mysql.r18.ru
158770e356 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2985/mysql-4.0
 2004-03-12 17:56:27 +04:00
vva@eagle.mysql.r18.ru
131fd37cef extra correction of check_db_name, check_table_name and check_column_name 2004-03-12 17:55:33 +04:00
marko@hundin.mysql.fi
c8d6a195dc Replace ut_anp with ut_a 2004-03-12 13:46:26 +02:00
monty@mysql.com
91a8546112 Portability fixes & fixing of test suite 2004-03-12 09:15:08 +02:00
monty@mysql.com
012ce71c7f Merge 2004-03-12 01:13:04 +02:00
monty@mysql.com
98fb8ea4c7 Merge with 3.23 to get patch for floor() 2004-03-12 01:12:14 +02:00
monty@mysql.com
e27960a44e Ensure that install_test_db.sh script works with both 'make install' and 'make_binary_distribution' layouts 
Abort if we can't allocate memory for table cache
Fix bug with multi-update-tables and BDB tables.
 2004-03-12 01:10:22 +02:00
marko@hundin.mysql.fi
0891c3d97c Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/l/mysql-4.0
 2004-03-11 23:13:43 +02:00
marko@hundin.mysql.fi
5b5d749294 More consistent handling of magic numbers 2004-03-11 23:12:02 +02:00
Sinisa@sinisa.nasamreza.org
37817f60cc Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2004-03-11 22:27:17 +02:00
Sinisa@sinisa.nasamreza.org
a86753b00e multi_update.result: 
Test case for a #2996 bug fix
multi_update.test:
  test case for a #2996 bug fix
sql_select.cc:
  Fix for a bug #2996 involving multi-table updates over the const tables
 2004-03-11 22:26:03 +02:00
jani@ua72d24.elisa.omakaista.fi
2bf78563f7 Fixed error in version. 2004-03-11 20:12:16 +02:00
guilhem@mysql.com
69517b22a1 Fix for BUG#2983 "If statement was killed on master, slave errors despite replicate-wild-ignore-t" 
We introduce a new function mysql_test_parse_for_slave().
If the slave sees that the query got a really bad error on master
(killed e.g.), then it calls this function to know if this query
can be ignored because of replicate-*-table rules (do not worry
about replicate-*-db rules: they are checked so early that they have
no bug). If the answer is yes, it skips the query and continues. If
it's no, then it stops and say "fix your slave data manually" (like it
did before this change).
 2004-03-11 17:38:19 +01:00
guilhem@mysql.com
b36b25673e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-03-11 16:24:47 +01:00
guilhem@mysql.com
cf287341cc Fix for BUG#2921 "Replication problem on mutex lock in mySQL-4.0.18": 
re-using unused LOCK_active_mi to serialize all administrative
commands related to replication:
START SLAVE, STOP SLAVE, RESET SLAVE, CHANGE MASTER, init_slave()
(replication autostart at server startup), end_slave() (replication
autostop at server shutdown), LOAD DATA FROM MASTER.
This protects us against a handful of deadlocks (like BUG#2921
when two START SLAVE, but when two STOP SLAVE too).
Removing unused variables.
 2004-03-11 16:23:35 +01:00
marko@hundin.mysql.fi
4c89512f9d Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/l/mysql-4.0
 2004-03-11 16:37:00 +02:00
marko@hundin.mysql.fi
5aeab393af Remove remaining references to the built-in ODBC driver of InnoDB 2004-03-11 16:36:19 +02:00
marko@hundin.mysql.fi
fffb747ec8 Remove libcom.a from acinclude.m4 (should have been done in ChangeSet 1.1741) 2004-03-11 16:29:16 +02:00
Sinisa@sinisa.nasamreza.org
67a5ccc5a6 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2004-03-11 15:41:09 +02:00
jani@ua72d24.elisa.omakaista.fi
a76f4455ab Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.0
 2004-03-11 15:41:08 +02:00
marko@hundin.mysql.fi
03c4f83065 Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/l/mysql-4.0
 2004-03-11 15:41:07 +02:00
jani@ua72d24.elisa.omakaista.fi
3b5a46939f Small fixes. 2004-03-11 15:41:07 +02:00
vva@eagle.mysql.r18.ru
2083542808 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
 2004-03-11 17:41:06 +04:00
Sinisa@sinisa.nasamreza.org
7e5a43af85 mysqldump.c: 
reverting fix
 2004-03-11 15:35:08 +02:00
marko@hundin.mysql.fi
a68a1ed0ca Remove unneeded module "com" 2004-03-11 12:55:28 +02:00
heikki@hundin.mysql.fi
0a0e981220 sync0arr.c, os0file.h: 
Print always the count of pending pread() and pwrite() calls if there is a long semaphore wait
 2004-03-11 10:38:37 +02:00
heikki@hundin.mysql.fi
9d6f8a7b88 data0data.c: 
Do not test a magic number with =, use == instead :)
 2004-03-11 10:26:08 +02:00
vva@eagle.mysql.r18.ru
8dc504a3c5 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
 2004-03-10 23:36:22 +04:00
vva@eagle.mysql.r18.ru
a135907547 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
 2004-03-10 23:35:40 +04:00
vva@eagle.mysql.r18.ru
faa9c92765 fixed BUG #2874 "Grant table bug" and 
added tests for testing structure of mysql db
 2004-03-10 22:54:07 +04:00
guilhem@mysql.com
1c0d5ad25c Backporting parts of 
ChangeSet 1.1620.12.1 and ChangeSet 1.1625.2.1
from 4.1. This makes the slave I/O thread flush the relay log 
after every event, which provides additional safety in case
of brutal crash (reduces chances to lose a part of the relay log).
 2004-03-10 16:56:28 +01:00
guilhem@mysql.com
30541b324c Undoing 2 parts of changeset 1.1730.1.1 : 
- the one about BUG#2921
- the one about relay log flushing
Both will be rewritten in a next changeset
(this one will not be pushed before the next changeset).
 2004-03-10 16:30:47 +01:00
monty@mysql.com
7738d08294 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-03-10 13:48:41 +02:00
monty@mysql.com
4ee44751d9 Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882) 2004-03-10 13:46:11 +02:00
heikki@hundin.mysql.fi
4f601cd9ef buf0lru.c: 
Add typecasts to ulong because ulint is __int64 in Win 64-bits
  Better error message to the .err log if we have to crash the server because the buffer pool is exhausted by the lock table or the adaptive hash index
 2004-03-10 11:05:02 +02:00
paul@teton.kitebird.com
a8eb5abffc Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0 
into teton.kitebird.com:/home/paul/mysql-4.0
 2004-03-09 11:58:18 -06:00
paul@teton.kitebird.com
4bbb3573ac Reword comment/help message. 
Fix comment typos. (Skipp -> Skip)
 2004-03-09 11:48:32 -06:00
Sinisa@sinisa.nasamreza.org
0bbbdb0530 mysqldump.c: 
This is to fix mysqldump problem when local-infile option is present under [client] options header.  It will not start. This must be fixed as other programs use that option under [client] options header.
 2004-03-09 17:00:00 +02:00
paul@ice.snake.net
025be296b2 Touch up error message. 2004-03-08 15:58:45 -06:00