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

1494 commits

Author SHA1 Message Date
monty@mysql.com
8901455d5b Fix wrong auto merge 2006-04-19 11:17:32 +03:00
monty@mysql.com
77b6bc4264 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-04-19 11:09:33 +03:00
monty@mysql.com
7af1f5e0b5 Fixed compilation error 
ensure check_if_legal_table_name is also defined on unix
 2006-04-19 11:08:22 +03:00
bar@mysql.com
b2315c6495 my_access.c: 
After merge fix.
 2006-04-19 12:51:30 +05:00
bar@mysql.com
cedafc30e8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
 2006-04-19 09:50:17 +05:00
brian@zim.(none)
6f986a344b UNIXWARE removal 2006-04-17 15:56:59 -07:00
brian@zim.(none)
f6f03576c6 This completes the work done in 5.0 to remove mit_pthread support (most was pulled in 5.0, but there were some pieces left in the tree) 2006-04-16 01:50:25 -07:00
brian@zim.(none)
53dce52086 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-04-15 08:50:56 -07:00
brian@zim.(none)
ba2502b9c3 Another long patch to remove the rest of the OS2 support. 2006-04-15 08:49:00 -07:00
cmiller@zippy.(none)
c7513d482f Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-04-14 13:33:02 -04:00
msvensson@neptunus.(none)
a4b19285e5 Bug#18474 Unlistable directories yield no info from information_schema, part2 
- Improved solution by adding an else stetment so that do find next is avoided if erorr occurs, but we still return zero files found instaed of an error
 2006-04-11 20:41:05 +02:00
bar@mysql.com
e8e0d5c5fe bug#17870 Table names conflict with Windows device names 
It was impossible to create some table names on Windows
(e.g. LPT1, AUX, COM1, etc).

Fixed to pad dangerous names with thee "at" signs
(e.g. LPT1@@@, AUX@@@, COM1@@@, and so on).
 2006-04-11 18:16:14 +05:00
msvensson@neptunus.(none)
8fe764fbb2 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-11 09:11:36 +02:00
brian@zim.(none)
eaf850ef5b Drop a number of OS2 specific files. 2006-04-10 17:48:19 -07:00
msvensson@neptunus.(none)
5770973b72 Merge 192.168.0.20:mysql/bug15069/my51-bug15069 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-10 15:14:47 +02:00
msvensson@neptunus.(none)
6b1f72c1a7 Merge 192.168.0.20:mysql/bug15069/my50-bug15069 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-10 15:13:30 +02:00
msvensson@shellback.(none)
1e2de60439 Merge shellback.(none):/home/msvensson/mysql/bug15069/my50-bug15069 
into  shellback.(none):/home/msvensson/mysql/bug15069/my51-bug15069
 2006-04-10 15:13:11 +02:00
msvensson@shellback.(none)
475e1f6a53 Bug#15069 [patch] my_print_defaults does'nt care --sysconfdir 
- Grab the path from "configure --sysconfdir=<path>" and set it as
   the first place to look for my.cnf files
   Do this both in Makefiles for libmysql and mysys
 - Patch provided by Francesco Riosa. Thank you!
 2006-04-10 15:11:37 +02:00
msvensson@shellback.(none)
e1348410d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-06 11:38:50 +02:00
msvensson@shellback.(none)
abc72552b5 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/bug17368/my51-bug17368
 2006-04-04 10:00:27 +02:00
msvensson@shellback.(none)
67bcb953aa Bug#17368 General log and slow query log don't work 
- Port ha_tina.cc to run on windows
 2006-04-04 09:59:19 +02:00
msvensson@shellback.(none)
d387211106 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-04 09:51:06 +02:00
monty@mysql.com
c3e7c7aa4b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-03-29 17:28:40 +03:00
monty@mysql.com
cbd420a0c1 Remove compiler warnings 
Add missing DBUG_RETURN
Fixed stack overflow in NdbBlob (found by ndb_gis.test)
Fixed access to freed memory in ndb_cluster_real_free_share()
 2006-03-29 17:04:00 +03:00
knielsen@mysql.com
cc57e4e01b Manual merge. 2006-03-28 10:07:03 +02:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from 
a normal 'make dist' source .tar.gz.
 2006-03-24 22:50:56 +01:00
