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
22943 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1177 commits

Author SHA1 Message Date
petr@mysql.com
1c376d7da4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-05-18 15:29:37 +04:00
petr@mysql.com
67364e99af fix comments 2005-05-18 15:28:38 +04:00
monty@mysql.com
c1b512fad3 Change update_auto_increment to return 1 if get_auto_increment() returned ~(ulonglong) 
This makes it easier to give an error in the handler if there was a problem generating an auto-increment value
 2005-05-18 10:41:35 +03:00
ramil@mysql.com
0b90c8bfd6 a fix (bug #10655: mysys/default.c compilation problem). 2005-05-16 13:40:57 +05:00
petr@mysql.com
834c47f336 Merge 2005-05-16 03:01:05 +04:00
petr@mysql.com
180d0ed620 post-review fixes 2005-05-16 01:54:02 +04:00
monty@mishka.local
2d4a417330 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-05-13 13:36:02 +03:00
monty@mishka.local
2d25da2a4b concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 
myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors
 2005-05-13 12:08:08 +03:00
ramil@mysql.com
e4d1964851 --default-extra-file handling code fix. 2005-05-12 17:23:16 +05:00
ramil@mysql.com
3196a01039 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-07 20:25:58 +05:00
ramil@ram-book.(none)
6a7306823b A fix (bug #5056: defaults-extra-file throws no error when file is inaccessible). 2005-05-06 16:51:58 +05: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
petr@mysql.com
560a908315 fix --defaults-file and --defaults-extra-file broken by a wrong merge 2005-05-04 18:46:29 +04:00
jimw@mysql.com
2d44d93ce6 Merge mysql.com:/home/jimw/my/mysql-5.0-5354 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-05-02 10:20:22 -07:00
jimw@mysql.com
7bab94f36b Clean up merge from 4.1 2005-05-02 10:19:37 -07:00
jimw@mysql.com
7370017daf Merge mysql.com:/home/jimw/my/mysql-4.1-9136 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:11:32 -07: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
28a5491d3d Merge with 4.1 2005-04-30 09:46:08 +03:00
monty@mysql.com
aa84afb983 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-30 03:45:12 +03:00
monty@mysql.com
fbf31c4a8c CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036) 
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467)
Fix compiler problems with MinGW (Bug #8872)
 2005-04-29 17:03:34 +03:00
jimw@mysql.com
2441da8cd9 Add default configuration files to my_print_defaults usage, and 
add handling of configuration file in the Windows shared system
directory. (Bug #5354)
 2005-04-28 12:11:48 -07:00
ingo@mysql.com
be34b54e1d Merge mysql.com:/home/mydev/mysql-4.1-4100 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-28 19:34:05 +02:00
ingo@mysql.com
8ccbea47e8 Merge mysql.com:/home/mydev/mysql-4.1-bug5964 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-04-28 18:34:47 +02:00
ingo@mysql.com
1f0d0a6729 BUG#5964 - 4.1 MERGE tables regression from 4.0 
Changed the creation of the .MRG file so that only the table  name
is written when the MyISAM table is in the same database as the
MERGE table, a relative path is used in other cases in mysqld,
and possibly an absolute path is used in an embedded server.
No test case is added as the external behaviour is unchanged.
Only the file names within the .MRG file are changed.
 2005-04-28 18:28:50 +02:00
monty@mysql.com
b40756c27e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-28 00:41:39 +03:00
msvensson@neptunus.(none)
bdb1441a65 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-27 21:40:11 +02:00
monty@mysql.com
e18a155fd6 Fixed core dump bug when hot link list in key cache was empty. Bug #10167 2005-04-27 14:31:04 +03:00
msvensson@neptunus.(none)
e6293c49c4 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-27 13:30:00 +02:00
msvensson@neptunus.(none)
565e660bd4 Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable 
- Reverted removal of errorcheck mutex initialise, used in safe_mutex_init.
 2005-04-27 13:29:37 +02:00
msvensson@neptunus.(none)
203cdde955 Merge from 4.1 to 5.0 2005-04-27 12:56:01 +02:00
msvensson@neptunus.(none)
f3c72cc891 Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable 
- Changed makelist.sh
  - Bump up required version of autoconf
  - Use new style to init mutex in my_thr_init
 2005-04-27 09:59:12 +02:00
monty@mysql.com
972f86f1ee Cleanups during review 2005-04-26 23:24:59 +03:00
joerg@mysql.com
a0cac19e6e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-04-26 19:11:54 +02:00
ramil@mysql.com
7882cd32bc A fix (bug #9756: mysql client failing on dumps containing certain \ sequences). 2005-04-26 15:43:20 +05:00
joerg@mysql.com
49ac2dac3e Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497). 
Post-merge fix will follow.
 2005-04-26 12:03:37 +02:00
joerg@mysql.com
eaa79cb452 Step 2 of the switch to support configuration with NPTL: 
Define a new CPP symbol that the target OS is Linux, and use it where only the OS matters and not the threads Library.
Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places.
When we support configuration with NPTL but no Linuxthreads, this misuse must cease.
 2005-04-20 20:38:57 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
1658d737b3 Fixed Bug#6593, "Inconsistency in handling option prefixes (--skip, --disable, etc.)" 2005-04-19 00:22:57 +03:00
petr@mysql.com
da9a6aecad Merge mysql.com:/home/cps/mysql/trees/mysql-4.1 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-04-14 01:57:52 +04:00
petr@mysql.com
75cfee68fb post review fix 2005-04-14 01:39:24 +04:00
joerg@mysql.com
198b6117f9 Proper handling of "utf8-general-cs" clollation: Missing parts in configuration. 2005-04-11 11:12:08 +02:00
joerg@mysql.com
6bd1bea723 Add missing parts for the "Cybozu" custom build, to avoid future manual patches. 2005-04-08 13:56:48 +02:00
monty@mysql.com
a7c6348192 Fixed errors found during review 2005-04-06 19:43:35 +03:00
monty@mysql.com
beb28b27e0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-06 17:23:34 +03:00
monty@mysql.com
49e721677f Fixed errors descovered by valgrind 2.4 
Added suppression file for some valgrind warnings that are not real errors
 2005-04-06 17:22:21 +03:00
serg@serg.mylan
810b2c3d40 remove the rest of isam/merge references 
fix a race condition in TC_LOG_BINLOG::unlog
 2005-04-05 13:17:49 +02:00
bar@mysql.com
6d3f944d80 merge 2005-03-29 17:24:26 +05:00
petr@mysql.com
e57534e64b more merge fixes 2005-03-29 16:15:22 +04:00
petr@mysql.com
7428d7ee25 manual merge 2005-03-29 13:55:11 +04:00