mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15184 commits 2781 branches 343 tags 1.6 GiB
Commit graph

15184 commits

This branch
This branch
All branches
Author SHA1 Message Date
lenz@mysql.com
5037b95f81 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2004-10-07 14:43:09 +02:00
monty@mysql.com
b751796aa2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-07 15:43:08 +03:00
tomas@poseidon.ndb.mysql.com
294bcf2cc0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-07 12:43:07 +00:00
tomas@poseidon.ndb.mysql.com
a257686692 more order by fixes 2004-10-07 12:36:37 +00:00
magnus@neptunus.(none)
d55efe332d Sned original NDB error as warning to client 2004-10-07 14:19:46 +02:00
joerg@mysql.com
a9fc6cfd31 Correct an 'unresolved identifier' problem caused by an "inline" 
function being used before it was defined - "forward" declaration
was insufficient.
 2004-10-07 12:02:22 +02:00
magnus@neptunus.(none)
ac9016df91 Initialise "sorted" variable in constructor of QUICK_SELECT. The variable is set to 1 in test_if_skip_sort_order if we decide to optimize "order by" by uinsg index_read. 2004-10-07 11:57:48 +02:00
magnus@neptunus.(none)
6bbf1f8ee4 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
 2004-10-07 11:57:47 +02:00
tomas@poseidon.ndb.mysql.com
0ac2c35fe9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-07 09:57:46 +00:00
monty@mysql.com
1dd4bd5f6c Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-10-07 12:51:32 +03:00
dlenev@mysql.com
e5483ab3bd Manual merge of tree containing fix for bug #5915 "ALTER TABLE behaves 
differently when converting column to auto_increment in 4.1" with
current tree.
 2004-10-07 13:51:32 +04:00
monty@mysql.com
01232b2c52 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-07 12:51:31 +03:00
tomas@poseidon.ndb.mysql.com
4afccd761b more order by for ndb 2004-10-07 09:51:30 +00:00
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
dlenev@brandersnatch.localdomain
1f54900630 Fix for bug #5915 "ALTER TABLE behaves differently when converting column 
to auto_increment in 4.1".
Now we are enforcing NO_AUTO_VALUE_ON_ZERO mode during ALTER TABLE only
if we are converting one auto_increment column to another auto_increment
column (this also includes most common case when we don't do anything
with such column).

Also now when we convert some column to TIMESTAMP NOT NULL column with
ALTER TABLE we convert NULL values to current timestamp, (as we do this
in INSERT). One can still get old behavior by setting system TIMESTAMP
variable to 0.
 2004-10-07 13:02:39 +04: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
magnus@neptunus.(none)
6985bcd59d Don't show NDB$BLOB tables in SHOW TABLES 2004-10-07 09:16:46 +02:00
magnus@neptunus.(none)
551cbfe0c6 Fix error message 2004-10-07 09:09:18 +02: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
9954abef02 Merge build.mysql.com:/home/bk/mysql-4.0 
into build.mysql.com:/users/rburnett/mysql-4.0
 2004-10-06 22:03:20 +02: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
monty@mysql.com
97febc4dc4 Code cleanups while doing review of pushed code 2004-10-06 17:20:39 +03:00
tomas@poseidon.ndb.mysql.com
ae87bd11fb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb2
 2004-10-06 13:34:17 +00:00
tomas@poseidon.ndb.mysql.com
6f0f5c1d21 NdbScanOperation.cpp: 
fix for compile error in gcc.3.4.4
  and run error in gcc3.3.2
 2004-10-06 13:28:59 +00: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
joreland@mysql.com
f715d82a74 testcase for bug#5736 
fix of changed clo to mysql-test-run
 2004-10-06 11:00:09 +02: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
joreland@mysql.com
b9b866078c debug printout 2004-10-06 08:53:19 +02:00
joreland@mysql.com
a716d2c4cf bug#5367 
subqueries with "not in" and ndb
 2004-10-06 08:48:26 +02: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
lenz@mysql.com
7d4bd5fc96 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2004-10-05 20:33:48 +02: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