Commit graph

6130 commits

Author SHA1 Message Date
guilhem@mysql.com
6a6d5ef75e trying to remove Windows compiler warnings (Miguel, could you please check if it's better now?) 2004-05-03 23:35:11 +02:00
ingo@mysql.com
c0aad5a1a8 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1700-diff
2004-05-03 16:15:45 +02:00
ingo@mysql.com
5a78b4c746 WL#1700 - Properly count key_blocks_used and key_blocks_current.
Introduced a new free blocks list. Free blocks are now re-used before
new blocks are allocated from the pool. There is a new status variable 
which can be queried by "show status like key_blocks_unused".
2004-05-03 15:55:21 +02:00
serg@serg.mylan
7df9f7d621 myisam_data_pointer_size 2004-05-01 15:41:59 +02:00
serg@serg.mylan
e95debcefe removed duplicated check for thd->killed 2004-04-30 21:11:36 +02:00
serg@serg.mylan
0479213c10 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-30 14:16:34 +02:00
monty@mysql.com
0a95918ee9 Merge 2004-04-30 14:04:51 +03:00
monty@mysql.com
6678ecf19a Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)
Added checking of cut read lines in bootstrap thread (Bug #2874)
2004-04-30 14:02:17 +03:00
serg@serg.mylan
8128b7dbf7 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-30 10:43:59 +02:00
serg@serg.mylan
dbc024deb5 compatibility fix (bug#3606) 2004-04-30 10:42:12 +02:00
konstantin@mysql.com
07eaf18642 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-u2
2004-04-30 03:00:55 +04:00
konstantin@mysql.com
aec8522569 Fix for Bug#3035 "Prepared statement integer inserts": now unsigned
flag is sent to server with placeholder types.
There were no need to extend the protocol as one additional byte
was reserved for placeholder code, when placeholder code is in range 0-255.
So this byte is now used for flags. Post-review fixes added.
2004-04-30 03:00:19 +04:00
sergefp@mysql.com
40ac433e4b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-my-ps-bugs
2004-04-30 00:00:54 +04:00
monty@mysql.com
32d0b69503 Allow one to send empty strings with mysql_stmt_send_long_data()
mysql_stmt_reset() now resets param->long_data_used
Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
Fixed problem with symlink test (bug in 4.1.2)
2004-04-28 20:19:50 +03:00
sergefp@mysql.com
cc2eb9d5c3 Renamed MY_LEX_COLON to MY_LEX_SEMICOLON (at Serg's request) 2004-04-28 01:49:05 +04:00
sergefp@mysql.com
bcf9350e4e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug3567
2004-04-27 23:37:14 +04:00
monty@mishka.local
ef18b13738 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
2004-04-27 15:48:48 +03:00
monty@mishka.local
e9cfe01db0 After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
2004-04-27 15:33:40 +03:00
sergefp@mysql.com
b8802c514d Fix for BUG#3567: Disallow several SQL statements inside a Prepared Statement. 2004-04-27 03:44:41 +04:00
serg@serg.mylan
bcad463107 MAX_KEY limit doubled (32->64) 2004-04-26 21:07:14 +02:00
monty@mishka.local
21fd1d270e Merge with 4.0 2004-04-26 15:53:31 +03:00
heikki@hundin.mysql.fi
376ef1af50 ha_innodb.h:
Allow a key path length in InnoDB to be up to 3500 bytes; this is needed so that one can create an index on a column with 255 UTF-8 characters
2004-04-24 20:40:47 +03:00
serg@sergbook.mylan
606073084e symlink, not hardlink
mkdir in Makefile, not in configure
chmod a-x
2004-04-21 14:55:39 -05:00
tomas@mc05.(none)
ecfe6ebb59 mysqld.cc:
changed default for nbdcluster to DISABLED
2004-04-19 14:34:07 +02:00
magnus@neptunus.(none)
af263160f2 Fix mysql-test-run to work better with NDB
Fix broken string constant in mysqld.cc
2004-04-15 17:30:50 +02:00
magnus@neptunus.(none)
88478c28b1 Merge conflicts with EXAMPLE handler 2004-04-15 09:22:29 +02:00
magnus@neptunus.(none)
50ff8ea369 Formatting changes requested by Monty 2004-04-15 09:17:55 +02:00
magnus@neptunus.(none)
7c2c408cb8 Added NDB storage engine 2004-04-15 09:14:14 +02:00
lenz@mysql.com
692e9dd6f0 - Fixed compile error in sql_parse.cc 2004-04-15 04:55:49 +02:00
brian@brian-akers-computer.local
86952cd9a6 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples
2004-04-14 11:59:51 -04:00
brian@brian-akers-computer.local
4d5a8cb78c All changes are to allow someone to compile the example storage engine and use it. 2004-04-12 21:01:45 -07:00
sergefp@mysql.com
5e22d6cbfc Fix and testcase for BUG#3367. 2004-04-13 00:13:25 +04:00
monty@mysql.com
7d9a9fd93a Added missing return statement 2004-04-12 03:26:32 +03:00
monty@mysql.com
8b72dde888 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-04-12 01:43:07 +03:00
monty@mysql.com
dc0d2b83c2 Added function comment 2004-04-12 01:42:39 +03:00
bell@sanja.is.com.ua
c9a087b9eb Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
2004-04-10 01:15:18 +03:00
bell@sanja.is.com.ua
a535342d57 after review PS fixes 2004-04-10 01:14:32 +03:00
heikki@hundin.mysql.fi
7d3e633edc ha_innodb.cc, sync0sync.h, sync0sync.c:
Use only noninlined InnoDB functions in ha_innodb.cc
2004-04-09 22:18:18 +03:00
serg@serg.mylan
d1e1bc82f2 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-09 18:51:51 +02:00
serg@serg.mylan
0d402d8d11 make session max_delayed_threads to be settable only to 0 or global value 2004-04-09 18:50:28 +02:00
ram@gw.mysql.r18.ru
a4a703ba8c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3376
2004-04-09 19:08:13 +05:00
ram@gw.mysql.r18.ru
c8937dbcb7 A fix. (Bug #3376: AVG(constant) returns constant if no rows in result set) 2004-04-09 19:07:39 +05:00
bell@sanja.is.com.ua
e8137a13e0 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
2004-04-09 11:31:06 +03:00
monty@mysql.com
f96c4941d8 Fixed problems noticed with last build 2004-04-09 07:12:41 +03:00
bell@sanja.is.com.ua
555eb86616 merge 2004-04-08 23:50:10 +03:00
bell@sanja.is.com.ua
ef5f15c351 fixed subquery in the FROM clause with parameter (BUG#3020) 2004-04-08 23:28:47 +03:00
guilhem@mysql.com
c640a3904a Fix for BUG#3422 "In 3.23 -> 4.0 replication, slave segfault when replicating LOAD DATA INFILE":
as we transform the 3.23 Load_log_event into a 4.0 Create_file_log_event which is one
byte longer, we need to increment event_len. The bug was that we did not increment it,
so later in code the end 0 was not seen so there was for example a segfault in
strlen(fname) because fname was not 0-terminated.
Other problems remain in 3.23->4.0 replication of LOAD DATA INFILE but they are less serious:
Exec_master_log_pos and Relay_log_space are incorrect. I'll document them.
They are not fixable without significant code changes (if you fix those problems in 4.0,
you get assertion failures somewhere else etc), * which are already done in 5.0.0 *.
2004-04-08 22:12:22 +02:00
serg@serg.mylan
0ade401777 always call start_bulk_insert, clarify this behaviour in comment block
change 10 to a #define'd constant
2004-04-08 20:41:00 +02:00
monty@mysql.com
62fa4013ce Don't enable HA_EXTRA_WRITE_CACHE if too few rows
Revert main parts of patch for online index builds. Should be done differently
Added support for %lx in my_snprintf()
2004-04-08 17:56:45 +03:00
monty@mysql.com
00738a2be0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-04-08 15:02:25 +03:00