bar@mysql.com
23332d0d95
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b17142
2006-03-07 13:07:23 +04:00
bar@mysql.com
02023859bf
Bug#17142 Crash if create with encoded name
...
upgrade.result, upgrade.test:
Adding test case.
table.cc:
Don't try to open a table with old-formatted name,
if the table name contains "@" character.
This is to avoid mixing two different names to each other.
Thanks Monty for suggesting this fix.
2006-03-07 13:05:24 +04:00
mats@mysql.com
8d10f7b7a1
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/w3023-mysql-5.1-new
2006-03-07 10:00:13 +01:00
msvensson@neptunus.(none)
647a940649
Enable ifdef for windows specific functions
2006-03-07 08:57:57 +01:00
mats@mysql.com
3f7b8cfb6e
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/fix-mysql-5.1-new
2006-03-07 08:40:09 +01:00
mats@mysql.com
0713aa597a
Bug#17874 (Test failure: rpl_row_basic_3innodb):
...
Some storage engines does not set the filler bits, so we set them
before calling the record-reading functions.
2006-03-07 08:33:20 +01:00
msvensson@neptunus.(none)
456b2d6b14
Improve error message for faulty usage of "inc" and "dec"
2006-03-07 07:50:04 +01:00
msvensson@neptunus.(none)
f063ce8e31
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-07 07:42:51 +01:00
reggie@big_geek.
57f56eb4bf
Bug #17720
...
Minor cleanup from Mikael's review
2006-03-06 23:18:48 -06:00
serg@serg.mylan
6d6d11787f
after merge
2006-03-06 23:43:47 +01:00
serg@serg.mylan
84ff8192ff
merged
2006-03-06 23:20:19 +01:00
msvensson@neptunus.(none)
f2ce7dc787
Fix typo
2006-03-06 22:18:04 +01:00
msvensson@neptunus.(none)
67f6576de8
Revert
2006-03-06 22:14:06 +01:00
msvensson@neptunus.(none)
0cc14310e8
Remove unused var
...
Reduce code
2006-03-06 22:08:34 +01:00
serg@serg.mylan
5a1672dd66
compilation fixes
2006-03-06 22:08:29 +01:00
msvensson@neptunus.(none)
a336f48552
Win fixes
...
- Use tmp sh file both in system and popen
2006-03-06 22:05:39 +01:00
msvensson@neptunus.(none)
dfe158fc15
Use grep instead of egrep
...
Use system inestad of exec
2006-03-06 21:45:13 +01:00
msvensson@neptunus.(none)
394da857fd
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 21:36:57 +01:00
pem@mysql.com
1e0289041c
Merge mysql.com:/extern/mysql/bk/mysql-5.1-new
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-06 21:15:43 +01:00
serg@serg.mylan
d190e08e4e
merged
2006-03-06 20:53:14 +01:00
msvensson@neptunus.(none)
6634aec877
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 20:24:21 +01:00
msvensson@neptunus.(none)
0acda1463d
Update test result
2006-03-06 20:12:48 +01:00
msvensson@neptunus.(none)
aa3c00b5df
Update test result
2006-03-06 20:09:16 +01:00
msvensson@neptunus.(none)
3ae351931d
Update test result
2006-03-06 20:06:56 +01:00
pem@mysql.com
a065843799
Merge mysql.com:/extern/mysql/5.0/generic/mysql-5.0
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-06 19:46:17 +01:00
kent@mysql.com
de821aa76f
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-06 18:57:32 +01:00
serg@serg.mylan
e7504b3468
merged
2006-03-06 18:34:38 +01:00
serg@serg.mylan
0b2f4ac3be
kill (subquery) - three years old bugfix that never worked
2006-03-06 18:26:39 +01:00
mskold@mysql.com
6feaef7517
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-06 18:08:42 +01:00
mskold@mysql.com
48cc86db83
Tables are now removed remotely by binlog_thread
2006-03-06 18:06:21 +01:00
msvensson@neptunus.(none)
703d2f89d0
Build fix, liboptions.a is now a libtool convenience library
...
-liboptions.a -> liboptions.la
2006-03-06 17:17:22 +01:00
msvensson@neptunus.(none)
77214de820
Disable rpl_ndb_multt_update2
2006-03-06 17:09:23 +01:00
holyfoot@mysql.com
8707e3356d
Merge mysql.com:/home/hf/work/mysql-5.0.15745
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-03-06 19:57:20 +04:00
cmiller@zippy.(none)
b65fbcbc99
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
2006-03-06 10:49:33 -05:00
cmiller@zippy.(none)
a2a5925d60
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
2006-03-06 10:44:01 -05:00
kent@mysql.com
590d258165
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-06 15:00:44 +01:00
kent@mysql.com
16933400fc
mysql.spec.sh:
...
Enabled fast mutexes, now default is off
2006-03-06 14:57:41 +01:00
msvensson@neptunus.(none)
6457050df6
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 14:52:49 +01:00
vtkachenko@quadxeon.mysql.com
efd3dad2d6
Merge bk-internal:/home/bk/mysql-5.1-new
...
into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new
2006-03-06 14:35:02 +01:00
vtkachenko@quadxeon.mysql.com
8c8d7b809b
configure.in:
...
Change comment for fast-mutex
2006-03-06 14:25:18 +01:00
pekka@mysql.com
e05be757fe
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-03-06 14:18:35 +01:00
vtkachenko@quadxeon.mysql.com
9ae37a54f2
configure.in:
...
Change default value --with-fast-mutexes=no
2006-03-06 14:13:01 +01:00
msvensson@neptunus.(none)
c9d14a0329
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 14:03:16 +01:00
msvensson@neptunus.(none)
30071e9783
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 14:01:15 +01:00
pekka@mysql.com
5d026c1d11
ndb - close non-bug rpl_ndb_charset Bug#17246
2006-03-06 13:51:57 +01:00
kent@mysql.com
ab77867efb
Merge
2006-03-06 13:50:52 +01:00
msvensson@neptunus.(none)
108fc10143
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 13:45:53 +01:00
pekka@mysql.com
e6983ff205
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-03-06 13:44:03 +01:00
pekka@mysql.com
12c82da26c
Merge mysql.com:/space/pekka/ndb/version/my51
...
into mysql.com:/space/pekka/ndb/version/my51-dict
2006-03-06 13:34:53 +01:00
bar@mysql.com
6823225a81
Merge mysql.com:/usr/home/bar/mysql-4.1.b15949
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-06 16:20:15 +04:00