Commit graph

1628 commits

Author SHA1 Message Date
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
c5a638cee0 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-bug11527
2006-03-04 14:06:52 +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
SergeyV@selena.
b0136378cf Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  selena.:H:/MYSQL/src/#06536-mysql-4.1
2006-02-13 17:29:35 +03: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
sergefp@mysql.com
b197e22d4f Change DBUG_ASSERT(1) to DBUG_ASSERT(0) 2006-02-01 02:19:14 +03:00
brian@zim.tangent.org
570bffe8c7 Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
my_stat() gettinng the correct parameter list may be next :)
2006-01-25 19:54:42 -08:00
SergeyV@selena.
edca1d6f07 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#11892-mysql-5.0
2006-01-25 20:04:27 +03:00
gluh@eagle.intranet.mysql.r18.ru
fa776a6f67 Fix for bug#15851 Unlistable directories yield no info from information_schema
to skip directories which are not allowed for read
2006-01-24 15:59:08 +04:00
bar@mysql.com
0e665a7aa5 sql_show.cc:
Don't display charsets/collations with HIDDEN flag.
ctype-utf8.c:
  Adding HIDDEN flag to "filename"
  Changeing ID to 17 which was previosly
  used by deprecated "win1251", removed in 4.1.
charset-def.c:
  Adding "filename" as a hidden charset, for test purposes.
m_ctype.h:
  Adding MY_CS_HIDDEN flag,
  to hide charsets and collations from
  being displayed in SHOW.
2006-01-18 12:27:02 +04:00
knielsen@mysql.com
92e1557dce C++ comments in C files are not portable. 2006-01-17 21:38:19 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
6bf5c9113d WL #2747: Fix such that backup and restore works for user defined
partitioned tables in NDB
2006-01-17 09:25:12 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
e802a94284 WL #2604: Partition Management
Optimised version of ADD/DROP/REORGANIZE partitions for
non-NDB storage engines.
New syntax to handle REBUILD/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
Quite a few bug fixes
2006-01-17 08:40:00 +01:00
serg@serg.mylan
ae3d815b41 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-16 18:09:04 +01:00
anozdrin@mysql.com
4e1ccbe244 Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15103
into  mysql.com:/home/alik/MySQL/devel/5.1-tree
2006-01-13 19:46:39 +03:00
konstantin@mysql.com
4d272aba67 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-01-11 17:49:56 +03:00
konstantin@mysql.com
9105d06dd6 A fix for Bug#13944 "libmysqlclient exporting sha1_result function":
rename sha1_* to mysql_sha1_*
2006-01-11 17:31:52 +03:00
andrey@lmy004.
7c049782fa WL #1034 (Internal CRON)
merge before push
2006-01-10 21:02:19 +01:00
serg@serg.mylan
923e7cfd73 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-07 14:50:03 +01:00
serg@serg.mylan
8dc77f267b merged 2006-01-06 18:26:59 +01:00
konstantin@mysql.com
f4cc6c4d15 Merge mysql.com:/opt/local/work/mysql-5.0-merge
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-01-05 00:38:51 +03:00
konstantin@mysql.com
6502e6bba7 Merge mysql.com:/opt/local/work/mysql-4.1-7209-new
into  mysql.com:/opt/local/work/mysql-5.0-merge
2006-01-04 17:49:45 +03:00
konstantin@mysql.com
f7d6fa6f17 A fix for Bug#7209 "Client error with "Access Denied" on updates
when high concurrency": remove HASH::current_record and make it
an external search parameter, so that it can not be the cause of a 
race condition under high concurrent load.
The bug was in a race condition in table_hash_search,
when column_priv_hash.current_record was overwritten simultaneously
by multiple threads, causing the search for a suitable grant record
to fail.
No test case as the bug is repeatable only under concurrent load.
2006-01-04 17:35:30 +03:00