mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15096 commits 2778 branches 343 tags 1.6 GiB
Commit graph

7350 commits

Author SHA1 Message Date
monty@mysql.com
546c2bd6ab Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-07 12:37:21 +03:00
brian@brian-akers-computer.local
b7f8285cd9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-10-07 01:42:12 -07:00
monty@mysql.com
6239edc1d1 After merge fixes 
Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code
 2004-10-07 10:50:13 +03:00
brian@brian-akers-computer.local
c9e6ad2cc1 Clean up from Bar and Antony code review. Found an issue with the header file were it could end up corrupted. 2004-10-06 23:26:40 -07:00
rburnett@build.mysql.com
4a01f3030b Enabled the writing of a pid file on Windows. 
mysqld.cc:
  Added call to create_pid_file to start_signal_handler on windows.  Also removed the #ifndef WINDOWS from two calls that deletes the pid file
 2004-10-06 21:46:44 +02:00
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release 
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
 2004-10-06 19:14:33 +03:00
tomas@poseidon.ndb.mysql.com
884892a650 bug#5736, subqueries and not in 
and testcases
 2004-10-06 13:18:55 +00:00
ram@gw.mysql.r18.ru
0944bed7fc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5733
 2004-10-06 12:49:56 +05:00
brian@brian-akers-computer.local
197ff3fac6 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-10-05 15:35:26 -07:00
monty@mysql.com
992b04d3d8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-10-06 01:25:55 +03:00
monty@mysql.com
c27d22b44e Reverted patch for new usage of open_count as it caused more problems than it solved 
Cleaned up patch for checking locks for multi-table updates
 2004-10-06 01:24:21 +03:00
dlenev@mysql.com
96458f8f64 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bf
 2004-10-05 21:24:08 +04:00
dlenev@brandersnatch.localdomain
eabec4c3ca Fixed small bug in handling of pre-4.1 TIMESTAMP columns which was 
introduced during implementation of TIMESTAMP columns, which are able 
to store NULLs (Unfortunately it is impossible to write test case for
this. Kudos to Holyfoot for noticing it!)
 2004-10-05 21:23:38 +04:00
hf@deer.(none)
bc46b3c3c5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.5730
 2004-10-05 21:29:40 +05:00
bar@mysql.com
3fc7640a19 Bug #5832 SELECT doesn't return records in some cases 2004-10-05 21:22:14 +05:00
hf@deer.(none)
7ce60487d9 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0
 2004-10-05 21:21:27 +05:00
hf@deer.(none)
ee3b6340b0 Fix for #5730 (Query cache crashes server) 
Recusive part leads to stack overflow
 2004-10-05 21:19:40 +05:00
marko@hundin.mysql.fi
8ade0f9a14 Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/k/mysql-4.0
 2004-10-05 17:12:16 +03:00
heikki@hundin.mysql.fi
3985d58ad2 ha_innodb.cc: 
Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum); add comments about why innobase_get_at_most_n_mbchars() works ok
dict0mem.h:
  Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum)
row0mysql.c:
  If MySQL tries to create a column prefix index longer that 255 UTF-8 characters, give an error, and drop the table from the InnoDB internal data dictionary. MySQL did not drop the table there in its own error handling.
 2004-10-05 17:08:22 +03:00
gluh@gluh.mysql.r18.ru
2a621e275b Fix for bug #5555: "GROUP BY enum_field" returns incorrect results 2004-10-05 17:02:09 +04:00
marko@hundin.mysql.fi
42f3c0eb5b Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/k/mysql-4.0
 2004-10-05 15:15:45 +03:00
Sinisa@sinisa.nasamreza.org
19c112dfb5 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2004-10-05 14:54:40 +03:00
Sinisa@sinisa.nasamreza.org
2ffb87f6a5 Fix for wrongly calculated Examined_rows in 4.0 UNION's. 2004-10-05 14:47:10 +03:00
ingo@mysql.com
ca6533dbae Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0
 2004-10-05 12:05:13 +02:00
