mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
9943 commits 2778 branches 343 tags 1.6 GiB
Commit graph

9943 commits

This branch
This branch
All branches
Author SHA1 Message Date
bell@sanja.is.com.ua
1318470a96 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
 2003-10-13 13:21:18 +03:00
heikki@hundin.mysql.fi
5ec87f2449 Many files: 
ALTER TABLE ... DISCARD/IMPORT TABLESPACE
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
 2003-10-13 11:20:19 +03:00
bell@sanja.is.com.ua
628d2e4a7c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
 2003-10-13 09:49:47 +03:00
serg@serg.mylan
32fed1e877 wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed. 
typo in error message text corrected.
new tests added
 2003-10-12 15:16:45 +02:00
bell@laptop.sanja.is.com.ua
8f5c3f3981 fixed fix_fields() parameters for GROUP_CONCAT() ORDER BY clause 
(BUG#1537)
 2003-10-12 16:10:40 +03:00
monty@mashka.mysql.fi
c60a75e9ba Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL) 2003-10-11 23:26:39 +03:00
monty@mashka.mysql.fi
c95d142f8f Add new user variables for tuning memory usage: 
query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization
 2003-10-11 22:00:24 +03:00
paul@ice.snake.net
54533936b1 mysqld.cc: 
Fix error in --show-slave-auth-info help string.
 2003-10-11 11:21:32 -05:00
serg@serg.mylan
8cc3951c8f key_map with more that 64 bits width 2003-10-11 13:06:55 +02:00
vva@eagle.mysql.r18.ru
8e801a281e Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.0
 2003-10-10 13:12:39 -04:00
dlenev@dlenev.mshome
8313e0da03 Fix for rpl_openssl test (there was extra spaces in result file) 2003-10-10 17:06:18 +04:00
guilhem@mysql.com
757b44de05 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-10-09 18:19:17 +02:00
guilhem@gbichot2
d6d6c5e1bb Don't show Slave_IO_State in the testsuite (replace it with #) because it can't be predicted. 
I manually edited rpl_openssl.result because the test is skipped on my
machine. Hope it's correct.
 2003-10-09 18:16:15 +02:00
guilhem@mysql.com
b2500829a3 Make the slave die if master is 5.0. Indeed, 5.0 masters send 
a Format_description_log_event (or maybe it will be named
Description_log_event) which is not recognized by 4.0, so
a 4.0 can't be a slave of 5.0. We detect it early to produce
a helpful message instead of "corrupted relay log" later.
 2003-10-09 17:40:38 +02:00
guilhem@mysql.com
596e60b85c Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-10-09 14:56:51 +02:00
guilhem@gbichot2
f1df2a8cff Tiny cleanup after the push of WL#1098 "Seconds_behind_master in SHOW SLAVE STATUS": 
a better comment, and replacing an assignment by an equivalent simpler one.
 2003-10-09 14:55:33 +02:00
bell@laptop.sanja.is.com.ua
cfcae83740 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
 2003-10-09 13:29:01 +03:00
bell@laptop.sanja.is.com.ua
200eb65df7 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
 2003-10-09 09:30:26 +03:00
bell@laptop.sanja.is.com.ua
b5aeed824f merge 2003-10-09 09:20:01 +03:00
heikki@hundin.mysql.fi
677a0dbebb os0file.h: 
Fix the Windows compilation error reported by Miguel 1.5 hours ago
 2003-10-09 08:54:15 +03:00
paul@ice.snake.net
e32fb9191f Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2003-10-08 18:39:40 -05:00
paul@ice.snake.net
5ac0812db2 errmsg.txt: 
Add Stefan's new translations.
 2003-10-08 18:08:51 -05:00
