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

20714 commits

This branch
This branch
All branches
Author SHA1 Message Date
guilhem@mysql.com
66daa0d2bd log_event.cc: 
cast sql_mode to ulonglong before int8store, otherwise the implementation of int8store
  based on >> complains that we do 32-bit var >> 32 which is undefined according to C standard.
  (compiler warning appeared on SGI Irix)
 2005-02-23 18:58:49 +01:00
guilhem@mysql.com
99f0d74688 Merge mysql.com:/home/mysql_src/mysql-4.1-clean 
into mysql.com:/home/mysql_src/mysql-5.0-xa
 2005-02-23 18:52:15 +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
jani@ua141d10.elisa.omakaista.fi
d5f573713a 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 19:22:52 +02:00
bell@52.0.168.192.in-addr.arpa
25e87cd6f7 Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
 2005-02-23 19:22:52 +02:00
gluh@gluh.mysql.r18.ru
c6f1e9627a Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-02-23 20:22:51 +03:00
guilhem@mysql.com
772b1cedcd Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-02-23 18:18:22 +01:00
gluh@gluh.mysql.r18.ru
fc9c20995f Fix for bug #6572: SHOW ERRORS doesn't 2005-02-23 20:18:21 +03:00
jani@ua141d10.elisa.omakaista.fi
6e9b26e8b7 Fixed a compatibility problem. 
1) If my.cnf is found in datadir and basedir, give a warning and use the
   one in basedir.
2) If my.cnf is found in datadir, use it, but give a warning.
3) No warning if my.cnf is in basedir.
 2005-02-23 18:59:54 +02:00
bell@52.0.168.192.in-addr.arpa
9d23922eb6 Post review changes 2005-02-23 18:51:10 +02:00
guilhem@mysql.com
086c2a915a FIx for BUG#8682 "flush_block_commit test hangs on HPUX": 
start_waiting_global_read_lock() should wake up all those who are waiting
for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
AND those registered in global_read_lock_blocks_commit.
 2005-02-23 17:38:51 +01:00
mskold@mysql.com
9e1b72d03d 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 17:20:01 +01:00
mskold@mysql.com
e0dbdca79e ha_ndbcluster.cc: 
Fixed faulty debug printout
ndb_condition_pushdown.test, ndb_condition_pushdown.result:
  Added BINARY and VARBINARY tests
 2005-02-23 17:18:06 +01:00
tomas@poseidon.ndb.mysql.com
bed049b061 added testcase for events where a "shadow table" is created 2005-02-23 16:57:07 +01:00
gluh@gluh.mysql.r18.ru
907c7af3ce Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-02-23 18:47:00 +03:00
gluh@gluh.mysql.r18.ru
2b5ee94a33 Fix for bug#6317: string function CHAR, parameter is NULL, wrong result 2005-02-23 18:15:45 +03: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
mskold@mysql.com
fcc37a0787 Fixes for condition pushdown to storage engine based on comments from code review 2005-02-23 15:51:26 +01:00
bar@mysql.com
67dd823b6b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/bar/mysql-5.0.fresh
 2005-02-23 18:17:00 +04:00
timour@mysql.com
f82226db86 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into mysql.com:/home/timka/mysql/src/5.0-bug-8576
 2005-02-23 16:03:58 +02:00
serg@serg.mylan
da13ab086d write "COMMIT" into binlog if there's no Xid at the end of transaction 
new tests
 2005-02-23 14:55:16 +01:00
bar@mysql.com
a88af6c1dd Merge 2005-02-23 17:03:34 +04: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
timour@mysql.com
297e0f8e76 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into mysql.com:/home/timka/mysql/src/5.0-bug-8576
 2005-02-23 14:47:48 +02:00
gluh@gluh.mysql.r18.ru
c595236c19 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-23 15:47:47 +03:00
bar@mysql.com
4996daec19 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2005-02-23 16:29:01 +04:00
bar@mysql.com
99937c2b91 config-win.h: 
Activate Unicode collations in Windows version.
 2005-02-23 16:28:10 +04: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
timour@mysql.com
a6bf8c6686 Fix for BUG#8576 
The problem was in different representations of double variables depending on
platform/compiler/compile options. In some cases double variables are represented by
64 bits (while in memory), or by 80 bits (while in FPU register). As a result equal
values are not considered "==". As many sources point out,  doubles should not be
compared by '==' for this reason. This fix subtracts the scaled minimal double
value X such that 1 + X != 1, to ensure that the inequality holds in any case.
 2005-02-23 13:39:29 +02:00
tomas@poseidon.ndb.mysql.com
ffc92eb2c3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-02-23 11:34:28 +01:00
tomas@poseidon.ndb.mysql.com
5a7f3ce9c1 Merge 2005-02-23 10:29:31 +01:00
tomas@poseidon.ndb.mysql.com
66043d568d Merge 2005-02-23 10:16:56 +01:00
tomas@poseidon.ndb.mysql.com
ce6ffc3dcc removed printout "- Repeated 1 times" 
make sure transporter connections are close early in shutdown
 2005-02-23 10:12:26 +01:00
gluh@gluh.mysql.r18.ru
eac72d405f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-23 12:08:35 +03:00
jimw@mysql.com
41043bb3f5 Merge 2005-02-22 16:39:21 -08:00
lars@mysql.com
ef4261d34a Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 2005-02-23 00:53:00 +01:00
lars@mysql.com
e330e2698d After merge fixes 2005-02-23 00:50:30 +01:00
serg@serg.mylan
bd89c2d37e Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-02-23 00:13:02 +01:00
tomas@poseidon.ndb.mysql.com
15bb6b9812 fixed bug that event subscriptions are not dropped correctly on api failure 
+ added debug printout
 2005-02-22 23:28:54 +01:00
lars@mysql.com
77f46e9c43 Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 2005-02-22 23:05:53 +01:00
lars@mysql.com
c60e676371 Manual merge 4.1->5.0 2005-02-22 22:42:49 +01:00
lars@mysql.com
7271a6014f Merge 4.1->5.0 2005-02-22 22:40:34 +01:00
jimw@mysql.com
a50be4d42b Merge mysql.com:/home/jimw/my/mysql-4.1-7989 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-22 13:15:34 -08:00
jimw@mysql.com
df3c8db4f3 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-22 13:14:49 -08:00
serg@serg.mylan
1f3bff8824 forget savepoints at the end of transaction 2005-02-22 21:57:57 +01:00
heikki@hundin.mysql.fi
5f427ec35d row0sel.c: 
Fix bug #8677: if one used LOCK TABLES, created an InnoDB temp table, and did a multi-table update where a MyISAM table was the update table and the temp table was a read table, then InnoDB aserted in row0sel.c because n_mysql_tables_in_use was 0. Also, we remove the assertion altogether and just print an error to the .err log if this important consistency check fails. Then it is up to the user to read the .err log and notice the problem if there still are errors in MySQL's table locking.
 2005-02-22 21:05:17 +02:00
sergefp@mysql.com
cdadc990e4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug8397
 2005-02-22 21:59:42 +03:00
sergefp@mysql.com
359e554137 Coding style fixes according to Sergei's feedback 2005-02-22 21:59:02 +03:00
sergefp@mysql.com
18373b1611 Fix for BUG#8397 (second commit after review): 
In Item_cache_decimal::store(item) the call item->val_decimal_result() 
returns NULL if the passed item has an SQL null value. Don't try copying
NULL into Item_cache_decimal::val in this case.
 2005-02-22 21:58:10 +03:00