mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
22493 commits 2784 branches 343 tags 1.6 GiB
Commit graph

22493 commits

This branch
This branch
All branches
Author SHA1 Message Date
jani@ibmlab.site
0e91a7131f Merge ibmlab.site:/home/my/bk/mysql-4.1 
into ibmlab.site:/home/my/bk/mysql-5.0
 2005-05-06 13:42:30 +03:00
jan@hundin.mysql.fi
ec60f79958 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/jan/mysql-5.0
 2005-05-06 13:42:29 +03:00
jan@hundin.mysql.fi
8cf0957dfa Merge hundin.mysql.fi:/home/jan/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-5.0
 2005-05-06 13:38:18 +03:00
jani@ibmlab.site
27ee605090 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ibmlab.site:/home/my/bk/mysql-4.1
 2005-05-06 13:22:56 +03:00
bar@noter.(none)
59129d9bbe bug#6504 Upper/Lower conversion bug: 
upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.
 2005-05-06 15:22:55 +05:00
marko@hundin.mysql.fi
403b00481c Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0.4
 2005-05-06 12:48:37 +03:00
marko@hundin.mysql.fi
ec0052cda4 After merge fix 2005-05-06 12:43:10 +03:00
jani@ibmlab.site
fa25b9b49d A fix for Bug#8467. 2005-05-06 12:18:37 +03:00
marko@hundin.mysql.fi
2f0424cd62 Merge 2005-05-06 11:45:59 +03:00
ramil@ram-book.(none)
50579df606 A fix (bug #10404: select 0/0 returns 0). 2005-05-06 13:31:48 +05:00
bar@mysql.com
5496b7babb Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/root/mysql-5.0
 2005-05-06 13:31:47 +05:00
bar@mysql.com
b1431c222a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/root/mysql-5.0
 2005-05-06 13:08:28 +05:00
dlenev@mysql.com
917cb3dfbc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bg9841
 2005-05-06 11:18:37 +04:00
marko@hundin.mysql.fi
f9e7e2ee90 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/mysql-4.1
 2005-05-06 10:15:58 +03:00
bar@mysql.com
1f14cfcb35 merging cp932 from 4.1 2005-05-06 12:00:25 +05:00
ramil@mysql.com
788678d392 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-06 11:48:55 +05:00
bar@mysql.com
b93385de8f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/root/mysql-5.0
 2005-05-06 11:48:54 +05:00
ramil@mysql.com
802360fbc2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-06 08:34:50 +05:00
lenz@mysql.com
22a8b93cc5 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-05-06 00:21:20 +02:00
lenz@mysql.com
b4d43939fb Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0-build
 2005-05-06 00:18:13 +02:00
lenz@mysql.com
7550b0b4ea - fixed typo in variable name that caused compile errors on many platforms (tmp_error -> tmp_errno) 2005-05-06 00:16:33 +02:00
holyfoot@hf-ibm.(none)
8f3647005c Tests and results fixed with last precision/decimal related modifications 2005-05-06 01:01:39 +05:00
holyfoot@mysql.com
196a87cbd6 Merge mysql.com:/home/hf/work/mysql-5.0.clean 
into mysql.com:/home/hf/work/mysql-5.0.prec
 2005-05-06 00:58:07 +05:00
shuichi@mysql.com
2244ae8cef Added cp932 character set 2005-05-05 11:37:52 -07:00
shuichi@mysql.com
f0fb08dd79 Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql
 2005-05-05 10:46:14 -07:00
shuichi@mysql.com
720418fe46 Added cp932 character set 2005-05-05 10:36:17 -07:00
gbichot@quadita2.mysql.com
74032c3644 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-05-05 18:37:38 +02:00
gbichot@quadita2.mysql.com
688d9ee03c making rpl_sp.test hostname-independent 2005-05-05 18:28:54 +02:00
bar@noter.(none)
153b928c10 Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci 
We cannot propagate constants with tricky collations.
 2005-05-05 21:13:57 +05:00
dlenev@brandersnatch.localdomain
d60674d665 Fix for bug #9841 "Unexpected read lock when trying to update a view in 
a stored procedure" (version 2).

To handle updates and inserts into view in SP properly we should set
lock types for tables of the view's main select when we are opening
view for prelocking purproses.
 2005-05-05 19:49:15 +04:00
holyfoot@mysql.com
556504287b Merge 2005-05-05 20:10:50 +05:00
holyfoot@hf-ibm.(none)
2c8e9df232 A lot of fixes to Precision math 
Mostly about precision/decimals of the results of the operations
 2005-05-05 20:06:49 +05:00
ram@ram-book.(none)
65f5a15a2d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ram-book.(none):/home/ram/work/5.0
 2005-05-05 19:22:33 +05:00
serg@sergbook.mylan
6b053194db Merge bk-internal:/home/bk/mysql-5.0 
into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-05 16:22:32 +02:00
serg@sergbook.mylan
83dfc216a7 gcc 2.92 compatibility 2005-05-05 16:21:17 +02:00
gbichot@quadita2.mysql.com
d11607b08f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-05-05 14:40:10 +02:00
konstantin@mysql.com
ca9aeb5707 Post merge fixes (merge of Bug#9777) 2005-05-05 16:31:18 +04:00
gbichot@quadita2.mysql.com
b72ae4fe57 Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions). 
Approximative, because it's using our binlogging way (what we call "query"-level) and this is not as good as record-level binlog (5.1) would be. It imposes several
  limitations to routines, and has caveats (which I'll document, and for which the server will try to issue errors but that is not always possible).
  Reason I don't propagate caller info to the binlog as planned is that on master and slave
  users may be different; even with that some caveats would remain.
 2005-05-05 14:20:53 +02:00
ramil@ram-book.(none)
b9ccbfd1f3 A fix (bug #10179: error in default value setting). 2005-05-05 17:17:55 +05:00
gluh@mysql.com
9f5a51e8d6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Devel/mysql-4.1
 2005-05-05 16:23:39 +05:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
konstantin@mysql.com
15dbab1c12 A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it 
should return a non empty one"
(see comments for the changed files for details).
 2005-05-05 12:55:09 +04:00
kent@mysql.com
5198f49639 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
 2005-05-05 09:36:19 +02:00
kent@mysql.com
038ef8f865 mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper: 
Initial Metrowerks CodeWarrior compiler support
  new file
 2005-05-05 09:34:15 +02:00
gluh@mysql.com
665cbabe07 Bug #5843: Server code does not check whether PID file was successfully written 2005-05-05 12:24:10 +05:00
jan@hundin.mysql.fi
3cddcc63fa Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-05-05 10:15:15 +03:00
kent@mysql.com
c4acdc6e0f terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h: 
Initial Metrowerks CodeWarrior compiler support
 2005-05-05 09:15:14 +02:00
jan@hundin.mysql.fi
71f620890c Fig compiler error. 2005-05-05 08:08:39 +03:00
petr@mysql.com
25f44eab31 Merge pchardin@10.100.1.170:/home/bk/mysql-5.0 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-05-04 19:35:33 +04:00
petr@mysql.com
560a908315 fix --defaults-file and --defaults-extra-file broken by a wrong merge 2005-05-04 18:46:29 +04:00