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

21802 commits

This branch
This branch
All branches
Author SHA1 Message Date
hf@deer.(none)
a8f80a8001 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.errmsg
 2005-04-07 19:30:14 +05:00
hf@deer.(none)
345b6d476a Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.errmsg
 2005-04-07 19:25:13 +05:00
magnus@msdesk.mysql.com
7de662074a Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into msdesk.mysql.com:/home/magnus/mysql-5.0
 2005-04-07 15:13:03 +02:00
magnus@msdesk.mysql.com
fb1827d623 Merge msdesk.mysql.com:/home/magnus/mysql-5.0-build 
into msdesk.mysql.com:/home/magnus/mysql-5.0
 2005-04-07 15:11:30 +02:00
magnus@msdesk.mysql.com
9911194a13 Fix linking problem on bsd53 
- See article http://archive.netbsd.se/?ml=freebsd-current&a=2004-07&m=257561
  or http://www.geocrawler.com/archives/3/254/2003/3/450/10409564/
 2005-04-07 14:39:30 +02:00
bar@mysql.com
b950bc210c ctype-eucjpms.c: 
After merge fix.
 2005-04-07 16:14:45 +05:00
jani@ua141d10.elisa.omakaista.fi
18354f4570 A small fix to Makefile.am 2005-04-07 13:20:15 +03:00
dlenev@brandersnatch.localdomain
8d05aa0f02 Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal 
state" to sp-error.test.

According to Per-Erik all SP related tests which should result in error
should go into sp-error.test and not in sp.test, because we want to be
able to run sp.test using normal client.
 2005-04-07 11:57:47 +04:00
dlenev@mysql.com
f374b21d07 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bg9566
 2005-04-07 10:41:07 +04:00
jimw@mysql.com
4caef066c7 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-04-06 15:24:12 -07:00
dlenev@brandersnatch.localdomain
d85bed1121 Fix for bug #9566 "explicit LOCK TABLE and store procedures result in 
illegal state".

We should not assume that mysql.proc table does not exist if we are
unable to open it under LOCK TABLES or in prelocked mode (and
remember this fact by setting mysql_proc_table_exists to zero).
 2005-04-07 01:40:29 +04:00
serg@serg.mylan
a4025168c7 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-04-06 23:13:29 +02:00
serg@serg.mylan
5cd866610d after merge fix 2005-04-06 23:12:10 +02:00
serg@serg.mylan
e1e5b97dea manually merged 
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually
 2005-04-06 21:19:20 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
96cf703d58 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-new
 2005-04-06 21:56:19 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
288eff45cb Added missing file to Makefile.am 2005-04-06 21:55:34 +03:00
serg@serg.mylan
78332dcf78 merged 2005-04-06 20:20:37 +02:00
konstantin@mysql.com
5f8d71710b Minor fix in cursors execution. 2005-04-06 22:09:43 +04:00
jimw@mysql.com
699c35c80e Merge mysql.com:/home/jimw/my/mysql-4.0-clean 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-04-06 11:02:20 -07:00
jimw@mysql.com
9dfc87e270 Merge mysql.com:/home/jimw/my/mysql-4.0-9492 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-04-06 10:53:09 -07:00
konstantin@mysql.com
4eeaaa90b7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/media/sda1/mysql/mysql-5.0-9520
 2005-04-06 21:49:00 +04:00
konstantin@mysql.com
70aecbb8a4 Refactor parts of do_select() (JOIN execution). 2005-04-06 21:48:16 +04:00
kent@mysql.com
053d3b2897 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-04-06 19:18:47 +02:00
monty@mysql.com
a7c6348192 Fixed errors found during review 2005-04-06 19:43:35 +03:00
kent@mysql.com
2aa8253f70 Merge 2005-04-06 18:19:05 +02:00
hf@deer.(none)
51f0963b8e Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.errmsg
 2005-04-06 21:05:45 +05:00
monty@mysql.com
beb28b27e0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-06 17:23:34 +03:00
monty@mysql.com
49e721677f Fixed errors descovered by valgrind 2.4 
Added suppression file for some valgrind warnings that are not real errors
 2005-04-06 17:22:21 +03:00
joerg@mysql.com
c47ac8590b Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0 2005-04-06 14:15:45 +02:00
marko@hundin.mysql.fi
f32fe9c154 InnoDB: Avoid test suite failures caused by a locking conflict 
between two server instances at server shutdown/startup.
This conflict on advisory locks appears to be the result of a bug
in the operating system; these locks should be released when the
files are closed, but somehow that does not always happen
immediately in Linux.  (Bug #9381)
 2005-04-06 15:09:15 +03:00
kent@mysql.com
34284d9354 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-04-06 13:45:14 +02:00
hf@deer.(none)
b552ed8fd3 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.errmsg
 2005-04-06 15:51:24 +05:00
hf@deer.(none)
7cd0e43437 Stupid error message for 'insert "aaa"' into decimal column fixed 2005-04-06 15:49:55 +05:00
msvensson@neptunus.(none)
1e030d5d93 BUG#9626 Several serious errors reported by Valgrind in latest 5.0 bk tree 
- Fixing obvious ones
 2005-04-06 12:27:43 +02:00
kent@mysql.com
57d8914287 Makefile.am: 
Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test-run.pl:
  Embedded result files no longer needed
 2005-04-06 12:20:55 +02:00
gluh@mysql.com
85bf400612 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
 2005-04-06 15:19:02 +05:00
bar@mysql.com
1c46a02069 Minor clean-ups for the previous commit. 2005-04-06 15:12:44 +05:00
gluh@mysql.com
decfc86fbb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
 2005-04-06 14:14:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables 2005-04-06 14:13:06 +05:00
heikki@hundin.mysql.fi
0c2caeb4d8 row0sel.c, btr0pcur.c, btr0pcur.ic, btr0pcur.h: 
Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
 2005-04-06 10:27:40 +03:00
bar@mysql.com
0134a2b286 Adding a new parameter for well_formed_length to 
return error. We'll use it for better warnign reporting.
 2005-04-06 11:53:15 +05:00
jimw@mysql.com
2f398fc3ae Update tests after merge of bug fix. 2005-04-05 20:55:06 -07:00
jimw@mysql.com
b95cb4e654 Merge 2005-04-05 19:45:34 -07:00
jani@ua141d10.elisa.omakaista.fi
08d51d05dc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-04-05 23:20:09 +03:00
jani@ua141d10.elisa.omakaista.fi
1dd12e9d04 Some of the argument place holders were not quite correct compared to 
the argument type. Fixed also some float() casts to double() as query_id
is now actually longlong type. Related to Bug#9646.
 2005-04-05 23:14:56 +03:00
jimw@mysql.com
127afff8c8 Remove references to result.es files 2005-04-05 13:01:42 -07:00
jimw@mysql.com
a12f66251b Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-04-05 12:37:23 -07:00
serg@serg.mylan
014c8829cb Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-04-05 20:04:31 +02:00
serg@serg.mylan
ea673c1afd Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-04-05 19:52:22 +02:00
serg@serg.mylan
8790645b48 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2005-04-05 19:45:04 +02:00