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

9862 commits

This branch
This branch
All branches
Author SHA1 Message Date
bell@laptop.sanja.is.com.ua
5b13ec47dd Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
 2003-10-07 02:20:23 +03:00
monty@narttu.mysql.fi
73cb1a52d2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-10-07 01:59:14 +03:00
bell@laptop.sanja.is.com.ua
18bb43671d Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
 2003-10-07 01:31:16 +03:00
bell@laptop.sanja.is.com.ua
ccaeb61f8b after merge fix 2003-10-07 01:28:15 +03:00
monty@narttu.mysql.fi
8c0b7d5d97 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-10-07 00:34:43 +03:00
monty@narttu.mysql.fi
446d40e880 After merge fixes 2003-10-07 00:23:29 +03:00
monty@mishka.mysql.fi
53fa223ed6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mishka.mysql.fi:/home/my/mysql-4.1
 2003-10-06 22:57:04 +03:00
monty@mishka.mysql.fi
a5c83b05bd Move init_compiled_charsets to own file 
Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
Simple code cleanup
 2003-10-06 22:56:34 +03:00
bell@laptop.sanja.is.com.ua
0aa70f8115 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1
 2003-10-06 22:38:51 +03:00
bell@laptop.sanja.is.com.ua
e527f268d5 fixed error names 2003-10-06 22:35:05 +03:00
monty@narttu.mysql.fi
fa823857d3 Merge with 3.23.58 2003-10-06 21:21:04 +03:00
serg@serg.mylan
511589a4f8 results updated 2003-10-06 20:11:39 +02:00
serg@serg.mylan
b58098c3b9 bug #1434 (and related issues) 2003-10-06 20:02:27 +02:00
bell@laptop.sanja.is.com.ua
e1b53fdd42 Merge 2003-10-06 20:55:06 +03:00
monty@narttu.mysql.fi
0a241aa2ed Portability fix 2003-10-06 20:31:35 +03:00
monty@narttu.mysql.fi
7d6f7d79e2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-10-06 20:23:14 +03:00
hf@deer.(none)
ce6f77a9c5 Fix for #1447 2003-10-06 18:01:11 +05:00
serg@serg.mylan
2667d7f8cc fix_max_connections to resize alarm_queue (Bug #1435) 2003-10-06 14:11:16 +02:00
hf@deer.(none)
6b0112549e Fix for #1488 2003-10-06 17:06:05 +05:00
hf@deer.(none)
8980fe218b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.stmt
 2003-10-06 16:33:07 +05:00
hf@deer.(none)
a5f9c695df Fix for #1487 2003-10-06 16:32:38 +05:00
ram@gw.mysql.r18.ru
9df504d277 Fix for the bug #1336 mysql.cc assumes DATABASE() doesn't return NULL 2003-10-06 15:47:17 +05:00
bell@laptop.sanja.is.com.ua
ba26a1aa64 fix error messages 
fix derived inside subqueries
 2003-10-06 13:16:56 +03:00
bell@laptop.sanja.is.com.ua
179acaa37e Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-derived-4.1
 2003-10-06 12:04:08 +03:00
heikki@hundin.mysql.fi
216c0a90cd row0mysql.c: 
Remove unintentional changes in previous push
 2003-10-06 10:50:12 +03:00
heikki@hundin.mysql.fi
da57c25159 row0mysql.c: 
Fix bug: if one used the rename trick of ibman section 15.1 to recover a temp table, InnoDB asserted because it tried to lock the data dictionary twice
 2003-10-06 10:46:22 +03:00
serg@serg.mylan
0ce865b6b4 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-10-06 09:24:12 +02:00
hf@deer.(none)
4661bd8498 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.stmt
 2003-10-06 12:10:18 +05:00
hf@deer.(none)
f576380bc6 Fix for #1470 2003-10-06 12:09:20 +05:00
bell@laptop.sanja.is.com.ua
2103aae552 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1
 2003-10-05 21:13:54 +03:00
bell@laptop.sanja.is.com.ua
16733e423e prohibited using derived tables in UPDATE command (BUG#1477) 
fixed incorrect table name in test
 2003-10-05 21:09:50 +03:00
paul@ice.snake.net
2de4f6b12d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0 
into ice.snake.net:/Users/paul/mysql-4.0
 2003-10-04 17:42:43 -05:00
paul@ice.snake.net
62de13dca3 Ride hobby horse. 2003-10-04 17:41:17 -05:00
hf@deer.(none)
4ef1e3635d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.stmt
 2003-10-04 19:28:50 +05:00
hf@deer.(none)
8bc13b1874 Fix for bugs #1437, #1446 2003-10-04 19:28:08 +05:00
bell@laptop.sanja.is.com.ua
a807e6d7d0 fixed error message as suggested by Peter Gulutzan 2003-10-04 13:46:23 +03:00
vva@eagle.mysql.r18.ru
af3184909c Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
 2003-10-03 17:55:57 -04:00
vva@eagle.mysql.r18.ru
795e14871d Fixed bug #1323 (varchar fields becoming char fields adter create ... select) 2003-10-03 17:54:32 -04:00
guilhem@mysql.com
e2ad218dd1 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-10-03 23:23:59 +02:00
vva@eagle.mysql.r18.ru
a4c0d4dc84 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
 2003-10-03 17:23:58 -04:00
vva@eagle.mysql.r18.ru
c56fbbc3b4 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
 2003-10-03 17:22:47 -04:00
vva@eagle.mysql.r18.ru
5df8184827 fixed bug with Item_sum_min/Item_sum_max from test func_gconcat.test 2003-10-03 17:22:17 -04:00
guilhem@mysql.com
ae054504e3 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-10-03 22:18:34 +02:00
guilhem@gbichot2
5e55c4b809 editing comments. 2003-10-03 22:14:23 +02:00
guilhem@mysql.com
52ae1609eb When the I/O thread was stopped while copying a long transaction, and restarted, 
Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it
by moving the test for corruption to Start_log_event::exec_event(). 
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
I did a separate commit in 4.1 (so this should not be merged to 4.0) because
code is a bit different in 4.1.
A test to see if the slave detects when the master died while writing a 
transaction to the binlog (uses a forged truncated binlog I made).
 2003-10-03 22:13:01 +02:00
guilhem@gbichot2
6bbf52d2ac Fix for a rpl_relayrotate failure. 
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
 2003-10-03 20:07:08 +02:00
paul@ice.snake.net
06e7c4fe9f Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.0
 2003-10-03 11:43:50 -05:00
paul@ice.snake.net
1ba7e941a6 Minor edits. 2003-10-03 11:42:37 -05:00
bar@bar.mysql.r18.ru
67347790de sql_cache.cc, mysql_priv.h: 
Query cache now takes in account character_set_results and collation_connection
 2003-10-03 17:09:54 +05:00
monty@mishka.mysql.fi
0d21572d01 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mishka.mysql.fi:/home/my/mysql-4.1
 2003-10-03 02:08:49 +03:00