mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23365 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1268 commits

Author SHA1 Message Date
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
msvensson@neptunus.(none)
975ca22872 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-26 12:10:05 +02:00
msvensson@neptunus.(none)
83d430353e Add ifdefs to control when "#pragma implementation" should be used 
Added some more ifdefs for "#pragma interface"
 2005-05-26 12:09:14 +02:00
brian@zim.(none)
6182241268 Additions for --add-drop-database 2005-05-20 06:56:02 -07:00
jimw@mysql.com
6757a04e4c Merge mysql.com:/home/jimw/my/mysql-5.0-build 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-05-18 17:13:31 -07:00
jimw@mysql.com
d5ee234917 Fixes to merge from 4.1 2005-05-18 15:40:34 -07:00
jimw@mysql.com
3f6aad900c Resolve merge from 4.1 2005-05-18 11:06:34 -07:00
jimw@mysql.com
79ce5dcd90 Resolve bugfix merge 2005-05-18 09:25:06 -07:00
jimw@mysql.com
be221cc012 Small optimization to bug fix, from Monty. 2005-05-18 09:12:37 -07:00
gbichot@quadita2.mysql.com
56dbfc99ba mysqldump.c: disabling --delayed-insert until BUG#7815 is fixed (need table def cache for that, 
to easily check the storage engine supports DELAYED).
 2005-05-18 13:02:09 +02:00
kent@mysql.com
318c41e94d default.c: 
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
  Removed unused variable 'field' from print_warnings()
libmysql.dsp:
  Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
  Added "my_chsize.c"
 2005-05-18 12:15:28 +02:00
jimw@mysql.com
b2b9485a94 Merge mysql.com:/home/jimw/my/mysql-5.0-10251 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-05-17 16:59:39 -07:00
monty@mysql.com
3b3d00c4a2 Merge with 4.1 to get fix for memory leak 2005-05-16 20:21:38 +03:00
monty@mysql.com
8b1673f18e Fix memory leak 2005-05-16 20:16:46 +03:00
serg@serg.mylan
c28accc9a9 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-16 12:05:42 +02:00
kent@mysql.com
63fcb5de6f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-05-16 02:55:51 +02:00
kent@mysql.com
24b34fa9fe Merge 2005-05-16 01:25:14 +02:00
kent@mysql.com
b076cdb208 mysqltest.c: 
To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings
 2005-05-16 01:08:42 +02:00
kent@mysql.com
6374bfeb61 mysqltest.c: 
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory
 2005-05-15 20:38:54 +02:00
kent@mysql.com
bd70ce726b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-05-15 07:06:47 +02:00
kent@mysql.com
221b1ccae8 mysqltest.c, mysql-test-run.sh: 
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
  Use Purify suppress file
 2005-05-15 06:59:34 +02:00
serg@serg.mylan
40ce1e174d merged 2005-05-14 19:28:29 +02:00
brian@zim.(none)
8636468466 Merge 2005-05-08 16:19:06 -07:00
brian@brian-akers-computer.local
a8968e337d Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2005-05-08 14:24:43 -07:00
jimw@mysql.com
e2a11cc15e Fix crash in mysqldump -c triggered by tables with a large number of long 
field names. (Bug #10286)
 2005-05-08 12:02:46 -07:00
antony@ltantony.mysql.com
7a56977a79 Bug#6925 
Comment/*COMMENT*/is not a separator
  Ensure that whitespace is inserted after C-style comment if required.
 2005-05-08 00:13:35 +01:00
brian@brian-akers-computer.local
39f4e5755d Patch for --insert-ignore 2005-05-07 09:49:39 -07:00
jimw@mysql.com
80933d9f95 Merge 2005-05-07 08:25:58 -07:00
jimw@mysql.com
7e7ed0f6a8 Merge mysql.com:/home/jimw/my/mysql-4.1-9186 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-07 01:05:19 -07:00
monty@mishka.local
3d03746899 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-05-06 16:34:09 +03:00
rburnett@bk-internal.mysql.com
82f4a0b021 Merge bk-internal.mysql.com:/users/rburnett/bug10245 
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
 2005-05-06 15:21:30 +02:00
jimw@mysql.com
ff2d0938dd Support quoted identifiers containing single and double quotes in 
mysqltest. (Bug #10251)
 2005-05-06 05:48:46 -07:00
monty@mishka.local
015cd1cd21 merge 2005-05-06 13:51:58 +03:00
monty@mishka.local
a9f6aab4c9 Fixes while reviewing new code 
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
 2005-05-06 11:39:30 +03:00
rburnett@bk-internal.mysql.com
8e286b7934 Bug #10245 VC++ compiler error with mysql.cc 
Only print the read line version if we are on a platform that supports readline

mysql.cc:
  Add #ifdef to only print readline version if we are on a platform that supports readline
 2005-05-05 17:48:50 +02:00
serg@serg.mylan
530b6ba541 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-01 23:10:55 +02:00
serg@serg.mylan
9c332d8d2a yassl changeset 2: 
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
  replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95
  set $USE_MYSYS_NEW even if CXX is g++
  yassl bugfixes
  instantiate all yassl templates explicitly
 2005-04-30 19:48:45 +02:00
monty@mysql.com
c0e8a8d625 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-30 03:46:38 +03:00
geert@kriem.kemuri.org
0dab212f5c Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
 2005-04-29 14:46:53 +02:00
monty@mysql.com
215be0264b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-27 17:19:32 +03:00
monty@mysql.com
69b813a901 mysqladmin extended-status now displays global status 
Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
 2005-04-27 17:16:08 +03:00