guilhem@mysql.com
44fc80c8a1 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-10-09 00:08:09 +02:00
guilhem@gbichot2
c0075fa64b Final push for WL#1098: 
"Add a column "Timestamp_of_last_master_event_executed" in SHOW SLAVE STATUS".
Finally this is adding
- Slave_IO_State (a copy of the State column of SHOW PROCESSLIST for the I/O thread,
so that the users, most of the time, has enough info with only SHOW SLAVE STATUS).
- Seconds_behind_master. When the slave connects to the master it does SELECT UNIX_TIMESTAMP()
on the master, computes the absolute difference between the master's and the slave's clock.
It records the timestamp of the last event executed by the SQL thread, and does a
small computation to find the number of seconds by which the slave is late.
 2003-10-09 00:06:21 +02:00
vva@eagle.mysql.r18.ru
6f96749cca fixed temp directory for mysqlbinlog (was wrong on solaris) 2003-10-08 17:15:59 -04:00
bell@laptop.sanja.is.com.ua
f836a796c4 added worning about changing requested size of query cache (BUG#1502) 2003-10-09 00:13:15 +03:00
paul@ice.snake.net
1979187c0d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2003-10-08 14:41:46 -05:00
monty@narttu.mysql.fi
1febfbe86a deleted conflicting file 2003-10-08 22:41:45 +03:00
paul@ice.snake.net
9b9674275c Merge 2003-10-08 14:29:25 -05:00
monty@mashka.mysql.fi
9bba878b8c Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-10-08 22:12:32 +03:00
monty@narttu.mysql.fi
a533d88693 Portability fix 2003-10-08 22:05:06 +03:00
guilhem@mysql.com
324ff6dedf Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-10-08 20:53:07 +02:00
monty@narttu.mysql.fi
d37a5c4dd7 Indentation cleanups 
Remove wait_if_global_read_lock on commit as this can cause deadlocks
 2003-10-08 21:50:05 +03:00
paul@ice.snake.net
8e7aa7f875 Incorporate Stefan's new translations of German error messages. 2003-10-08 12:51:10 -05:00
monty@narttu.mysql.fi
dc6f07256c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-10-08 18:55:34 +03:00
monty@narttu.mysql.fi
9e57c12b5a Fixed bug in error handling of CREATE ... SELECT 
More tests cases
After merge fixes
 2003-10-08 18:53:31 +03:00
bell@laptop.sanja.is.com.ua
afac13d033 Some simple optimisation 
= ANY and <> ALL converted to (NOT) IN to get advantage of IN optimisation
 2003-10-08 17:40:54 +03:00
lenz@kallisto.local
ce9c9845a1 - portability fix: replaced "uint" with "unsigned int" 2003-10-08 13:26:29 +02:00
lenz@kallisto.local
2379030676 - added missing link line that seemed to have gone lost during the last 
4.0->4.1 merge (mysqltest needs to be linked with a C++ compiler)
 2003-10-08 13:06:47 +02:00
lenz@mysql.com
75e74c79ec Merge 2003-10-08 12:49:42 +02:00
lenz@mysql.com
4bc3f12caf - added make_sharedlib_distribution.sh to the source distribution 2003-10-08 12:35:24 +02:00
monty@narttu.mysql.fi
246febee42 merge with 4.0 to get fix for mysqlbinlog 2003-10-08 12:05:27 +03:00
monty@narttu.mysql.fi
d9ff665102 Fixes after merge 2003-10-08 12:01:58 +03:00
bell@laptop.sanja.is.com.ua
381b680868 fixed error handling in SET and DO operators (BUG#1484) 2003-10-08 11:19:09 +03:00
monty@narttu.mysql.fi
d00d9110ba Fixed test case that my last patch to mysqlbinlog broke. 
Changed --remote to --read-from-remote-server (mysqlbinlog)
 2003-10-08 10:23:54 +03:00
bell@laptop.sanja.is.com.ua
9b4018066e Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
 2003-10-08 08:50:57 +03:00
bar@bar.mysql.r18.ru
c5c4e31545 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-10-08 10:19:25 +05:00
bar@bar.mysql.r18.ru
9023009ae3 query_cache.result, query_cache.test: 
Character set variables test
 2003-10-08 10:18:38 +05:00
greg@mysql.com
7a6239640f Fixed test case to work on NetWare. 2003-10-08 00:19:44 -04:00
monty@narttu.mysql.fi
02ad66f32e Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-10-08 01:30:31 +03:00