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

1308 commits

Author SHA1 Message Date
mats@mysql.com
0449ee1ca8 Merging 4.1 into 5.0 2005-07-05 16:02:03 +02:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
lars@mysql.com
02d0fdf470 Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b11678-mysql-4.1
 2005-07-01 16:13:05 +02:00
msvensson@neptunus.(none)
ead7b076dc Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-07-01 15:40:42 +02:00
msvensson@neptunus.(none)
11d3c28575 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-07-01 15:40:29 +02:00
msvensson@neptunus.(none)
9613c434e0 Win port fixes 2005-07-01 15:39:36 +02:00
lars@mysql.com
4120003926 BUG#11678: mysqldump --master-data should fail if master binlog disabled 2005-07-01 12:01:00 +02:00
msvensson@neptunus.(none)
ca2ad9cdf6 Merge 2005-06-30 19:21:38 +02:00
msvensson@neptunus.(none)
14e778e43a After review fixes 2005-06-30 19:15:39 +02:00
pem@mysql.comhem.se
6fd1e8227e Fixed compiler errors (i.e. changed C++-isms into C) 2005-06-29 14:23:43 +02:00
monty@mishka.local
7398252d02 Portability fixes 
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
 2005-06-27 20:31:00 +03:00
msvensson@neptunus.(none)
7d42249bf1 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-06-27 15:14:23 +02:00
msvensson@neptunus.(none)
87d681c7bb Include <sys/wait.h> to get WEXITSTATUS 2005-06-27 15:11:40 +02:00
msvensson@neptunus.(none)
5e703ebbbb Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-06-27 15:02:39 +02:00
msvensson@neptunus.(none)
f8472c0e49 Add "#include <stdlib.h>" to define WEXITSTATUS 2005-06-27 15:01:49 +02:00
msvensson@neptunus.(none)
01b025c2d2 Fix so that my_progname is set to "mysqldump" 2005-06-22 20:37:14 +02:00
msvensson@neptunus.(none)
8e9c7a42df Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-06-22 20:24:10 +02:00
msvensson@neptunus.(none)
2dd6a58d58 BUG#9657 mysqldump xml ( -x ) does not format NULL fields correctly 
- Importing the bug fixes by patch due to merge problems.
 2005-06-22 20:22:54 +02:00
msvensson@neptunus.(none)
1199b4ec9d Fix mysqldump for so that my_programname is set to "mysqldump". 
Correct test results now when error message output is predictable.
 2005-06-22 20:12:21 +02:00
msvensson@neptunus.(none)
9258513c1e Bug #9558 mysqldump --no-data db t1 t2 format still dumps data 
- Check the Dflag variable inside of function dump_table to see if data should be
dumped or not.
    - Add test for --xml and --no-data as well
    Reapplying patch!
 2005-06-22 15:43:49 +02:00
msvensson@neptunus.(none)
e9e048f321 Merge fix 2005-06-22 15:29:08 +02:00
msvensson@neptunus.(none)
85b9ffc4ca Merged from mysql-4.1 to mysql-5.0 2005-06-22 14:10:02 +02:00
msvensson@neptunus.(none)
ddeaf342a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-06-21 14:24:13 +02:00
msvensson@neptunus.(none)[msvensson]
39636f48f0 patch 2005-06-21 14:19:56 +02:00
jimw@mysql.com
99e35c84ac Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-20 15:02:45 -07:00
jimw@mysql.com
5381e18673 Fix handling of command-line on Windows, missed as part of earlier 
commit. (Bug #10840)
 2005-06-20 18:54:45 +02:00
lars@mysql.com
41d1c094b6 Fix of 5.0 tree 2005-06-17 14:03:27 +02:00
lars@mysql.com
869882f321 WL#2076: Added if(...) construct to mysqltest 
Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
 2005-06-16 16:56:03 +02:00
msvensson@neptunus.(none)
16abf20043 BUG#10927 mysqldump: Can't reload dump with view that consist of other view 
- Create a small dummy table that will take care of the problem of creating a view dependent of another view which hasn't yet been created.
 2005-06-16 15:58:17 +02:00
svoj@mysql.com
685c844fc4 WL#2286 - Compile MySQL w/YASSL support 
Fix for link failures on boxes with non-gnu compiler.
 2005-06-12 18:18:46 +05:00
jimw@mysql.com
55f962c0cf Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-10 20:11:20 -07:00
reggie@mdk10.(none)
b45bf71d9b Bug #10947 mysqlshow wildcard failure on Windows 2005-06-10 14:03:22 -05:00
jimw@mysql.com
e4cb794750 Fix use of _cgets() to handle an input line that exceeds our buffer space 
before a newline is found. (Bug #10840)
 2005-06-09 19:44:59 +02:00
jimw@mysql.com
9ba4a6c722 Fix calculation of buffer size for _cgets() on Windows. (Bug #10841) 2005-06-08 00:43:57 +02:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
monty@mysql.com
8c94b5fba7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 20:42:55 +03:00
reggie@monster.
4283fdb170 fixes for compiler warnings from VC6 2005-06-06 11:34:52 -05:00
monty@mysql.com
e43cbebc59 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 16:54:56 +03:00
bar@mysql.com
2df945d87b Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 
UPPER/LOWER now can return a string with different length.

mi_test1.c:
  Adding new arguments.
Many files:
  Changeing caseup/casedn to return a result with different
  length than argument.
sql_string.h:
  Removing unused method,
mysql_priv.h:
  Removing unused method
 2005-06-06 16:54:15 +05:00
serg@serg.mylan
6a5349028c a compiler must see '#pragma implementation' *before* 
'#pragma interface' (that comes with the #include'd header file)
 2005-06-05 19:38:52 +02:00
monty@mysql.com
4b7882dc73 merge 2005-06-05 17:19:50 +03:00
serg@serg.mylan
d26c13b439 client/mysql.cc 
make print_field_types() somewhat more useful
 2005-06-03 21:59:33 +02:00
brian@zim.(none)
113a99626d Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
brian@zim.(none)
efb5ed5bab Merge 2005-06-01 18:48:29 -07:00
kent@mysql.com
bd48eed988 tztime.cc: 
Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
 2005-06-02 02:43:32 +02:00
brian@zim.(none)
ba9b9f8993 Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina. 2005-06-01 17:34:10 -07:00
monty@mysql.com
a69f432115 Code cleanups during code reviews 
Ensure we get error if INSERT IGNORE ... SELECT fails
Fixed wrong key_part->key_length usage in index_merge
 2005-06-01 16:35:09 +03:00
msvensson@neptunus.(none)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +02:00
joerg@mysql.com
4572248a84 Correction of merge mishandling in 'client/client_priv.h'. 2005-05-26 12:58:55 +02:00
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +02:00