mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20686 commits 2784 branches 343 tags 1.6 GiB
Commit graph

636 commits

Author SHA1 Message Date
mskold@mysql.com
b9aa67bc76 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-26 16:15:36 +01:00
monty@mysql.com
7e5f74f8f2 Merge with global tree 2005-02-25 17:12:06 +02:00
monty@mysql.com
cd78e701a5 Show all generated warnings in SHOW ERROR 
Previously we only stored the first given error (the error sent to the client)
 2005-02-24 23:33:42 +02:00
joreland@mysql.com
2952f73c16 merge 2005-02-24 06:24:46 +01:00
mskold@mysql.com
07cdc9e334 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-23 20:08:21 +01:00
serg@serg.mylan
9c9d1fd406 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-02-23 19:20:17 +01:00
serg@serg.mylan
383c6e312a don't log BEGIN in auto-commit mode 
correct end_log_pos for Xid_log_event
 2005-02-23 18:26:49 +01:00
mskold@mysql.com
364492239b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-23 15:54:22 +01:00
jani@ua141d10.elisa.omakaista.fi
f3c0e35e9f Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-02-23 14:47:48 +02:00
jani@ua141d10.elisa.omakaista.fi
ebce51950a Fixed Bug#Server crash due to 'flush status' in various tests. 2005-02-23 14:19:48 +02:00
gluh@gluh.mysql.r18.ru
3e9bf3af34 Fix for bug #7217: information_schema: columns are varbinary() instead of timestamp & 
bug #7215: information_schema: columns are longtext instead of varchar
 2005-02-23 15:15:36 +03:00
serg@serg.mylan
1f3bff8824 forget savepoints at the end of transaction 2005-02-22 21:57:57 +01:00
serg@serg.mylan
b43029f4eb bug#8646 - deadlock if long transaction causes binlog rotate 2005-02-22 00:15:31 +01:00
mskold@mysql.com
b3d3f73753 Merge 2005-02-21 16:13:29 +01:00
serg@serg.mylan
dc338e5b5c workaround for sun compiler on sol9x86 2005-02-21 14:04:35 +01:00
serg@serg.mylan
1bc6ae8913 portability fixes 2005-02-20 20:08:33 +01:00
serg@serg.mylan
530eecbd99 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
 2005-02-17 14:00:44 +01:00
serg@serg.mylan
5ddb6354a5 after merge fixes 2005-02-16 17:34:02 +01:00
mskold@mysql.com
fdbcad3eaf Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-15 12:06:29 +01:00
serg@serg.mylan
fd828e5b4d manually merged 2005-02-14 21:50:09 +01:00
sergefp@mysql.com
919f2f2364 Merge mysql.com:/home/psergey/mysql-4.1-bug8218 
into mysql.com:/home/psergey/mysql-5.0-bug8218
 2005-02-14 23:47:31 +03:00
sergefp@mysql.com
c0c50efdef Fix for BUG#8218: 
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
pointing to the wrong List.
 2005-02-12 22:58:54 +03:00
mskold@mysql.com
3f1e1f0f6b Merge 2005-02-11 22:33:52 +01:00
mskold@mysql.com
828a785610 Condition pushdown v.2 2005-02-11 22:05:24 +01:00
monty@mysql.com
ccb2f3381b Things missing in last changset 
After merge fixes
Don't give duplicate warnings for some ::store() functions
 2005-02-10 15:41:51 +02:00
serg@serg.mylan
db13afd89d auto-ROLLBACK if binlog was not closed properly 
auto-commit on Xid_log_event
 2005-02-09 20:04:28 +01:00
hf@deer.(none)
96558f6ad3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-02-09 02:54:08 +04:00
hf@deer.(none)
b94a482ee9 Precision Math implementation 2005-02-09 02:50:45 +04:00
pem@mysql.comhem.se
2c26ebe359 WL#2130: Table locking for stored FUNCTIONs 
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
 2005-02-08 20:52:50 +01:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
heikki@hundin.mysql.fi
11c0260147 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-02-02 00:22:19 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc WL#1967 
Support for COMMIT/ROLLBACK optional arguments
 2005-02-01 19:48:05 +00:00
serg@serg.mylan
fb78bfebe4 open binlog index file *before* tc_log->open() and binlog itself *after* 2005-02-01 15:36:48 +01:00
mskold@mysql.com
f21a737197 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-01 10:05:22 +01:00
serg@serg.mylan
3c5060981f query_id and my_xid -> ulonglong 
fix for binlog+autocommit+tclog
comments, style fixes
 2005-01-27 22:38:56 +01:00
bell@sanja.is.com.ua
0bf6e3aefc fixed cleanup of result object of subqueries. (BUG#8125) 2005-01-26 15:27:45 +02:00
heikki@hundin.mysql.fi
d7e5c4d617 sql_class.h, set_var.cc, mysqld.cc: 
Add settable variables for semi-sync replication
 2005-01-25 22:11:21 +02:00
mskold@mysql.com
7c07a2e725 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-01-21 08:43:41 +01:00
ingo@mysql.com
ea8882be80 BUG#6034 - Error code 124: Wrong medium type. 
Version for 5.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
Now the preparation is split into two prepare methods.
The first detects the situation and defers some preparations
until the second phase.
 2005-01-19 21:20:55 +01:00
guilhem@mysql.com
1cb5d98d85 When we warn that --log-bin alone is dangerous, we give a suggestion. 2005-01-16 15:46:28 +01:00
serg@serg.mylan
1034677f94 XA (not completely polished out yet) 2005-01-16 13:16:23 +01:00
monty@mysql.com
f4274fe9be Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-11 19:35:00 +02:00
mskold@mysql.com
27c13fa33f Merge 2005-01-11 17:29:46 +01:00
konstantin@mysql.com
a0bc131743 Merge mysql.com:/home/kostja/work/mysql-4.1-7428 
into mysql.com:/home/kostja/work/mysql-5.0-root
 2005-01-11 14:47:12 +03:00
konstantin@mysql.com
067d13f632 A fix for linking failure of MySQL client when linking with imap libraries 
(Bug#7428) (renamed: hash_reset -> my_hash_reset)
 2005-01-11 13:53:10 +03:00
mskold@mysql.com
346aeda888 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-01-07 15:34:25 +01:00
monty@mysql.com
7cf8285b3f After merge fixes 
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results
 2005-01-04 13:46:53 +02:00
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
mskold@mysql.com
881b3a023f Merge 2005-01-03 15:20:06 +01:00
monty@mysql.com
1bd22faa05 Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag 
This allows use to use INSERT IGNORE ... ON DUPLICATE ...
 2004-12-31 12:04:35 +02:00