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

15096 commits

This branch
This branch
All branches
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
tomas@poseidon.ndb.mysql.com
a03001155b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-07 09:37:20 +00:00
tomas@poseidon.ndb.mysql.com
690cdfc697 added order by to give same order results on different endian and different sized clusters 2004-10-07 09:27:39 +00: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
tomas@poseidon.ndb.mysql.com
a8d2692c65 adder order by 2004-10-07 08:42:11 +00: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
66923bf968 forgot to remove ndbrequire 2004-10-06 13:26:38 +00: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
heikki@hundin.mysql.fi
5d2492c855 dict0mem.h: 
Fix typos in previous push
 2004-10-05 19:22:13 +03:00
heikki@hundin.mysql.fi
e1952a7b9e Merge heikki@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2004-10-05 19:22:12 +03:00
tomas@poseidon.ndb.mysql.com
fe17cecac0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-05 16:22:11 +00: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
tomas@poseidon.ndb.mysql.com
ebb425d9c9 more and better arbitration warnings for cluster config 2004-10-05 15:18:32 +00: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
marko@hundin.mysql.fi
092d1a5084 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-10-05 16:02:10 +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
marko@hundin.mysql.fi
ff4b6b2b33 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-10-05 13:22:14 +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
tomas@poseidon.ndb.mysql.com
250d643ee2 last try didnt work 2004-10-05 07:48:51 +00:00
tomas@poseidon.ndb.mysql.com
c36637a96e bumped up version to 3.5.2 
removed staus flag
 2004-10-05 06:49:11 +00: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
marko@hundin.mysql.fi
d4b3df6d31 InnoDB: Fix ALTER TABLE t DISCARD TABLESPACE (Bug #5851) 2004-10-04 20:38:23 +03:00
heikki@hundin.mysql.fi
e7500f435f lock0lock.c: 
Fix compiler warning
 2004-10-04 19:48:41 +03:00
dlenev@mysql.com
46826a291d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
 2004-10-04 20:46:51 +04: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
joerg@mysql.com
5c8aadb5e3 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2004-10-04 18:14:36 +02: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
tomas@poseidon.ndb.mysql.com
16ab4447bf corrected merge error rgarding NDB_CONNECTSTRING 2004-10-04 13:53:36 +00:00
tomas@poseidon.ndb.mysql.com
31f0226f00 added debug printouts in ndbapi 2004-10-04 13:26:33 +00:00