mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35156 commits 2781 branches 343 tags 1.6 GiB
Commit graph

35156 commits

This branch
This branch
All branches
Author SHA1 Message Date
andrey@lmy004.
45598df7d4 manual merge 2006-06-20 17:14:36 +02:00
andrey@lmy004.
40fe2b9a45 forgot to event_timed.h 
STRING_WITH_LEN -> C_STRING_WITH_LEN
 2006-06-20 17:05:41 +02:00
anozdrin@booka.site
f237fa7840 Merge mysql.com:/home/alik/MySQL/devel/5.1-tree 
into  mysql.com:/home/alik/MySQL/devel/5.1-rt
 2006-06-20 00:54:51 +04:00
serg@serg.mylan
d4bdf2f447 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-19 21:12:31 +02:00
evgen@sunlight.local
6e80c3ec42 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-06-19 22:23:41 +04:00
serg@serg.mylan
829772b49d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-19 19:14:14 +02:00
epotemkin@sunlight.local
b1ca33dbdb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-06-19 20:32:07 +04:00
evgen@moonbone.local
9c324f32e7 rpl_row_log.result, rpl_row_log_innodb.result: 
Fixed failing test case
 2006-06-19 20:21:00 +04:00
svoj@may.pils.ru
23a4a85908 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-19 20:01:24 +05:00
svoj@may.pils.ru
098c1a0303 Merge april:devel/BitKeeper/mysql-5.0-engines 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-19 19:58:55 +05:00
svoj@may.pils.ru
6124539b0f Merge april:devel/BitKeeper/mysql-5.1-engines 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-19 19:57:42 +05:00
stewart@mysql.com
917203ddd7 BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS, 2006-06-20 00:30:19 +10:00
serg@serg.mylan
6554329434 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-19 13:49:00 +02:00
anozdrin@mysql.com
7ecfadbcf2 Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN(). 2006-06-19 15:17:15 +04:00
anozdrin@mysql.com
3b6397b1d2 WL#3298: IM: make command-line option names consistent 
1. Removed '-P' command line option;
2. Renamed '--passwd' command line option to '--print-password-line'.
 2006-06-19 14:41:29 +04:00
evgen@moonbone.local
c0850425e5 rpl_log.test, rpl_stm_log.result: 
Fixed failing test case
field.cc, item_cmpfunc.cc, select.result:
  After merge fix
 2006-06-19 04:26:27 +04:00
evgen@moonbone.local
79c91f6214 Manually merged 2006-06-18 14:56:35 +04:00
serg@serg.mylan
8c4206a31d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-17 16:45:25 +02:00
serg@serg.mylan
48c453a40b atomic ops: 
my_atomic_XX_t -> intXX, no implicit locking anymore
    simplified framework, support for requested cleanups
 2006-06-17 16:20:39 +02:00
pekka@clam.ndb.mysql.com
5d3aa23d2a ndb - bug#19285 post merge 5.0->5.1 fix (error codes) 2006-06-17 13:12:38 +02:00
pekka@clam.ndb.mysql.com
adc433484f Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285
 2006-06-17 13:05:31 +02:00
pekka@clam.ndb.mysql.com
35416445da ndb - bug#19285 minor fixes 2006-06-17 13:00:17 +02:00
pekka@clam.ndb.mysql.com
95aa9c28f2 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285
 2006-06-17 11:10:43 +02:00
evgen@moonbone.local
09e84bf484 Merge moonbone.local:/work/tmp_merge-5.0 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-17 03:35:10 +04:00
evgen@moonbone.local
1aedd2ed3e Manually merged 2006-06-17 02:57:50 +04:00
evgen@moonbone.local
59b204fe08 select.result: 
After merge fix
 2006-06-17 02:52:14 +04:00
evgen@moonbone.local
7f24667598 Manually merged 2006-06-17 02:11:12 +04:00
evgen@moonbone.local
592e080643 Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-17 01:57:25 +04:00
evgen@moonbone.local
28cf3c3e64 Manually merged 2006-06-17 00:58:36 +04:00
evgen@moonbone.local
b8b9738e0b item_strfunc.cc: 
Fix for bug#16716 for --ps-protocol mode.
item_cmpfunc.cc:
  Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
