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

28487 commits

This branch
This branch
All branches
Author SHA1 Message Date
bar@mysql.com
949aced164 Merge mysql.com:/usr/home/bar/mysql-4.1.b15377 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-13 16:39:33 +04:00
bar@mysql.com
977731b3fc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15377
 2006-01-13 16:21:44 +04:00
bar@mysql.com
78e93fbbcf Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15377
 2006-01-13 14:22:53 +04:00
bar@mysql.com
b061cacb0b Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15377
 2006-01-13 14:16:16 +04:00
evgen@moonbone.local
8dbedc9ffd Merge 2006-01-13 12:13:50 +03:00
jonas@perch.ndb.mysql.com
972723b02e Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
 2006-01-13 09:29:24 +01:00
jonas@perch.ndb.mysql.com
026e3984b2 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-01-13 07:41:49 +01:00
jonas@perch.ndb.mysql.com
8dce5e198d bug#15619 - ndb_autodiscover sometimes fails 2006-01-13 07:40:15 +01:00
jonas@perch.ndb.mysql.com
8c41e2ae2c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-01-13 07:31:35 +01:00
dlenev@mysql.com
f9ea947bdc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2
 2006-01-13 01:56:57 +03:00
dlenev@mysql.com
d14e701446 Fix for bug #12198 "Temporary table aliasing does not work inside stored 
functions".

We should ignore alias when we check if table was already marked as temporary
when we calculate set of tables to be prelocked. Otherwise we will erroneously
treat tables which are used in same routine and have same name but different
alias as non-temporary.
 2006-01-13 01:51:56 +03:00
jani@ua141d10.elisa.omakaista.fi
4d59111a1c Fixed a bug in merge. 2006-01-12 20:49:47 +02:00
jani@ua141d10.elisa.omakaista.fi
8f3645e6f0 Fix for Netware build. 2006-01-12 20:31:00 +02:00
jani@ua141d10.elisa.omakaista.fi
617585eb33 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2006-01-12 20:28:23 +02:00
msvensson@neptunus.(none)
fac966560a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-12 18:25:51 +01:00
msvensson@neptunus.(none)
0dffbdfb61 Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-12 18:23:44 +01:00
msvensson@neptunus.(none)
7f919f9ef7 Use "test ! -s" to check that file does not exist 2006-01-12 18:19:57 +01:00
jani@ua141d10.elisa.omakaista.fi
8c6a32b997 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2006-01-12 17:47:58 +02:00
jani@ua141d10.elisa.omakaista.fi
af845f6eff NetWare specific change to increase thread stack size. 
Changes to Netware specific mysqld_safe.c
 2006-01-12 15:10:12 +02:00
monty@mysql.com
4d0fd66bdd Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-01-12 14:40:39 +02:00
bar@mysql.com
6301568290 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-12 16:07:06 +04:00
bar@mysql.com
5f17cbaba4 sql_show.cc: 
after-merge fix for
  bug#15581 COALESCE function truncates mutli-byte TINYTEXT values
 2006-01-12 16:05:46 +04:00
bar@mysql.com
832148ded2 ctype_utf8.result: 
After merge fix:
  fixing order of results.
 2006-01-12 13:08:49 +04:00
sergefp@mysql.com
40b7fab55d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
 2006-01-12 11:55:34 +03:00
sergefp@mysql.com
aa00d65ead Fix typo bug in previous cset 2006-01-12 11:11:16 +03:00
sergefp@mysql.com
e40759e370 BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics check to take into 
account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)
 2006-01-12 10:48:27 +03:00
bar@mysql.com
0e9c8395c7 Merge mysql.com:/usr/home/bar/mysql-4.1.b15581 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-12 11:38:09 +04:00
bar@mysql.com
45c84d0aa9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15581
 2006-01-12 11:13:34 +04:00
anozdrin@mysql.com
00936e2777 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/MySQL/devel/5.0-bug15103
 2006-01-12 03:05:29 +03:00
anozdrin@mysql.com
dae00c191f Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem. 2006-01-12 03:02:52 +03:00
reggie@linux.site
b03abd2888 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  linux.site:/home/reggie/work/mysql-5.0
 2006-01-11 16:34:51 -06:00
reggie@linux.site
8de137a3aa simple Windows compile fixes. 2006-01-11 16:18:11 -06:00
evgen@moonbone.local
605f62fce8 Fixed bug #15633: Evaluation of Item_equal for non-const table caused wrong 
select result

Item equal objects are employed only at the optimize phase. Usually they are not
supposed to be evaluated.  Yet in some cases we call the method val_int() for
them. Here we have to take care of restricting the predicate such an object
represents f1=f2= ...=fn to the projection of known fields fi1=...=fik.

Added a check for field's table being const in Item_equal::val_int().
If the field's table is not const val_int() just skips that field when
evaluating Item_equal.
 2006-01-11 22:49:43 +03:00
konstantin@mysql.com
4d272aba67 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-01-11 17:49:56 +03:00
konstantin@mysql.com
9105d06dd6 A fix for Bug#13944 "libmysqlclient exporting sha1_result function": 
rename sha1_* to mysql_sha1_*
 2006-01-11 17:31:52 +03:00
knielsen@mysql.com
db7e7cbef9 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/tmpbuild
 2006-01-11 13:03:19 +01:00
msvensson@neptunus.(none)
4b913614fc Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-11 11:24:57 +01:00
msvensson@neptunus.(none)
f60f757689 Add comments that groups and describes the inits 2006-01-11 11:10:58 +01:00
msvensson@neptunus.(none)
f4ad824df9 Remove obsolete comment 2006-01-11 11:07:17 +01:00
msvensson@neptunus.(none)
2f48e4f1dc Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero. 2006-01-11 11:06:26 +01:00
knielsen@mysql.com
246690cb1e Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-01-11 09:02:13 +01:00
msvensson@neptunus.(none)
d42d399464 Disable code for "let" to assign each column from query to it's own variable 2006-01-11 00:24:57 +01:00
anozdrin@mysql.com
e5d26fc446 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/MySQL/devel/5.0-bug15110
 2006-01-11 02:10:59 +03:00
anozdrin@mysql.com
b04b851ef9 Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause 
There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.
 2006-01-11 02:07:40 +03:00
ingo@mysql.com
fc85125a93 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/nfstmp1/ingo/autopush-773/mysql-5.0
 2006-01-10 21:57:47 +01:00
ingo@mysql.com
4c447ea454 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2006-01-10 20:03:28 +01:00
jani@hasky.mysql.fi
5182d40412 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hasky.mysql.fi:/home/jani/mysql-5.0
 2006-01-10 20:56:24 +02:00
aivanov@mysql.com
cdf3e4c02e Post-merge changes 2006-01-10 21:03:02 +03:00
jani@ua141d10.elisa.omakaista.fi
d9d6dfea3a Changed function prototype. 2006-01-10 19:19:56 +02:00
monty@mysql.com
2970e71ce8 Re-run fix-fields on condition if table was reopened in HANDLERREAD 2006-01-10 19:13:12 +02:00