mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18113 commits 2788 branches 343 tags 1.7 GiB
Commit graph

18113 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@mysql.com
652fc10467 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0
 2005-01-04 19:00:22 +01:00
joerg@mysql.com
03d1a29833 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-01-04 18:05:42 +01:00
joerg@mysql.com
f5e0cf8e51 Changed C++ style comments to C style, bug#7665. 2005-01-04 17:21:55 +01:00
bell@sanja.is.com.ua
a8a5f3590c fixed bugs in view code with prepared statemnts 2005-01-04 18:04:16 +02:00
lenz@mysql.com
a99921fb39 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-01-04 13:32:12 +01:00
monty@mysql.com
7cf8285b3f After merge fixes 
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results
 2005-01-04 13:46:53 +02:00
monty@mysql.com
3c6d5e43f9 Merge 2005-01-04 13:23:04 +02:00
jimw@mysql.com
050e229162 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0
 2005-01-04 02:47:48 +01:00
serg@sergbook.mysql.com
4da9825acd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-01-04 01:59:24 +02:00
petr@mysql.com
21b751063a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/users/pchardin/mysql-5.0
 2005-01-04 00:48:13 +01:00
petr@mysql.com
6dfb7aa283 fixed .spec file after isam/merge purge, removed man pages for isamlog and isamchk 2005-01-04 00:26:52 +01:00
serg@sergbook.mysql.com
b23a226151 mysql-test/r/multi_update.result, mysql-test/t/multi_update.test 
don't fail w/o bdb (or innodb)
sql/sql_base.cc
    typo fixed.
    "mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)
 2005-01-04 00:22:22 +02:00
monty@mysql.com
f499d330df Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-04 00:12:09 +02:00
joreland@mysql.com
e74fc338e9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-03 22:59:20 +01:00
joreland@mysql.com
c2f648508e merge error 2005-01-03 22:58:29 +01:00
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
lenz@mysql.com
5a568a13da Merge mysql.com:/space/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.1-build
 2005-01-03 21:37:41 +01:00
vtkachenko@intelp4d.mysql.com
01030fe12a Merge bk-internal:/home/bk/mysql-5.0 
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
 2005-01-03 21:29:09 +01:00
lenz@mysql.com
2e95c0f49a - Updated Bootstrap to include merge ChangeSets in the source distribution's 
ChangeLog, too (to be more exact when tagging a release that's based on a
  merge ChangeSet)
 2005-01-03 21:28:14 +01:00
vtkachenko@intelp4d.mysql.com
4e67fc6310 sync0sync.h, sync0rw.h: 
Fix Bug#7624
 2005-01-03 21:27:17 +01:00
bell@sanja.is.com.ua
44d76a4911 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2005-01-03 22:20:47 +02:00
bell@sanja.is.com.ua
8c39a4f463 fixed reporting error 2005-01-03 22:16:54 +02:00
monty@mysql.com
530a104eec Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-03 22:01:11 +02:00
monty@mysql.com
e5cd3c6090 added ndb/include/ndb_global.h ndb/include/ndb_version.h to ignore 2005-01-03 22:00:32 +02:00
joreland@mysql.com
a9853184d3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-03 20:31:47 +01:00
monty@mysql.com
d35d4eab91 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-03 21:14:20 +02:00
joreland@mysql.com
875af1330b Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-01-03 20:12:42 +01:00
joreland@mysql.com
14b66b19e4 Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-03 20:12:07 +01:00
joreland@mysql.com
18920d4831 bug#7626 - post review version 2005-01-03 20:10:23 +01:00
monty@mysql.com
2299e1eca4 Better handling of ensuring that setup_tables() are not called twice 
This fixed a bug in prepared statements when used with outher joins
Fixed a bug in SUM(DISTINCT) when used with prepared statements.
Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests
 2005-01-03 21:04:33 +02:00
jimw@mysql.com
0e8d3f1ccd Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0
 2005-01-03 19:56:20 +01:00
jimw@mysql.com
98d7964d2a Fix 'SHOW CREATE FUNCTION' to say 'FUNCTION' in its error message. (Bug #6338) 2005-01-03 19:53:54 +01:00
joreland@mysql.com
ce57f0156d Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-03 19:44:29 +01:00
joreland@mysql.com
b852147b5d Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-01-03 19:42:38 +01:00
joreland@mysql.com
7d0d191999 bug#7626 - ndb UintPtr handling 2005-01-03 19:39:09 +01:00
joreland@mysql.com
5278560bc3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-03 19:09:10 +01:00
joreland@mysql.com
bd597f54d5 bug#7626 - ndb - non portable uint_ptr 2005-01-03 19:08:27 +01:00
kent@mysql.com
c725e09089 mtr_process.pl: 
Added missing stop_reap_all() if returns early from function
mysql-test-run.pl:
  Improved output from --script-debug
  Initial Cygwin support
  Improved mysqld process termination
 2005-01-03 16:54:08 +01:00
kent@mysql.com
dd19a613bc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-03 16:49:55 +01:00
serg@sergbook.mysql.com
a606a7d16f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2005-01-03 15:36:00 +02:00
serg@sergbook.mysql.com
b425811d6e Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2005-01-03 15:35:59 +02:00
monty@mysql.com
a981ca050d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-03 15:35:58 +02:00
wax@mysql.com
e2ba3a1118 Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1test2
 2005-01-03 18:35:58 +05:00
serg@sergbook.mysql.com
5e18c54646 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2005-01-03 15:35:58 +02:00
hf@deer.(none)
75f6c8ad1c Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.7545
 2005-01-03 17:35:57 +04:00
hf@deer.(none)
27eff9f700 Fix for bug #7545 (Undefined symbols if --without-geometry) 2005-01-03 17:33:04 +04:00
serg@sergbook.mysql.com
e363e55b51 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-01-03 14:16:32 +02:00
monty@mysql.com
e205136170 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-03 13:57:17 +02:00
monty@mysql.com
ce456b6a20 Remove clear_insert_values() because it was far from trivial to handle the cleanup in all cases 
(Old code failed for INSERT ... ON DUPLICATE with prepared statements) 
Instead, always reset table->insert_values on open.
 2005-01-03 13:56:23 +02:00
mskold@mysql.com
6fa7831ade Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-03 12:03:39 +01:00