mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17590 commits 2784 branches 343 tags 1.6 GiB
Commit graph

17590 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@mysql.com
c45cfb7c07 Manual merge of the 4.0.24 compile changes into the 4.1 tree. 2005-03-07 10:27:20 +01:00
georg@lmy002.wdf.sap.corp
473f2f9409 New Project files for Windows Ithanium 64-bit builds 2005-03-06 14:22:28 +01:00
igor@linux.local
6d7862aeaf logging_ok: 
Logging to logging@openlogging.org accepted
func_group.result, func_group.test:
  Added a test case for bug #8893.
opt_sum.cc:
  A misplaced initialization for the returned parameter
  prefix_len in the function find_key_for_maxmin caused
  usage of a wrong key prefix by the min/max optimization
  in cases when the matching index was not the first index
  that contained the min/max field.
 2005-03-04 20:24:13 -08:00
heikki@hundin.mysql.fi
d565920ba2 ut0mem.c: 
If InnoDB cannot allocate memory, keep retrying for 60 seconds before we crash mysqld; maybe the memory shortage is just temporary
 2005-03-04 18:17:29 +02:00
heikki@hundin.mysql.fi
474a910499 trx0trx.c: 
Do not assert, but print diagnostics if MySQL tries to free a trx where n_mysql_tables_in_use > 0
 2005-03-04 17:58:06 +02:00
marko@hundin.mysql.fi
a8aced1e64 ha_innodb.cc: 
write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE
  will commit at every 10,000 copied rows.
 2005-03-04 15:53:05 +02:00
marko@hundin.mysql.fi
92d8692495 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/mysql-4.1
 2005-03-04 15:27:07 +02:00
joerg@mysql.com
4e136e8d1a Please the Sun C compiler by qualifying 'inline' as 'static inline'. 2005-03-04 12:31:30 +01:00
joerg@mysql.com
6ccbe89d52 Qualify 'inline' functions as 'static inline' to please the Sun C compiler. 2005-03-04 11:26:08 +01:00
bar@mysql.com
7e8e033290 type_blob.result, func_system.result, func_str.result, ctype_collate.result: 
fixing test results accordingly.
func_system.test:
  New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
    safe_charset_converter() was added for system constants.
item_strfunc.cc:
  safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
  Version is a system constant too.
 2005-03-04 14:20:49 +04:00
joerg@mysql.com
136c1ea181 Changed C++ style comment to C style for 'sql/net_serv.cc' which will be symlinked 
to 'libmysql/net.c'.
 2005-03-04 11:07:56 +01:00
ingo@mysql.com
0f3b5b7ccb Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-03-04 11:06:41 +01:00
konstantin@mysql.com
6047aeb47d Fix compilation failure in mi_create.c 2005-03-04 12:39:03 +03:00
joerg@mysql.com
631aac9d00 Prevent a collision with the system's '#define errno ...' by guarding the variable declaration. 2005-03-04 10:22:50 +01:00
ingo@mysql.com
b5775ee16c Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-03-04 09:35:21 +01:00
ingo@mysql.com
d68db573e6 Fix for a build bug. 
Added a missing comma.
 2005-03-04 09:30:22 +01:00
serg@serg.mylan
f2c414e024 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-04 00:05:52 +01:00
serg@serg.mylan
3de51f273b after merge fixes 2005-03-03 23:57:48 +01:00
serg@serg.mylan
08d5ef6507 typos fixed 2005-03-03 23:10:23 +01:00
serg@serg.mylan
e47d0a0e2d merge 2005-03-03 23:07:20 +01:00
jimw@mysql.com
96e034f50e Fix symlink test to avoid filenames with paths 2005-03-03 12:36:27 -08:00
serg@serg.mylan
45641ff65c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2005-03-03 21:13:57 +01:00
serg@serg.mylan
f84bd700b3 uninit variable fixed 2005-03-03 21:13:33 +01:00
serg@serg.mylan
8d9a53a78c Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it) 2005-03-03 19:51:29 +01:00
jimw@mysql.com
9df04058fe Merge mysql.com:/home/jimw/my/mysql-4.1-8707 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-03-03 10:50:18 -08:00
jimw@mysql.com
fe065fe78c Merge mysql.com:/home/jimw/my/mysql-4.1-8136 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-03-03 10:47:49 -08:00
jimw@mysql.com
0e8a5dbe08 Merge mysql.com:/home/jimw/my/mysql-4.1-3309 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-03-03 10:47:20 -08:00
heikki@hundin.mysql.fi
07a0fdeb24 srv0start.c: 
Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST
 2005-03-03 18:00:34 +02:00
