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

20348 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com
f949f6a915 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-25 19:51:29 +02:00
pem@mysql.comhem.se
2af86eafc7 Fixed BUG#8757: Stored Procedures: Scope of Begin and End Statements do not work properly. 2005-02-25 17:56:45 +01:00
monty@mysql.com
7e5f74f8f2 Merge with global tree 2005-02-25 17:12:06 +02:00
monty@mysql.com
0a6b7aedb2 Remove compiler warnings and remove not used variables 
(Found during build process)
 2005-02-25 16:53:22 +02:00
pem@mysql.comhem.se
e3f286a04f Fixed BUG#7620: Stored procedure packet error if show mutex status 
Another multi result statement added.
  Note: No test case, as it's not possible to get a deterministic result from this.
 2005-02-25 15:21:05 +01:00
pem@mysql.com
4ad4a75ba9 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-02-25 13:26:25 +01:00
pem@mysql.comhem.se
76c6d9cd91 Fixed BUG#6857: current_time() in STORED PROCEDURES 
Have to thd->set_time() before each substatement execution, to make
  current_time() et al return different times within the same procedure.
 2005-02-25 13:19:44 +01:00
joreland@mysql.com
fe2a800423 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-25 11:48:46 +01: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
65daa271c1 Cset exclude: joreland@mysql.com|ChangeSet|20050224071025|18754 2005-02-25 09:35:09 +01:00
joreland@mysql.com
3aa91e242b Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-25 09:19:56 +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
8253f54524 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-25 09:17:55 +01:00
joreland@mysql.com
d51fa996ab Merge mysql.com:/home/jonas/src/fix 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-25 09:15:52 +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
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
brian@zim.(none)
4c144143de Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into zim.(none):/home/brian/mysql/mysql-5.0
 2005-02-24 12:44:41 -08:00
brian@zim.(none)
b6ed75e9a9 Solved bug 8691. 
Funny sometimes how things work when in reality you would think it would crash pretty hard :)
 2005-02-24 12:42:06 -08:00
joreland@mysql.com
bed5d6e418 bug#8786 - ndb_autodiscover - 5.0 specific details 
Wait some for all nodes to get connected
 2005-02-24 20:56:59 +01:00
guilhem@mysql.com
91d1cf4931 Fix for BUG#8783 kill.test must always sleep 2 seconds, even if 
mysql-test-run runs with --sleep=10; otherwise GET_LOCK() times out
before being killed so we get 0 instead of NULL. Verified that it
works on our powermacg5 where the test was failing.
 2005-02-24 19:13:55 +01:00
joreland@mysql.com
168847b8e1 Merge mysql.com:/home/jonas/src/fix 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-24 19:01:36 +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
brian@zim.(none)
02fe41a1fe Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into zim.(none):/home/brian/mysql/mysql-5.0
 2005-02-24 09:05:36 -08:00
ramil@mysql.com
05eb8af434 fixed compilation failure affects build without InnoDB 2005-02-24 20:55:20 +04:00
lars@mysql.com
4390d18cb5 Merge mysql.com:/home/bk/mysql-4.1 into mysql.com:/home/bk/mysql-5.0 2005-02-24 17:33:32 +01:00
lars@mysql.com
c99c44805c Fix of an incorrect merge 2005-02-24 17:25:06 +01:00
pem@mysql.comhem.se
2b1f0bf1f5 Fixed BUG#8638: Test 'sp' fails: Stored Procedure often sends warning 1329 
The warning sent is by itself ok, the problem was rather why it wasn't
  sent on some other platforms...
  The real problem was that a total_warn_count which was inconsistent with warn_list
  was sent back with send_eof() during SP execution, which in turn cause a protocol
  error in mysqltest.
 2005-02-24 13:56:09 +01:00
kent@mysql.com
c3af8b202d libmysqld.dsp: 
Corrected path to my_decimal.cpp
 2005-02-24 11:24:59 +01:00
msvensson@neptunus.(none)
84abf2378e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-02-24 10:08:47 +01:00
msvensson@neptunus.(none)
703faaba63 Update text for option 2005-02-24 10:07:37 +01:00
msvensson@neptunus.(none)
2570dc8883 Convert ndb-cache-check-time fomr milliseconds to seconds 2005-02-24 09:42:11 +01:00
ramil@mysql.com
077ed062af Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-02-24 12:18:37 +04:00
ramil@mysql.com
c1b78b1a4f A fix (mysql_priv.h should be included first) 2005-02-24 12:17:59 +04:00
bar@mysql.com
29e513d2a7 sql_select.cc: 
Redundant "Item::" was removed.
 2005-02-24 12:05:08 +04:00
joreland@mysql.com
a0aac3e3f8 #ifdef innodb specific code, (old_innodb_table_locks) 2005-02-24 08:10:25 +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
561c8d3d84 Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1 
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
 2005-02-23 23:53:48 -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
b90e9e4cc9 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-24 06:19:41 +01:00
joreland@mysql.com
00625adadc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-24 06:18:02 +01: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
reggie@mdk10.(none)
18799ea2ca Added my_mmap to mysys library 
mysys.dsp:
  Added my_mmap
 2005-02-23 23:10:22 -06:00
reggie@mdk10.(none)
579293a29f More changes to make 5.0.3 compile on Windows 
sql_map.cc:
  moved include of sys/stat outside of HAVE_SYS_MMAN_H define
my_decimal.h:
  Added define for EMBEDDED_SERVER for call to string2my_decimal
mi_packrec.c:
  removed cast to caddr_t
 2005-02-23 22:55:46 -06:00
bell@51.0.168.192.in-addr.arpa
cfdf5bcdc8 fixed test results 2005-02-24 04:07:58 +02:00
bell@51.0.168.192.in-addr.arpa
36265381fc Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
 2005-02-24 03:28:33 +02:00
bell@51.0.168.192.in-addr.arpa
3cb61419bd get time for thread switching 2005-02-24 03:25:53 +02:00
bell@51.0.168.192.in-addr.arpa
bf43b0d31a fixed typo in test 2005-02-24 02:59:36 +02:00
mats@mysql.com
199c01ddb3 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/bkroot/mysql-5.0
 2005-02-24 00:48:07 +01:00