msvensson@neptunus.(none)
ab1f95df3e Merge 192.168.0.100:mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 12:33:11 +01:00
msvensson@shellback.(none)
de6b1b777c Bug#18474 Unlistable directories yield no info from information_schema, part2 
- Make the windows implementation of 'my_dir' behave like the default implementation
 2006-03-23 23:09:34 +01:00
knielsen@mysql.com
a3ad39cf66 Updated CMake stuff to handle the configurations needed for release 
builds.
 2006-03-23 16:34:52 +01:00
knielsen@mysql.com
9c84881310 Define USE_TLS when compiling libmysql.dll, to avoid crashing when 
loaded at runtime.
 2006-03-22 09:55:26 +01:00
rburnett@production.mysql.com
e16e4a7cc9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  production.mysql.com:/usersnfs/rburnett/mysql-5.1
 2006-03-17 14:56:25 +01:00
Reggie@xgeek.
11979eec94 Moved cmake scripts into the proper directories 2006-03-15 10:22:12 -06:00
rburnett@production.mysql.com
c31c2eba13 Bug #17722 Test 'partition_02myisam' hangs on Windows 
The problem where is that Visual Studio 8 includes new security features to help write more secure code.  One of these features is parameter validation.  Many of the CRT functions, including lseek, assert on illegal parameter values in debug builds.  They also call parameter validation callback routines that can be registered.  We solve this problem by defaulting the error value to -1 and then only calling lseek if the fd != -1.

my_seek.c:
  Only call lseek if the fd is not -1 on Windows
 2006-03-15 10:25:42 +01:00
ingo@mysql.com
b9ed183a8d Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug11527
 2006-03-03 16:29:42 +01:00
ingo@mysql.com
5314b0372c Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug11527
 2006-02-27 19:05:08 +01:00
monty@mysql.com
e3796c924f After merge fixes 2006-02-26 15:11:56 +02:00
monty@mysql.com
1e2e9e2856 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-02-25 21:54:34 +02:00
brian@zim.(none)
cb07d52a7e This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support. 2006-02-24 13:20:51 -08:00
monty@mysql.com
82b77cdd90 Fixes to embedded server to be able to run tests with it 
(Needed for "list of pushes" web page and autopush)
 2006-02-24 18:34:15 +02:00
ingo@mysql.com
05b390b857 Merge mysql.com:/home/mydev/mysql-5.0-bug11527 
into  mysql.com:/home/mydev/mysql-5.1-bug11527
 2006-02-17 10:01:56 +01:00
ingo@mysql.com
c0fab8b7b2 Merge mysql.com:/home/mydev/mysql-4.1-bug11527 
into  mysql.com:/home/mydev/mysql-5.0-bug11527
 2006-02-16 19:51:09 +01:00
ingo@mysql.com
718ae78972 Bug#11527 - Setting myisam_repair_threads to >1 leads to corruption 
A wrong cast led to numeric overflow for data files
greater than 4GB. The parallel repair assumed end of
file after reading the amount of data that the file
was bigger than 4GB. It truncated the data file and
noted the number of records it found so far in the
index file header as the number of rows in the table.
Removing the cast fixed the problem.
I added some cosmetic changes too.

The normal repair worked because it uses a different
function to read from the data file.
 2006-02-16 19:45:57 +01:00
msvensson@neptunus.(none)
ee51f00821 Merge neptunus.(none):/home/msvensson/mysql/bug16333/my51-bug16333 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-16 10:22:04 +01:00
msvensson@neptunus.(none)
2c2d404fd7 Merge neptunus.(none):/home/msvensson/mysql/bug16333/my50-bug16333 
into  neptunus.(none):/home/msvensson/mysql/bug16333/my51-bug16333
 2006-02-16 10:08:02 +01:00
serg@serg.mylan
48b8e842ca Automerge 2006-02-15 00:01:46 +01:00
serg@serg.mylan
63cfd11859 dbug changes: 
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
   DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
 2006-02-14 22:36:11 +01:00
msvensson@neptunus.(none)
52391f3e04 Bug#16333 Assertion failure in lock.cc in the sysbench test 
- Set the value of mp->thread before mp->count to avoid race condition.
 2006-02-14 11:34:46 +01:00
konstantin@mysql.com
30ddc47ab0 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-07 15:26:58 +03:00
konstantin@mysql.com
9f0bb47f87 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 23:27:06 +03:00
konstantin@mysql.com
92b41ba92a Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 16:57:34 +03:00