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
21923 commits 2784 branches 343 tags 1.6 GiB
Commit graph

21923 commits

This branch
This branch
All branches
Author SHA1 Message Date
georg@lmy002.wdf.sap.corp
480063e077 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-04-12 13:42:40 +02:00
ramil@mysql.com
3b1c3d8c68 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.bit_class
 2005-04-12 12:30:09 +05:00
ramil@mysql.com
c4376b2bc6 Bit type support for non-MyISAM tables. 2005-04-12 12:27:43 +05:00
georg@lmy002.wdf.sap.corp
1cbe701d78 Fix for verification tests: loss of decimal places should not 
return an error
 2005-04-12 08:51:26 +02:00
gbichot@quadita2.mysql.com
2b7ec71836 all-local instead of all (to not have double "all:" in Makefile) 2005-04-11 17:44:28 +02:00
gbichot@quadita2.mysql.com
f356fb08d6 In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end 
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).
 2005-04-11 17:37:49 +02:00
gbichot@quadita2.mysql.com
e0831dce7a merge from 4.1 2005-04-11 16:59:06 +02:00
gbichot@quadita2.mysql.com
e42312c05d Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
 2005-04-11 16:47:39 +02:00
gbichot@quadita2.mysql.com
c7c928f168 Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice in the binary log" 
if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).
 2005-04-11 16:46:03 +02:00
reggie@mdk10.(none)
4bb4a285ab Merge mdk10.(none):/home/reggie/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-5.0
 2005-04-11 09:29:49 -05:00
reggie@mdk10.(none)
d07945c23b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-4.1
 2005-04-11 09:19:49 -05:00
petr@mysql.com
c53c3b1118 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-04-11 17:46:21 +04:00
petr@mysql.com
9c015f2a09 Merge mysqldev@production.mysql.com:my/mysql-5.0-build 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-04-11 17:20:29 +04:00
petr@mysql.com
da1d303001 make server logs less frightening, when using IM 2005-04-11 17:19:12 +04:00
petr@mysql.com
48b3332b8a Fix for bug #9808 2005-04-11 17:14:40 +04:00
petr@mysql.com
ace47c77be Fix for Bug #9589 2005-04-11 17:08:34 +04:00
bar@mysql.com
c6e1a4821e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-04-11 17:06:40 +05:00
pekka@mysql.com
fd5b9f7ed7 ndb - csc#4847 - manual merge 4.1->5.0 2005-04-11 12:43:58 +02:00
georg@lmy002.wdf.sap.corp
698399dc98 Fix for verification tests: truncation of post digits should not return an error 2005-04-11 12:25:44 +02:00
bar@mysql.com
71f530c4ea merge 2005-04-11 15:11:52 +05:00
joerg@mysql.com
fc0e6aa274 Manual transfer of the change in "configure.in" (4.1) to "config/ac-macros/character_sets.m4". 2005-04-11 11:24:30 +02:00
joerg@mysql.com
198b6117f9 Proper handling of "utf8-general-cs" clollation: Missing parts in configuration. 2005-04-11 11:12:08 +02:00
joreland@mysql.com
588559e3d8 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-04-11 10:26:18 +02:00
joreland@mysql.com
ed95158337 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-04-11 10:22:30 +02:00
dlenev@brandersnatch.localdomain
831a612483 Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER() 
function" into 4.1 tree.
 2005-04-11 10:44:48 +04:00
dlenev@mysql.com
b0dd388190 Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796 
into mysql.com:/home/dlenev/src/mysql-4.1-merges
 2005-04-11 09:53:54 +04:00
dlenev@mysql.com
06e3647274 Fix for bug #9796 "Query Cache caches queries with CURRENT_USER() 
function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.
 2005-04-11 00:30:23 +04:00
bar@mysql.com
16e186779f ctype_collate.result, ctype_collate.test, union.result, union.test: 
fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.
 2005-04-10 12:40:33 +05:00
pekka@mysql.com
dbae73bfa8 ndb - testOIBasic.cpp: 4.1->5.0 fix 2005-04-10 07:55:30 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b47f7902d3 New versions of mail_to_db.pl and pmail.pl. 
Added email threading capabilities to both
programs.
 2005-04-09 18:37:32 +03:00
acurtis@xiphis.org
aae638bbb2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.1
 2005-04-09 07:37:00 +01:00
jimw@mysql.com
9b4f106045 Fix warning and error when compiling on Windows. 2005-04-09 03:05:47 +02:00
acurtis@xiphis.org
dcc40a080d Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1 
into xiphis.org:/var/db/bk/work-acurtis/bug6776.2
 2005-04-09 00:36:08 +01:00
acurtis@xiphis.org
0998ec4264 Fix typos in Bug#6776 2005-04-09 00:21:51 +01:00
mskold@mysql.com
402ceb3222 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-08 22:49:08 +02:00
acurtis@xiphis.org
e82edda6c6 Merge xiphis.org:/var/db/bk/work-acurtis/bug6776 
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1
 2005-04-08 21:40:50 +01:00
reggie@mdk10.(none)
9506fb97b5 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-4.1
 2005-04-08 14:17:29 -05:00
marko@hundin.mysql.fi
a0af6bb7f5 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/mysql-4.1
 2005-04-08 22:17:28 +03:00
pem@mysql.comhem.se
2038ced40c Fixed BUG#9073: Able to declare two handlers for same condition in same scope 2005-04-08 19:58:04 +02:00
mskold@mysql.com
0ee6e48b22 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-08 19:57:07 +02:00
mskold@mysql.com
e8f45332bd Merge 2005-04-08 19:42:57 +02:00
pem@mysql.com
e6d72f1c48 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-08 17:32:50 +02:00
pem@mysql.comhem.se
ce2e40ac19 Fixed BUG#6900: Stored procedure inner handler ignored 
and BUG#9074: STORED PROC: The scope of every handler declared is not properly applied
 2005-04-08 17:31:37 +02:00
mskold@mysql.com
497f2684d8 Merge from fix of Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-08 16:49:14 +02:00
reggie@mdk10.(none)
3f5b8b976c Bug #9665 After registering MySQL service and starting with shared mem, cannot stop 
Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server
 2005-04-08 09:17:19 -05:00
reggie@mdk10.(none)
56bb135123 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-4.1
 2005-04-08 09:17:18 -05:00
joerg@mysql.com
ea39dffb9f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-04-08 16:17:17 +02:00
pem@mysql.comhem.se
e99da54fd5 Fixed BUG#7299: Stored procedures: exception handler catches not-found conditions 2005-04-08 16:05:16 +02:00
joerg@mysql.com
55ee7b9253 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/clone-4.1.11 2005-04-08 16:04:37 +02:00
joreland@mysql.com
d8a5305d0d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-04-08 14:16:57 +02:00