for bug#16377. Few language corrections.
 2006-06-16 23:46:37 +04:00
serg@serg.mylan
694c1db79a Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-16 21:39:10 +02:00
petr@outpost.site
86f2f5828d Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
 2006-06-16 23:39:09 +04:00
serg@serg.mylan
2893e2091a Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-16 21:39:09 +02:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
1327ca0168 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-fix
 2006-06-16 15:39:08 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
0237f03652 Fix for broken compile if not compiling with partitioning 2006-06-16 15:04:35 -04:00
serg@serg.mylan
c4dd4a398b remove wrong assert 2006-06-16 16:26:30 +02:00
elliot@lost.local
23ac9266ba Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1
 2006-06-16 09:28:46 -04:00
stewart@willster.(none)
66d7d65000 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
 2006-06-16 21:35:49 +10:00
stewart@mysql.com
b5165c371e Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2006-06-16 21:01:02 +10:00
stewart@willster.(none)
0811fd79f1 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
 2006-06-16 20:52:21 +10:00
serg@serg.mylan
d00b56549c String::set(double) and set(longlong) -> set_real() and set_int() 
fix Field::store(double) being used instead of store(longlong)

NB: overloading functions is evil
 2006-06-16 12:17:20 +02:00
ramil@mysql.com
f2899063ee after-merge fixes. 2006-06-16 14:05:58 +05:00
stewart@mysql.com
45d7e75cb7 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
 2006-06-16 18:54:20 +10:00
serg@serg.mylan
816bd73362 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2006-06-16 10:01:13 +02:00
serg@serg.mylan
16861b2e3b Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index 
Don't rely on table->null_row when no index is used - it may be a multi-table search
 2006-06-16 09:49:18 +02:00
ingo@mysql.com
4c52d3ddf1 Bug#18775 - Temporary table from alter table visible to other threads 
The intermediate (not temporary) files of the new table
during ALTER TABLE was visible for SHOW TABLES. These
intermediate files are copies of the original table with
the changes done by ALTER TABLE. After all the data is
copied over from the original table, these files are renamed 
to the original tables file names. So they are not temporary 
files. They persist after ALTER TABLE, but just with another 
name.

Normal GRANT checking takes place for the intermediate table.
Everyone who can see the original table (and hence the final
table) can also see the intermediate table. But noone else.

In 5.0 the intermediate files are invisible for SHOW TABLES
because all file names beginning with "#sql" were suppressed.
In 5.1 temporary files are created in TMPDIR, so that they
don't appear in the database directories. Also in 5.1 a
translation between table names and file names is done. The
tmp_file_prefix on file level is now "@0023sql".

The suppression of files starting with tmp_file_prefix is
still in place, but still only files beginning with "#sql"
were suppressed.

I do now translate tmp_file_prefix from table name to file
name before comparing it with the files in a directory.
This suppresses the intermediate files again.

No test case. The test case looks so that a reasonable big
table is altered while a second thread runs SHOW TABLES.
This in itself would be possible to do, but on slow machines
it would add too much time to the test suite, while on fast
machines the ALTER TABLE might have finished before SHOW
TABLES looks at the directory. Even if there might be a good
balance for todays machines, one day the test would become
void as the intermediate table would not be seen even with
the bug in place. I added a test script to the bug report.
It can easily be changed so that it uses a table size that
is appropriate for the test machine.
 2006-06-16 09:02:03 +02:00
mskold@mysql.com
49790e0d73 Merge mysql.com:/home/marty/MySQL/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-16 08:47:46 +02:00
igor@rurik.mysql.com
ee2e2d0c6d Post_merges fixes. 2006-06-15 20:29:05 -07:00
elliot@mysql.com
10fd4b0f0f Fixing false alarm errors on windows build from a clean clone. 2006-06-15 22:46:52 -04:00
igor@rurik.mysql.com
1241d86787 Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-06-15 18:40:18 -07:00