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

8336 commits

Author SHA1 Message Date
ramil@mysql.com
8f90906961 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b6089
 2005-03-01 12:31:05 +04:00
ramil@mysql.com
4225b8e8ff Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b5615
 2005-03-01 12:20:55 +04:00
sergefp@mysql.com
d2fec05179 Fix for BUG#8562: In Item_int_with_ref::new_item() create Item_int or Item_uint 
depending on ref->unsigned_flag. Item_int_with_ref can refer to both signed and 
unsigned integers.
 2005-02-28 23:50:06 +03:00
sergefp@mysql.com
a6ad8a4d0f Fix for BUG#8726: In JOIN::optimize on ER_TOO_BIG_SELECT error set JOIN::error to -1 to cause 
the error to be sent to the client.
 2005-02-28 20:21:21 +03:00
ramil@mysql.com
c896fcb483 merging 2005-02-28 19:59:38 +04:00
ramil@mysql.com
883ff0cc81 merging 2005-02-28 18:11:18 +04:00
sergefp@mysql.com
a06c6d41bb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/psergey/mysql-4.0-look
 2005-02-28 15:40:45 +03:00
monty@mysql.com
253bfcf783 Fixed wrong memory references found by purify 
(No really critical errors found, but a few possible wrong results)
 2005-02-28 11:59:46 +02:00
ramil@mysql.com
dee22632f7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b4802
 2005-02-25 15:47:36 +04:00
joreland@mysql.com
c25ce0e362 Merge mysql.com:/home/jonas/src/fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-24 18:59:56 +01:00
joreland@mysql.com
15de06f290 bug#8786 - ndb autodiscover, sometimes fails 
remove dict forwarding
  add api retries on NotMaster
 2005-02-24 18:58:56 +01:00
mats@mysql.com
30ade5b57e Bug#8412: Setting error code to 0 on statements that cannot fail. 2005-02-23 20:59:00 +01:00
mats@mysql.com
6ad51ffb3c Bug#8412: Merge from 4.0 2005-02-23 19:58:54 +01:00
mats@mysql.com
a4cdb93b38 Merge mysql.com:/home/bkroot/mysql-4.0 
into mysql.com:/home/bk/b8412-mysql-4.0
 2005-02-23 19:40:31 +01: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
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
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
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
lars@mysql.com
c583eb6954 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 14:17:17 +01:00
lars@mysql.com
6b06ff5956 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/bkroot/mysql-4.1
 2005-02-22 14:12:42 +01:00
lars@mysql.com
d59fa45596 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 14:12:23 +01:00
lars@mysql.com
f09466e0d7 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b8297-4.1 2005-02-22 14:03:01 +01:00
monty@mysql.com
7914e24409 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-22 14:43:14 +02:00
lars@mysql.com
e31ea39d0c Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:39:41 +01:00
bell@51.0.168.192.in-addr.arpa
babcdb6407 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
 2005-02-22 14:34:59 +02:00
lars@mysql.com
d2ecf8e6a5 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:29:20 +01:00
lars@mysql.com
2d1089e8c1 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1 2005-02-22 13:22:34 +01:00
bar@mysql.com
89a5530822 A user variable are now always have IMPLICIT coercibility, 
independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with 
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.
 2005-02-22 15:55:40 +04:00
lars@mysql.com
1d3c67000b BUG#6662: Changes after Guilhems and Sergs review 2005-02-22 12:40:31 +01:00
bell@51.0.168.192.in-addr.arpa
9a9811f3a4 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
 2005-02-22 13:00:00 +02:00
monty@mysql.com
22a76c1dfb Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-22 12:51:54 +02:00
monty@mysql.com
e2dc9b4099 Backport my_strntod() from 5.0 
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)
 2005-02-22 12:51:23 +02:00
bar@mysql.com
c709ad87db field.cc: 
optimize test_if_minus() when not UCS2 support is compiled.
 2005-02-22 08:35:15 +04:00
lars@mysql.com
be28ef0a20 BUG#6662: Importing mysqldumps should not show any warnings of level "notes". 2005-02-21 18:40:28 +01:00
lars@mysql.com
d857155e1d BUG#6676: Added comment for the fix 2005-02-21 17:52:15 +01:00
lars@mysql.com
5cffeb2b85 BUG#6676: Derivation of user variables should be of derivation "IMPLICIT" 2005-02-21 16:26:04 +01:00
konstantin@mysql.com
b902a66e27 Fix -ansi -pedantic compilation failure. 2005-02-21 17:27:36 +03:00
jimw@mysql.com
10800c1eb5 Merge mysql.com:/home/jimw/my/mysql-4.1-8475 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-18 15:40:17 -08:00
jimw@mysql.com
29d1d9a369 Clean up merge for fix for Bug #8350. 2005-02-18 15:23:17 -08:00
jimw@mysql.com
793a505c26 Fix merge of fix for Bug #4872. 2005-02-18 15:02:54 -08:00
jimw@mysql.com
5348bc99c1 Clean up fix for Bug #7989 by avoiding extra memory copy, and adding some 
more information to the error message.
 2005-02-18 12:47:33 -08:00
mats@mysql.com
0ad02a920c Merge from 4.0 2005-02-18 14:19:08 +01:00
mats@mysql.com
d0f1b5f3fd Merge mysql.com:/home/bkroot/mysql-4.0 
into mysql.com:/home/bk/b7879-mysql-4.0
 2005-02-18 13:50:19 +01:00
hf@deer.(none)
8b2fc991cd Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2005-02-18 15:52:59 +04:00
hf@deer.(none)
93e0107050 Fix for the bug #7344 (multiple server_init/server_end lead to crash) 
Some variable wasn't moved to the initial state during mysql_server_end
 2005-02-18 15:51:55 +04:00
jimw@mysql.com
3c700572b4 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 15:23:28 -08:00
jimw@mysql.com
e3ff1bf326 Merge mysql.com:/home/jimw/my/mysql-4.1-8303 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:54:05 -08:00
jimw@mysql.com
219e29d7ae Merge mysql.com:/home/jimw/my/mysql-4.1-8471 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:53:07 -08:00