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
22409 commits 2790 branches 343 tags 1.7 GiB
Commit graph

10730 commits

Author SHA1 Message Date
heikki@hundin.mysql.fi
e8233c3afc ha_innodb.cc: 
Return a value from innobase_repl_report_sent_binlog()
 2005-05-03 08:40:35 +03:00
jimw@mysql.com
7bab94f36b Clean up merge from 4.1 2005-05-02 10:19:37 -07:00
jimw@mysql.com
8e87db9318 Merge mysql.com:/home/jimw/my/mysql-4.1-9947 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:12:27 -07:00
jimw@mysql.com
0b0e4f1166 Merge mysql.com:/home/jimw/my/mysql-4.1-9761 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:12:03 -07:00
jimw@mysql.com
2aea94f483 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:05:58 -07:00
serg@serg.mylan
530b6ba541 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-01 23:10:55 +02:00
sergefp@mysql.com
c83b78169e Merge mysql.com:/home/psergey/mysql-4.1-bug9228 
into mysql.com:/home/psergey/mysql-5.0-bug10274-merge
 2005-05-01 19:07:01 +04:00
sergefp@mysql.com
acca8f7af3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9228
 2005-05-01 19:03:49 +04:00
serg@serg.mylan
9c332d8d2a yassl changeset 2: 
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
  replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95
  set $USE_MYSYS_NEW even if CXX is g++
  yassl bugfixes
  instantiate all yassl templates explicitly
 2005-04-30 19:48:45 +02:00
monty@mysql.com
28a5491d3d Merge with 4.1 2005-04-30 09:46:08 +03:00
monty@mysql.com
e16985ba15 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-30 09:37:07 +03:00
konstantin@mysql.com
6040b0abf6 A fix and a test case for Bug#9520 "SELECT DISTINCT crashes server 
with cursor". The patch refactors do_select/sub_select
functions, which implement the nested loop algorithm, and reuses them to
fetch rows for cursors as well.
Pushing with view.test failing (--ps-protocol).
 2005-04-30 09:54:35 +04:00
monty@mysql.com
c0e8a8d625 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-30 03:46:38 +03:00
monty@mysql.com
aa84afb983 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-30 03:45:12 +03:00
monty@mysql.com
129c604032 Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598) 2005-04-30 03:14:42 +03:00
sergefp@mysql.com
96aeab05d1 Fix for BUG#10274: In Protocol_simple::store_long don't make any assumptions about 
relative sizes of int/long/longlong.
 2005-04-30 01:05:15 +04:00
evgen@moonbone.local
4b9f462da7 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/usr/src/mysql-4.1
 2005-04-29 22:20:16 +04:00
serg@serg.mylan
328f2e434a Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-04-29 19:31:56 +02:00
evgen@moonbone.local
b11705a2b0 Fix bug #9703 "Error 1032 with GROUP BY query and large tables" 
Reset old error if tmp table was successfully created.

Test data is large and can be found in bug report along with test query.
 2005-04-29 21:19:39 +04:00
jimw@mysql.com
78ff49437f Manually resolve merge 2005-04-29 08:46:03 -07:00
hf@deer.(none)
c2339a6ff0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.spaerrs
 2005-04-29 20:26:11 +05:00
hf@deer.(none)
054463f975 Fix for #6553 and #8776 (no errors on bad spatial data) 2005-04-29 20:23:02 +05:00
monty@mysql.com
fbf31c4a8c CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036) 
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467)
Fix compiler problems with MinGW (Bug #8872)
 2005-04-29 17:03:34 +03:00
ingo@mysql.com
673ef90a1b Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-29 14:56:04 +02:00
mskold@mysql.com
a248774682 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-29 14:16:41 +02:00
mskold@mysql.com
0fc5a1678c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-29 14:10:26 +02:00
ingo@mysql.com
fea20f9f18 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-29 12:54:15 +02:00
mskold@mysql.com
56499dbe54 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-29 11:56:38 +02:00
mskold@mysql.com
607b1a9987 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-29 11:53:35 +02:00
mskold@mysql.com
aed38a0f49 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-29 11:49:54 +02:00
mskold@mysql.com
2428e7b1cc Fix for avoiding gettin Invalid schema object version when doing local changes, fixed found bug 2005-04-29 11:37:47 +02:00
heikki@hundin.mysql.fi
1e6dba4d88 ha_innodb.cc: 
Fix compilation error on Windows in innobase_report_binlog_offset_and_commit()
 2005-04-29 12:11:04 +03:00
ingo@mysql.com
e465c0e0f3 BUG#5964 - 4.1 MERGE tables regression from 4.0 
After merge fix.
 2005-04-29 10:59:34 +02:00
ingo@mysql.com
de613e6b3d Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-29 09:05:37 +02:00
ingo@mysql.com
7d5604af89 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-04-29 09:03:34 +02:00
sergefp@mysql.com
908c5d74d4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug9821
 2005-04-29 02:52:20 +04:00
jimw@mysql.com
8ef6ae7442 Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_names 
is set on case-sensitive file systems and the source table
was specified in something other than lowercase. (Bug #9761)
 2005-04-28 15:30:42 -07:00
ingo@mysql.com
be34b54e1d Merge mysql.com:/home/mydev/mysql-4.1-4100 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-28 19:34:05 +02:00
sergefp@mysql.com
e31b850937 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug9298-merge
 2005-04-28 21:05:26 +04:00
ingo@mysql.com
8ccbea47e8 Merge mysql.com:/home/mydev/mysql-4.1-bug5964 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-04-28 18:34:47 +02:00
ingo@mysql.com
1f0d0a6729 BUG#5964 - 4.1 MERGE tables regression from 4.0 
Changed the creation of the .MRG file so that only the table  name
is written when the MyISAM table is in the same database as the
MERGE table, a relative path is used in other cases in mysqld,
and possibly an absolute path is used in an embedded server.
No test case is added as the external behaviour is unchanged.
Only the file names within the .MRG file are changed.
 2005-04-28 18:28:50 +02:00
sergefp@mysql.com
b2ebf51fbe Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9298
 2005-04-28 19:58:52 +04:00
monty@mysql.com
948fce01b3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-28 16:00:09 +03:00
msvensson@neptunus.(none)
5de370c534 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-28 13:32:52 +02:00
msvensson@neptunus.(none)
f78e1d1c44 Merge 2005-04-28 10:58:24 +02:00
mskold@mysql.com
78263507ab Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-28 10:57:08 +02:00
msvensson@neptunus.(none)
6b3e3b03d3 Merge neptunus.(none):/home/msvensson/mysql/bug9911 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-28 10:50:31 +02:00
msvensson@neptunus.(none)
9969e1c5ea BUG#9911 After review fixes 
- Remove ha_archive::rename_table and move the fix to handler::rename_table
 2005-04-28 10:49:18 +02:00
mskold@mysql.com
69c17fe46c Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-28 10:48:08 +02:00
mskold@mysql.com
92dc45c86f Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes 2005-04-28 10:46:39 +02:00