tomas@poseidon.ndb.mysql.com
d60ba54d1c moved code out of DBUG_ASSERT 2004-10-05 10:04:09 +00:00
joerg@mysql.com
1b39262a8b Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0 2004-10-05 11:33:57 +02:00
ingo@mysql.com
c546074e21 Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-bug4286
 2004-10-05 11:33:13 +02:00
brian@brian-akers-computer.local
97cf755a26 Row level lock code for the archive storage engine. 2004-10-05 01:40:00 -07:00
vva@eagle.mysql.r18.ru
91e8afac37 patch fixing after review on patch-fixing of 
Bug #5492 
"set @@session.read_rnd_buffer_size=33554432" crashes server on query

1. added warning comments for uint3korr (need one more byte allocated)
2. unsigned long in uint3korr was replaced by unsigned int to 
   avoid problems on 64-bits platforms
3. shorten warning comments in init_rr_cache in sql/records.cc
 2004-10-04 23:26:42 +05:00
vva@eagle.mysql.r18.ru
d3dc011844 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_5492/mysql-4.0
 2004-10-04 21:30:45 +05:00
dlenev@mysql.com
0d83bdf20d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
 2004-10-04 20:13:16 +04:00
konstantin@mysql.com
e107778119 Comments to the single-select optimization algorithm. 2004-10-04 18:58:06 +04:00
dlenev@mysql.com
a4d5804e31 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
 2004-10-04 17:16:49 +04:00
dlenev@brandersnatch.localdomain
cfd34f779f Made TIMESTAMP NULL columns without explicit DEFAULT value to be always 
treated as DEFAULT NULL columns (independently from their position in
table).

(still to be discussed with Monty, Brian, Trudy et al. before push)
 2004-10-04 17:13:31 +04:00
tomas@poseidon.ndb.mysql.com
e1da620f98 typo 2004-10-04 12:40:46 +00:00
tomas@poseidon.ndb.mysql.com
bc5ca3a1ce Merge 2004-10-04 12:36:25 +00:00
tomas@poseidon.ndb.mysql.com
dd3cc0c1e9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-04 12:27:43 +00:00
tomas@poseidon.ndb.mysql.com
e13b136c9a bug #5872, transactions should only be restarted with transaction.on flag off if execute_commit has been performed 
added testcase for this
use force send for all executes
 2004-10-04 12:26:26 +00:00
marko@hundin.mysql.fi
c0531d70f6 Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/k/mysql-4.0
 2004-10-04 15:17:32 +03:00
konstantin@mysql.com
0cadd78db7 A couple of typos fixed. 2004-10-04 14:14:30 +04:00
bar@mysql.com
534848558d sql_show.cc: 
ctype_recode does not hang anymore. Small fix after Marko's change.
 2004-10-04 11:50:31 +05:00
tomas@poseidon.ndb.mysql.com
65949b5eb0 merge error 2004-10-03 23:20:05 +00:00
tomas@poseidon.ndb.mysql.com
b17bcca66f merge error 2004-10-03 22:27:04 +00:00
tomas@poseidon.ndb.mysql.com
f6ad058388 Merge 2004-10-03 21:39:04 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
d67cd1af90 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0 
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug4118
 2004-10-03 00:25:51 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
b36a565931 Merge ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/staff/repositories/mysql-4.0 
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug4118
 2004-10-03 00:25:09 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
2973a047ea Bug#4118: multi-table UPDATE takes WRITE lock on read table 
Ensures that WRITE lock is not obtained on all tables referenced.
 2004-10-03 00:20:47 +01:00
tomas@poseidon.ndb.mysql.com
fbf2a6ac0c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-01 22:15:05 +00:00
tomas@poseidon.ndb.mysql.com
5745223a90 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-01 21:35:50 +00:00
dellis@goetia.(none)
141a5eeaca Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
 2004-10-01 14:53:52 -05:00