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

1750 commits

Author SHA1 Message Date
monty@mysql.com
db40af2a6f Fix warnings from icc 
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling
 2005-05-18 19:00:21 +03:00
konstantin@mysql.com
f1916b87d2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-9643
 2005-05-16 18:29:04 +04:00
konstantin@mysql.com
38d68559bf A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work" 
- check on the client the unsupported feature and return 
an error message if it's been requested.
Additionally added API support for STMT_ATTR_PREFETCH_ROWS.
Post-review fixes.
 2005-05-16 18:27:21 +04: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
konstantin@mysql.com
89bd09fed2 Manual merge (again) 2005-05-14 12:38:12 +04:00
georg@lmy002.wdf.sap.corp
41d284e608 added prototype for mysql_set_character_set function 2005-05-13 15:54:35 +02: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
konstantin@mysql.com
d0e24153b9 A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute" 
(crash on attempt to re-execute a statement with an open cursor) + 
post-review fixes.
 2005-05-12 11:16:12 +04:00
jimw@mysql.com
cde9f56b45 Merge 2005-05-09 11:28:57 -07:00
ramil@ram-book.(none)
8d30d30073 a fix (bug #10438: Raid stopped working because of change in atomic add detection). 2005-05-09 18:33:21 +05:00
msvensson@neptunus.(none)
939f18a676 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-09 11:31:27 +02:00
msvensson@neptunus.(none)
939b32f564 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-09 11:31:14 +02:00
msvensson@neptunus.(none)
ed39121c9a After review fixes 2005-05-09 11:30:20 +02:00
msvensson@neptunus.(none)
34cec09efb Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-09 11:26:48 +02:00
msvensson@neptunus.(none)
670eef8756 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-09 11:23:12 +02:00
ramil@mysql.com
def8eb631c Merge mysql.com:/home/ram/work/mysql-4.1 
into mysql.com:/home/ram/work/mysql-5.0
 2005-05-06 20:11:01 +05:00
ramil@mysql.com
db3abccfa2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/ram/work/4.1
 2005-05-06 18:41:42 +05:00
rburnett@bk-internal.mysql.com
ad6de2c05a Merge bk-internal.mysql.com:/users/rburnett/bug9721 
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
 2005-05-06 15:15:48 +02:00
rburnett@bk-internal.mysql.com
c95e33fadf Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into bk-internal.mysql.com:/users/rburnett/bug9721
 2005-05-06 15:10:01 +02:00
ramil@ram-book.(none)
e1b6b7fe36 A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h). 2005-05-06 16:12:42 +05:00
ramil@mysql.com
788678d392 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-06 11:48:55 +05:00
bar@mysql.com
b93385de8f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/root/mysql-5.0
 2005-05-06 11:48:54 +05:00
ramil@mysql.com
802360fbc2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-06 08:34:50 +05:00
shuichi@mysql.com
2244ae8cef Added cp932 character set 2005-05-05 11:37:52 -07:00
bar@noter.(none)
153b928c10 Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci 
We cannot propagate constants with tricky collations.
 2005-05-05 21:13:57 +05:00
rburnett@bk-internal.mysql.com
e7d7c0f236 Bug #9721 net_write_timeout not used on Windows 
Added an extra parameter to all calls to timeout().  
1 means we want to set the write timeout
0 means we wnat to set the read timeout

viossl.c:
  Add which parameter to ssl timeout routine
vio_priv.h:
  Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
  Add which parameter to vio_timeout sigs
net_serv.cc:
  Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
  Set the appropriate timeout in vio_timeout
 2005-05-05 17:17:57 +02:00
holyfoot@mysql.com
556504287b Merge 2005-05-05 20:10:50 +05:00
holyfoot@hf-ibm.(none)
2c8e9df232 A lot of fixes to Precision math 
Mostly about precision/decimals of the results of the operations
 2005-05-05 20:06:49 +05:00
ram@ram-book.(none)
65f5a15a2d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ram-book.(none):/home/ram/work/5.0
 2005-05-05 19:22:33 +05:00
ramil@ram-book.(none)
b9ccbfd1f3 A fix (bug #10179: error in default value setting). 2005-05-05 17:17:55 +05:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
kent@mysql.com
c4acdc6e0f terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h: 
Initial Metrowerks CodeWarrior compiler support
 2005-05-05 09:15:14 +02:00
msvensson@neptunus.(none)
5b5565c30a BUG#10241 cygwin port: invalid pragma interface directives 
- Introduce ifdefs so we can control when to use #pragma interface on cygwin
 2005-05-04 15:05:56 +02: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
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
serg@serg.mylan
328f2e434a Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-04-29 19:31:56 +02: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
serg@serg.mylan
e9b0411110 Merge 2005-04-29 15:44:24 +02: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
svoj@mysql.com
c1fd1d6a5b WL#2286 Compile MySQL w/YASSL support 
yaSSL-0.9.7 library bundled.
 2005-04-28 18:23:27 +05: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
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