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
17525 commits 2788 branches 343 tags 1.7 GiB
Commit graph

17525 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
sergefp@mysql.com
ad43387fc2 Merging fix for BUG#7519 - not applying changes to 4.1 as 4.1 is not affected. 2005-02-28 18:49:35 +03: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
sergefp@mysql.com
b44f24000b Merge 2005-02-28 14:52:35 +03:00
monty@mysql.com
ab11370de6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-28 12:00:18 +02: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
sergefp@mysql.com
eb5d5de05f Fix for BUG#8560: Set max_sort_char for any 8-bit charset with binary collation. max_sort_char is needed by 
my_like_range_simple to produce upper bound constants for LIKE "str_%" and similar expressions.
 2005-02-26 17:15:04 +03:00
heikki@hundin.mysql.fi
41e45ab16a fil0fil.c: 
Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message
 2005-02-25 22:16:14 +02:00
heikki@hundin.mysql.fi
e40a88ea62 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-02-25 22:01:33 +02:00
bar@mysql.com
88e1ebd01a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1-again
 2005-02-25 18:16:45 +04:00
bar@mysql.com
e42a8c454b mysqldump.c: 
Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client
 2005-02-25 18:12:53 +04:00
ramil@mysql.com
671fa8bd66 merge 2005-02-25 17:28:47 +04:00
ramil@mysql.com
4ab10bcedf merge 2005-02-25 16:34:17 +04: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
54af1b8fc8 add auto generated ndb dsp-files (for msvc++ 6.0) to ignore file 2005-02-25 11:47:27 +01:00
joreland@mysql.com
1bbc88e9b1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-25 09:18:33 +01:00
joreland@mysql.com
b52ed0d669 Merge mysql.com:/home/jonas/src/fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-25 09:14:43 +01:00
joreland@mysql.com
72127b52b3 BUG#8786 - ndb_autodiscover, post review 
More explicit naming of variables
 2005-02-25 09:10:35 +01: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
lars@mysql.com
c99c44805c Fix of an incorrect merge 2005-02-24 17:25:06 +01:00
mwagner@here.mwagner.org
cbc8b5c3c8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
 2005-02-23 23:57:28 -06:00
mwagner@here.mwagner.org
27efaa9127 Bootstrap: 
Add new manual.texi include files
 2005-02-23 23:44:13 -06:00
joreland@mysql.com
87402eb5bb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-24 06:14:43 +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
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
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
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
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
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
monty@mysql.com
5e6ba9dec8 Fix errors in my last changeset 2005-02-22 15:08:12 +02: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
bar@mysql.com
5ef265f219 Bug#8349 myisamchk: --set-charset does not work 
What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message.
 2005-02-22 16:37:25 +04: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