heikki@hundin.mysql.fi
c93fcd19a5 Merge 2005-03-03 17:50:04 +02:00
heikki@hundin.mysql.fi
df6d26e4bd srv0start.c: 
Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c
os0file.c:
  Revert the AIX patch here
 2005-03-03 17:46:56 +02:00
heikki@hundin.mysql.fi
80fca0a075 Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-03-03 17:26:12 +02:00
heikki@hundin.mysql.fi
47440f4b5a os0file.c: 
AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.
 2005-03-03 17:20:05 +02:00
pekka@mysql.com
59ffe5bdf8 ndb - bug#8876 third and final solution 2005-03-03 12:45:49 +01:00
pekka@mysql.com
4b7d6244ef Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2005-03-03 12:43:01 +01:00
bar@mysql.com
4a9176b418 Bugs: #8063: make test mysqldump [ fail ] 
See mysqldump.test diff for more details
 2005-03-03 15:43:00 +04:00
pekka@mysql.com
e90c122891 ndb - bug#8876 2005-03-03 11:38:50 +01:00
bar@mysql.com
aaf4b11f11 Bug#8840 Empty string comparison and character set 'cp1250' 
Secondary weight out of bounds was picked up in mistake when
the string is empty, instead of returning 0.
 2005-03-03 14:15:37 +04:00
joreland@mysql.com
0683340ec9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-03-03 08:38:10 +01:00
sergefp@mysql.com
00a560c727 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bugs
 2005-03-03 05:04:00 +03:00
sergefp@mysql.com
eeae2c4dee Comments added 2005-03-03 05:03:21 +03:00
jimw@mysql.com
5d2bedc391 Fix bug in checking of table-specific grats that caused IP/NETMASK 
hostnames to not be matched correctly. (Bug #3309)
 2005-03-02 16:30:24 -08:00
pekka@mysql.com
20fe3934af ndb - bug#8876 2005-03-03 01:07:03 +01:00
ramil@mysql.com
89d44e039e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1
 2005-03-02 20:04:38 +04:00
ramil@mysql.com
89a105abc5 a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used) 2005-03-02 20:00:48 +04:00
guilhem@mysql.com
c6f1a2e453 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-03-02 11:38:38 +01:00
guilhem@mysql.com
11a1c83c03 Fix for BUG#8325 "Deadlock in replication thread stops replication": 
in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).
 2005-03-02 11:29:48 +01:00
ingo@mysql.com
d3d7c46b1c Bug#8306 - TRUNCATE leads to index corruption 
Added a check, if the table, which we are going to create, is open.
This can happen if a MERGE mapped table is TRUNCATEd.
 2005-03-02 10:35:00 +01:00
marko@hundin.mysql.fi
c75036ed70 row0sel.c: 
row_sel_store_mysql_rec(): Do not try to space-pad BLOB fields. (Bug #8771)
 2005-03-01 20:46:23 +02:00
marko@hundin.mysql.fi
af2999b753 InnoDB: Commit inserts to the temporary tables created by 
CREATE INDEX and DROP INDEX every 10,000 rows,
similar to ALTER TABLE.
 2005-03-01 16:09:22 +02:00
joreland@mysql.com
39dff8cb74 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-03-01 13:58:40 +01:00