database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity
19,138 Commits 3,346 Branches 1,099 Tags
72de651ab5544bb4e2881fbf2ba58dbe30552b2e
Commit Graph

9226 Commits

Author SHA1 Message Date
ram@gw.mysql.r18.ru
3350a7ec6d Merge gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
 2005-01-25 13:05:15 +04:00
ram@gw.mysql.r18.ru
8c043a299b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
 2005-01-25 11:06:12 +04:00
sergefp@mysql.com
3822eeb972 Fix for BUG#8003 attempt 2: 
Call file->external_lock() for handler objects that index_merge code creates in addition to 
  the handler object opened in open_and_lock_tables.
 2005-01-25 07:37:06 +03:00
jimw@mysql.com
d11081bd6f Merge 2005-01-24 13:48:48 -08:00
jimw@mysql.com
09aaba03cf Merge mysql.com:/home/jimw/my/mysql-4.1-7887 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-24 12:47:19 -08:00
jimw@mysql.com
fa1098618e Set lower_case_file_system when it is being tested to check if 
lower_case_tables_names=2 is sensible. Related to Bug #7887.
 2005-01-24 12:31:14 -08:00
serg@serg.mylan
c76405a7ee merged 2005-01-24 19:41:42 +01:00
serg@serg.mylan
79240013b2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-24 15:50:13 +01:00
serg@serg.mylan
67ba2e367a fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
igor@rurik.mysql.com
14eceb4b98 Manual merge 2005-01-22 03:12:44 -08:00
igor@rurik.mysql.com
0b61a16fd2 Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-01-22 02:42:54 -08:00
igor@rurik.mysql.com
8527f256c0 select_found.result, select_found.test: 
Added a test case for bug #7945.
sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.
 2005-01-22 02:40:27 -08:00
timour@mysql.com
e19c6a856d Manual merge of the fix for BUG#4285 from 4.1 2005-01-21 17:41:11 +02:00
timour@mysql.com
36f1e91b69 Merge of fix for BUG#4258 from 4.1. 
Needs additional manual merge.
 2005-01-21 17:38:36 +02:00
timour@mysql.com
b266ad2c24 Merge mysql.com:/home/timka/mysql/src/4.1-bug-4285 
into mysql.com:/home/timka/mysql/src/4.1-dbg
 2005-01-21 16:47:51 +02:00
bar@mysql.com
10c4977878 sql_show.cc: 
#7943: Wrong prefix lengths reported on UTF-8 columns
  after merge fix.
 2005-01-21 17:00:14 +04:00
bar@mysql.com
2f6e0864ad Bug#7943: Wrong prefix lengths reported on UTF-8 columns 
SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.
 2005-01-21 16:49:20 +04:00
ram@gw.mysql.r18.ru
9c3c566fcb A fix (bug #7261: Alter table loses temp table with lower_case_table_names=2). 2005-01-21 15:14:31 +04:00
ram@gw.mysql.r18.ru
84f0b1eeee Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-21 12:10:19 +04:00
tomas@poseidon.ndb.mysql.com
61b1de9533 2005-01-20 23:23:15 +01:00
tomas@poseidon.ndb.mysql.com
3dfcf07cc9 ha_ndbcluster.cc: 
read row size with wrong type
 2005-01-20 22:28:08 +01:00
sergefp@mysql.com
2113675cbc Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-wl2126-fix
 2005-01-20 20:57:30 +03:00
mskold@mysql.com
d959e2ab40 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-20 16:41:08 +01:00
mskold@mysql.com
44a511a191 Fix for Bug #7988 Bitfield test fails 2005-01-20 15:50:56 +01:00
tomas@poseidon.ndb.mysql.com
86197400bc Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-20 15:37:27 +01:00
tomas@poseidon.ndb.mysql.com
dd6958eb20 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-20 15:21:00 +01:00
tomas@poseidon.ndb.mysql.com
ac53ecce1c added variable NDB_MGM to be able to run the management client in tests 
added testcase for Bug#8035
    added option to wait for not-started
    Bug#8035
 2005-01-20 13:45:42 +01:00
bar@mysql.com
6b5c7c7290 Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-20 16:08:27 +04:00
bar@mysql.com
ca48cfbfcc item_cmpfunc.cc: 
Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.
 2005-01-20 15:38:56 +04:00
bar@mysql.com
5ed1b14464 errmsg.txt: 
Adding Shift-JIS error messages
  for Japanese Windows distributions.
  Thanks to Serg for help with a perl program 
  to merge 4.1 messages into 5.0 format :)
 2005-01-20 15:33:21 +04:00
ram@gw.mysql.r18.ru
dfe8132fb4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-20 14:22:02 +04:00
joreland@mysql.com
bca4f68773 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-20 10:13:45 +01:00
bar@mysql.com
07be090e6e errmsg.txt: 
Minor fix after character set conversion.
 2005-01-20 13:08:16 +04:00
sergefp@mysql.com
a5a99cf7a9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-20 11:57:30 +03:00
ram@gw.mysql.r18.ru
c397751373 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-20 12:56:18 +04:00
bar@mysql.com
0afb9b244a configure.in: 
Auto-merge fix:
  removing this file: error messages are done
  in a different way in 5.0.
.del-errmsg.txt~31abf77f9e7b9211:
  Delete: sql/share/japanese-sjis/errmsg.txt
 2005-01-20 12:44:33 +04:00
bar@mysql.com
c1d40baf18 Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-20 12:42:08 +04:00
bar@mysql.com
1650728655 errmsg.txt: 
new file
 2005-01-20 12:37:02 +04:00
sergefp@mysql.com
9dda3a70d3 Merge 2005-01-20 07:51:00 +03:00
jimw@mysql.com
3bdfe44859 Warn when mysqld starts up with lower_case_table_names=2 but datadir is 
on a case-sensitive filesystem. (Bug #7887)
 2005-01-19 12:23:24 -08:00
sergefp@mysql.com
9a7a47c21c Merge mysql.com:/dbdata/psergey/mysql-4.1-bug7885 
into mysql.com:/dbdata/psergey/mysql-5.0-bug7885
 2005-01-19 23:11:50 +03:00
sergefp@mysql.com
b1c3e43060 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
 2005-01-19 23:02:28 +03:00
tulin@build.mysql.com
16f77ce996 Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
 2005-01-19 14:20:28 +01:00
gluh@gluh.mysql.r18.ru
c1b92f6a90 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-19 16:20:25 +03:00
gluh@gluh.mysql.r18.ru
994c1fd4d8 View field names should be case insensitive 2005-01-19 16:19:10 +03:00
ram@gw.mysql.r18.ru
92545cb3a9 ER_WARN_DATA_TRUNCATED replaced with WARN_DATA_TRUNCATED. 2005-01-19 16:24:06 +04:00
timour@mysql.com
7fb0de20f3 Final patch for BUG#4285. 
This patch collects all previous patches into one.

The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.
 2005-01-19 12:55:54 +02:00
ram@gw.mysql.r18.ru
f131e5a925 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-19 12:05:59 +04:00
ram@gw.mysql.r18.ru
c24c023e8c A fix (bug #6999: Traditional: Wrong SQLSTATE returned for string truncation). 2005-01-19 12:04:35 +04:00
joreland@mysql.com
2af06e0b32 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-19 07:37:42 +01:00