mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
28979 commits 2784 branches 343 tags 1.6 GiB
Commit graph

13841 commits

Author SHA1 Message Date
jimw@mysql.com
fb1200a0a3 Merge mysql.com:/home/jimw/my/mysql-4.1-12612 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-01 12:07:25 -08:00
jimw@mysql.com
e7fe779ddf Merge mysql.com:/home/jimw/my/mysql-5.0-keysize 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-01 12:03:46 -08:00
jimw@mysql.com
e86048ce59 Enable key lengths of up to 3K on 32-bit platforms. 2005-12-01 11:11:03 -08:00
bell@sanja.is.com.ua
8cbf1e5119 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-01 17:12:42 +02:00
timour@mysql.com
27e962764d Merge mysql.com:/home/timka/mysql/src/5.1-virgin 
into  mysql.com:/home/timka/mysql/src/5.1-dbg
 2005-12-01 14:47:02 +02:00
bell@sanja.is.com.ua
7796a79477 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-01 14:38:29 +02:00
vtkachenko@quadxeon.mysql.com
045747f23d Many files: 
Added mmap support for MyISAM engine
 2005-12-01 13:34:48 +01:00
bell@sanja.is.com.ua
e3f2a63308 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-01 14:29:12 +02:00
bell@sanja.is.com.ua
12d1bf1231 We should skip beggining '(' characters when test query on possibility 
to be in the query cache. (BUG#14652)
 2005-12-01 14:26:19 +02:00
gluh@eagle.intranet.mysql.r18.ru
21cc3ae561 Fix for bug#11491 Misleading error message if not NULL column set to NULL, 
SQL mode TRADITIONAL
  Message is chenged from 'ER_WARN_NULL_TO_NOTNULL' to 'ER_BAD_NULL_ERROR'
 2005-12-01 15:30:11 +04:00
ramil@mysql.com
ab04ceafc7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2005-12-01 14:31:28 +04:00
ramil@mysql.com
37cfade0b4 Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select). 2005-12-01 14:26:46 +04:00
bell@sanja.is.com.ua
2c666b32db Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-01 12:16:45 +02:00
bell@sanja.is.com.ua
2ff98e0586 View creation code fixed to expect empty TABLE_LIST::table pointer (BUG#15096). 2005-12-01 12:15:48 +02:00
timour@mysql.com
aa864660d7 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.1-dbg
 2005-12-01 12:12:24 +02:00
bell@sanja.is.com.ua
513d055076 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-01 12:04:01 +02:00
bell@sanja.is.com.ua
39689634ac We should not skip temptable view along with other derived 
tables during query tables registration. (BUG#15119)
 2005-12-01 12:01:38 +02:00
gluh@eagle.intranet.mysql.r18.ru
fb057f13fb Fix for bug#9785 SELECT privilege for the whole database 
is needed to do SHOW CREATE DATABASE
  To allow SHOW CREATE DATABASE when the user can use the database
 2005-12-01 13:04:19 +04:00
timour@mysql.com
d80feb9e21 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-14920
 2005-12-01 09:26:17 +02:00
gluh@mysql.com
55ee78ed86 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
 2005-12-01 11:08:13 +04:00
gluh@eagle.intranet.mysql.r18.ru
1faac904f5 Fix for bug#14476 information_schema.TABLES.TABLE_TYPE with empty value 
store TABLES.TABLE_TYPE in case of error during table opening
 2005-12-01 11:00:33 +04:00
jimw@mysql.com
0538845963 Merge mysql.com:/home/jimw/my/mysql-5.1-release 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-11-30 13:51:23 -08:00
jimw@mysql.com
0597c510c8 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-11-30 12:17:01 -08:00
timour@mysql.com
687b66b8da WL#2486 - natural/using joins according to SQL:2003 
Post-review fixes that simplify the way access rights
are checked during name resolution and factor out all
entry points to check access rights into one single
function.
 2005-11-30 21:27:11 +02:00
timour@mysql.com
999a73ace5 Fix for BUG#14920 Ordering aggregated result sets corrupts resultset. 
The cause of the bug was the use of end_write_group instead of end_write
in the case when ORDER BY required a temporary table, which didn't take
into account the fact that loose index scan already computes the result
of MIN/MAX aggregate functions (and performs grouping).

The solution is to call end_write instead of end_write_group and to add
the MIN/MAX functions to the list of regular functions so that their
values are inserted into the temporary table.
 2005-11-30 12:52:12 +02:00
ramil@mysql.com
516fd4254e Addition to fix for bug #12956: cast make differ rounding. 
- use rint() in some other val_int() methods as well.
 2005-11-30 11:17:25 +04:00
jimw@mysql.com
f8afbe6f0c Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-29 15:33:58 -08:00
jimw@mysql.com
f353bec511 Merge mysql.com:/home/jimw/my/mysql-4.1-14216 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-29 11:52:58 -08:00
knielsen@mysql.com
e4cfee01d1 More Win32 byte* vs. char* fixes. 2005-11-29 15:18:31 +01:00
ramil@mysql.com
b46c240b96 Addition to fix for bug #12956: cast make differ rounding. 
- use rint() in some other val_int() methods as well.
 2005-11-29 18:06:58 +04:00
holyfoot@mysql.com
c60b8e3027 Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.14693
 2005-11-29 13:33:56 +04:00
knielsen@mysql.com
0da7c25528 Fix byte * vs. char * mismatches that break Win32 compilation. 2005-11-29 09:07:21 +01:00
bar@mysql.com
23c4c3abc0 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2005-11-29 09:30:29 +04:00
bar@mysql.com
0f73558ee3 Merge mysql.com:/usr/home/bar/mysql-4.1.b10446 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-11-29 09:25:51 +04:00
bar@mysql.com
5c1ba75cfd Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b10446
 2005-11-29 09:21:57 +04:00
jimw@mysql.com
0f9f53c321 Add Ingo to SHOW AUTHORS 2005-11-28 18:28:31 -08:00
jimw@mysql.com
30bafb78a8 Small tweaks to SHOW AUTHORS list 2005-11-28 18:14:16 -08:00
jimw@mysql.com
d0c2f3cfd6 Update list of authors with information from documentation. 2005-11-28 15:32:26 -08:00
timour@mysql.com
cc7d1268c4 WL#2486 - Natural/using join according to SQL:2003. 
Post-review fixes according to Monty's review.
 2005-11-28 21:57:50 +02:00
pem@mysql.com
b2a9961abf Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new
 2005-11-28 20:14:12 +01:00
jimw@mysql.com
9df4951acb Merge mysql.com:/home/jimw/my/mysql-5.0-14956 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-28 10:51:54 -08:00
jimw@mysql.com
99297e44d4 Merge mysql.com:/home/jimw/my/mysql-4.1-14155 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-28 10:50:23 -08:00
knielsen@mysql.com
f0c5aae500 Merge mysqldev@production:my/mysql-4.1.16-fixes 
into  mysql.com:/usr/local/mysql/mysql-4.1
 2005-11-28 16:35:28 +01:00
reggie@fedora.(none)
c171f8c6c6 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  fedora.(none):/home/reggie/bk/mysql-5.1-new
 2005-11-28 08:07:56 -06:00
joerg@mysql.com
a27a1f0ad3 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2005-11-28 15:07:55 +01:00
knielsen@mysql.com
9248dfc840 Minor Win32 compile fixes for 4.1.16 release. 2005-11-28 15:07:20 +01:00
joerg@mysql.com
7ba6c27e78 Merge mysql.com:/M51/tmp-5.1 into mysql.com:/M51/clone-5.1 2005-11-28 14:57:49 +01:00
joerg@mysql.com
47f298a847 sql/mysqld.cc 
Fix a typo: "distibution" -> "distribution".
 2005-11-28 14:54:41 +01:00
pem@mysql.com
df553710df Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14643/mysql-5.0
 2005-11-28 13:20:15 +01:00
knielsen@mysql.com
146716e645 Added my name. 2005-11-28 12:05:08 +01:00
bar@mysql.com
5ab6d98e98 Merge mysql.com:/usr/home/bar/mysql-5.0.b14146.sep 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2005-11-28 15:03:41 +04:00
ramil@mysql.com
65e6ecb861 Fix for bug #12956: cast make differ rounding. 2005-11-28 14:52:38 +04:00
kent@mysql.com
0261697138 2005-11-28 11:28:07 +01:00
bar@mysql.com
1263105c43 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.param
 2005-11-28 12:49:00 +04:00
bar@mysql.com
63b038f2e6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
 2005-11-28 12:45:40 +04:00
bar@mysql.com
4ac260ae27 item.cc, item.h: 
Fixing Item_param::safe_charset_converter to do less "new"s.
 2005-11-28 12:41:44 +04:00
reggie@fedora.(none)
359516fde1 Added myself to authors table for 5.1 2005-11-27 09:06:46 -06:00
lars@mysql.com
97b6713a59 Added my name 
Changed to alphabetical order
 2005-11-27 13:58:50 +01:00
igor@rurik.mysql.com
a87477d1ec Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-11-26 11:28:16 -08:00
knielsen@mysql.com
96dcdcc764 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/tmp/x/mysql-5.1-new
 2005-11-26 15:30:09 +01:00
serg@serg.mylan
122b597fc3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-26 08:56:59 +01:00
serg@serg.mylan
10df921c96 documenting HA_STATUS_xxx flags 2005-11-26 08:54:13 +01:00
kent@mysql.com
6430a4901e Makefile.am: 
Distribute "handlerton-win.cc"
mysqld.cc:
  Corrected word lenght for some innobase
  configuration variables
Makefile.am:
  Added Visual Studio 7 project file to EXTRA_DIST
ha_partition.cc, sql_partition.cc:
  Changed include to use "..." for Windows
handlerton-win.cc:
  Handle engine include/exclude with defines for Windows
  new file
 2005-11-26 05:35:37 +01:00
igor@rurik.mysql.com
881e6e681c Fixed bug #15106. 
A typo bug caused loss of a predicate of the form field=const in some cases.
 2005-11-25 18:51:44 -08:00
eric@mysql.com
d62733e93d Fixed failing "show check" test. 2005-11-25 11:05:35 -08:00
sergefp@mysql.com
e5592190e5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug15204
 2005-11-25 20:48:26 +03:00
sergefp@mysql.com
526a1d89c9 BUG#15024: get_best_covering_ror_intersect() tries to build ROR-intersection 
by starting with an empty index set and adding indexes to it until it
becomes covering. If the set becomes covering after adding the first index,
return NULL and don't try constructing ROR-intersection of one index (which
caused a crash)
 2005-11-25 20:47:22 +03:00
konstantin@mysql.com
c779c2c809 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-11-25 19:27:20 +03:00
pem@mysql.com
eb5bf2ec33 Fixed BUG#14233: Crash after tampering with the mysql.proc table 
Post-review version. Some minor review fixes, but also changed the way
  some errors are handled: Don't return specific parse errors; instead
  always use the more general "table corrupt" error (amended accordingly).
 2005-11-25 17:09:26 +01:00
konstantin@mysql.com
463175c4e8 Post-merge fixes. 2005-11-25 18:53:55 +03:00
konstantin@mysql.com
9fd6204ad1 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-11-25 13:57:13 +03:00
knielsen@mysql.com
619b1cc690 Merge bk-internal:/home/bk/mysql-5.1-new 
into mysql.com:/data0/mysqldev/my/mysql-5.1.3-pushmain
 2005-11-25 11:46:28 +01:00
holyfoot@deer.(none)
60a7a6c079 HF mentioned in authors.h 2005-11-25 14:46:27 +04:00
konstantin@mysql.com
f57dffe453 A fix and a test case for Bug#14410 "Crash in Enum or Set type in 
CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are 
created in the statement memory root.
 2005-11-25 13:25:31 +03:00
knielsen@mysql.com
5e56a6bc2d Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release 
into mysql.com:/data0/mysqldev/my/mysql-5.1.3-fixes
 2005-11-25 11:04:13 +01:00
mskold@mysql.com
6d5ef98adc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-25 10:56:01 +01:00
knielsen@mysql.com
866ea4552f Fix example storage engine following table def cache updates. 2005-11-25 10:35:26 +01:00
knielsen@mysql.com
4719923781 Mikaels fix for compiling without partition storage engine 2005-11-25 10:33:38 +01:00
mikael@mysql.com
a6c97bb635 Made set_part_info a handler method and not a ha_partition method only 
The previous variant where it was a specific ha_partition method
only worked for the partition handler. It was unfortunately called also
for the NDB handler and in this case it called a random method in the
NDB handler with random input.
 2005-11-25 09:11:52 +01:00
bar@mysql.com
e6708aa0df Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b14146
 2005-11-25 10:08:00 +04:00
evgen@moonbone.local
7a21129691 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13293-bug-5.0-mysql
 2005-11-24 22:41:52 +03:00
pem@mysql.com
3fd3e277ff Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
 2005-11-24 19:45:36 +01:00
pem@mysql.com
7d232f01e3 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
 2005-11-24 19:14:11 +01:00
pem@mysql.com
23cab491e9 Some post-merge cleaning, and made assert THD::store_globals() work at all times. 2005-11-24 19:13:13 +01:00
serg@serg.mylan
8fb3b83805 don't call handler::info() in SHOW CREATE TABLE 2005-11-24 18:13:08 +01:00
evgen@moonbone.local
e093fb1fd7 Fix bug#13293 Wrongly used index results in endless loop. 
Loose index scan using only second part of multipart index was choosen, which
results in creating wrong keys and endless loop.

get_best_group_min_max() now allows loose index scan for distinct only if used
keyparts forms a prefix of the index.
 2005-11-24 19:54:02 +03:00
holyfoot@deer.(none)
e906120ba8 Fix for bug #14693 (ALTER COLUMN SET DEFAULT has no effect) 2005-11-24 20:24:45 +04:00
evgen@moonbone.local
e3cab037bf Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14482-bug-4.1-mysql
 2005-11-24 19:17:31 +03:00
evgen@moonbone.local
a4a3215a44 Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused 
crash

resolve_const_item() substitutes item which will evaluate to constant with
equvalent constant item, basing on the item's result type. In this case
subselect was resolved as constant, and resolve_const_item() was substituting
it's result's Item_caches to Item_null. Later Item_cache's function was called
for Item_null object, which caused server crash.

resolve_const_item() now substitutes constants for items with 
result_type == ROW_RESULT only for Item_rows.
 2005-11-24 19:16:51 +03:00
mskold@mysql.com
f27dc1c232 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-24 16:21:49 +01:00
mskold@mysql.com
70d447c1f1 Moved check of wrong schema version earlier 2005-11-24 16:21:07 +01:00
pem@mysql.com
c5475706f9 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
 2005-11-24 12:12:49 +01:00
ramil@mysql.com
c0cdfe8599 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b15047
 2005-11-24 13:42:47 +04:00
igor@rurik.mysql.com
9b9f8cab4c Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-11-23 21:44:21 -08:00
monty@mysql.com
b0aecee8af Merge mysql.com:/home/my/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1-TDC
 2005-11-24 06:23:51 +02:00
monty@mysql.com
188295114c Clear variable 2005-11-24 06:17:38 +02:00
monty@mysql.com
1502692322 Added bitmap_buffer_size() 
Removed valgrind warnings when using not aligned bitmap buffer size
Added setting of thread_stack
 2005-11-24 06:15:35 +02:00
monty@mysql.com
a3436bd7de Merge mysql.com:/home/my/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1-TDC
 2005-11-24 04:08:07 +02:00
jimw@mysql.com
81cb8ad37d Fix handling of maximum value for MAX_ROWS on 64-bit platforms. (Bug #14155) 2005-11-23 17:05:59 -08:00
monty@mysql.com
aa37b75768 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2005-11-24 02:56:12 +02:00
monty@mysql.com
f5804869e3 Don't use PATH_MAX for FN_REFLEN as this uses too much stack space 
Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk
 2005-11-24 02:36:28 +02:00
jimw@mysql.com
86beb208aa Fix result of ROW_COUNT() after 'EXECUTE prepstmt'. (Bug #14956) 2005-11-23 14:57:26 -08:00
monty@mysql.com
4575a662cb Merge mysql.com:/home/my/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1-TDC
 2005-11-23 22:58:53 +02:00
monty@mysql.com
30b360bfcc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2005-11-23 22:45:47 +02:00
monty@mysql.com
e42c980967 Table definition cache, part 2 
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
  object and open a handler to the table object

Other noteworthy changes:
- In TABLE_SHARE the most common strings are now LEX_STRING's
- Better error message when table is not found
- Variable table_cache is now renamed 'table_open_cache'
- New variable 'table_definition_cache' that is the number of table defintions that will be cached
- strxnmov() calls are now fixed to avoid overflows
- strxnmov() will now always add one end \0 to result
- engine objects are now created with a TABLE_SHARE object instead of a TABLE object.
- After creating a field object one must call field->init(table) before using it

- For a busy system this change will give you:
 - Less memory usage for table object
 - Faster opening of tables (if it's has been in use or is in table definition cache)
 - Allow you to cache many table definitions objects
 - Faster drop of table
 2005-11-23 22:45:02 +02:00
konstantin@mysql.com
6fab184f30 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-11-23 21:20:31 +03:00
konstantin@mysql.com
b1d951d462 Always initialize THD::thread_stack: it's used in 
check_stack_overrun().
 2005-11-23 21:18:10 +03:00
monty@mysql.com
e05630b17f Moved long running query to type_newdecimal-big.test 
Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups
 2005-11-23 20:16:06 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-11-23 14:57:00 +02:00
serg@serg.mylan
d50e8ea227 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-23 13:02:50 +01:00
pem@mysql.com
0411412403 Fixed BUG#13729 Stored procedures: packet error after exception handled 
Don't set thd->is_fatal_error in sql_update for duplicate key errors.
 2005-11-23 11:56:53 +01:00
joerg@mysql.com
415053f2d8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2005-11-23 11:53:21 +01:00
bell@sanja.is.com.ua
1343975dda A name of macro is fixed. 2005-11-23 12:26:07 +02:00
joerg@mysql.com
3a7d81258c Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/clone-5.1 2005-11-23 11:24:52 +01:00
pem@mysql.com
f1f257c06c Added myself to authors.h. 2005-11-23 11:07:08 +01:00
serg@serg.mylan
151d75c241 merged 2005-11-23 09:52:18 +01:00
igor@rurik.mysql.com
7b1b69a6e7 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-11-22 23:00:57 -08:00
bell@sanja.is.com.ua
83d692da88 postmerge fix 2005-11-23 02:49:44 +02:00
jimw@mysql.com
b5c5af1f50 Add --bdb-data-direct and --bdb-log-direct server options. (Bug #14880) 2005-11-22 16:44:57 -08:00
kent@mysql.com
ffb5a275c3 configure.in: 
Changed version to 5.1.3
 2005-11-23 01:09:13 +01:00
bell@sanja.is.com.ua
e6b04edbb1 merge 2005-11-23 01:29:25 +02:00
bell@sanja.is.com.ua
db8f03ebe8 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-23 01:28:32 +02:00
bell@sanja.is.com.ua
7bd691f11e Recursion support made for SP (BUG#10100). 2005-11-23 01:11:19 +02:00
bell@sanja.is.com.ua
7d2442a160 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-23 00:58:13 +02:00
bell@sanja.is.com.ua
2bcd68973b Fix for BUG#13549 "Server crash with nested stored procedures 
if inner routine has more local variables than outer one, and
one of its last variables was used as argument to NOT operator".

THD::spcont was non-0 when we were parsing stored routine/trigger
definition during execution of another stored routine. This confused
methods of Item_splocal and forced them use wrong runtime context.
Fix ensures that we always have THD::spcont equal to zero during
routine/trigger body parsing. This also allows to avoid problems
with errors which occur during parsing and SQL exception handlers.
 2005-11-23 00:50:37 +02:00
serg@serg.mylan
419d82f8c2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-22 21:16:11 +01:00
serg@serg.mylan
39cc20a265 German error messages 2005-11-22 21:10:38 +01:00
eric@mysql.com
bb4cfc9924 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/eric/fed-txn-mysql-5.1-new
 2005-11-22 11:42:09 -08:00
pem@mysql.com
7827fec43e Set type and default correctly for local SP variables during parsing. 2005-11-22 16:01:04 +01:00
pem@mysql.com
6c2f6e29b9 Post-merge fixes in sp_head.cc (print methods). 2005-11-22 14:25:44 +01:00
pem@mysql.com
d71d1242ff Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/show-sp-code/mysql-5.0
 2005-11-22 13:24:53 +01:00
pem@mysql.com
962d2df6b0 Some final cleanup of the sp_instr print methods. 2005-11-22 13:06:52 +01:00
lars@mysql.com
a0487a8220 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-11-22 11:34:55 +01:00
bell@sanja.is.com.ua
471f9ca364 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
 2005-11-22 10:55:06 +02:00
lars@mysql.com
9851469d12 Added explicit casts, since on i686, the fprintf function does not cast my_off_t correctly. 
Changed wrong printf to fprintf.
 2005-11-22 02:40:08 +01:00
ingo@production.mysql.com
c2abd08da5 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
 2005-11-22 02:26:21 +01:00
kent@mysql.com
9b14ee2ebc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-22 01:17:06 +01:00
patg@krsna.patg.net
4e666f2f99 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new
 2005-11-21 15:31:12 -08:00
patg@krsna.patg.net
88776a8244 BUG #14524 
Post-review fixes to original changeset http://lists.mysql.com/internals/32422
 2005-11-21 15:21:04 -08:00
ingo@production.mysql.com
49ed3c589d Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
 2005-11-21 23:30:14 +01:00
bell@sanja.is.com.ua
7f162c7899 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-21 21:15:48 +02:00
bell@sanja.is.com.ua
fe44e364ca Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-21 21:14:36 +02:00
bell@sanja.is.com.ua
87a199fc2a Avoiding removing dummy TABLE allocated on the stack (BUG#14726). 2005-11-21 21:11:02 +02:00
bar@mysql.com
3d1c1d7f68 cast.result: 
Fixing test results accordingly.
item_timefunc.cc:
  Displaying BINARY or CHAR in error messages,
  depending on the character set.
 2005-11-21 21:11:28 +04:00
bar@mysql.com
225d009c6a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b14255
 2005-11-21 20:01:16 +04:00
eric@mysql.com
ec341f0303 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/eric/fed-err-mysql-5.0
 2005-11-21 07:05:14 -08:00
ingo@mysql.com
a0f14eb8ef Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug13707
 2005-11-21 15:28:21 +01:00
bar@mysql.com
174d28e4cc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b14255
 2005-11-21 17:57:14 +04:00
bar@mysql.com
2f72e05903 Bug#10446 Illegal mix of collations: 
item_strfunc.h, item_strfunc.cc, item.cc:
  Try to convert a const item into destination 
  character set. If conversion happens without
  data loss, then cache the converted value
  and return it during val_str().
  Otherwise, if conversion loses data, return
  Illeral mix of collations error, as it happened
  previously.
ctype_recoding.result, ctype_recoding.test:
  Fixing tests accordingly.
 2005-11-21 17:26:31 +04:00
msvensson@neptunus.(none)
e6331657a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-11-21 12:28:36 +01:00
msvensson@neptunus.(none)
9301123eb3 Bug #14514 Creating table with packed key fails silently 
- Backport from 5.0
 2005-11-21 12:27:58 +01:00
mskold@mysql.com
c38fa304c3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-21 10:46:17 +01:00
serg@serg.mylan
5663843d3b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-21 10:18:54 +01:00
ramil@mysql.com
e5f0a861cf Fix for bug #15047: "server crash when compiling without transaction support". 2005-11-21 11:52:58 +04:00
mskold@mysql.com
efdef780bc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-21 08:42:36 +01:00
bell@sanja.is.com.ua
806f9e24ff Inefficient usage of String::append() fixed. 
Bad examples of usage of a string with its length fixed.
The incorrect length in the trigger file configuration descriptor
  fixed (BUG#14090).
A hook for unknown keys added to the parser to support old .TRG files.
 2005-11-20 20:47:07 +02:00
kent@mysql.com
521f4b61f2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 21:35:11 +01:00
konstantin@mysql.com
1fa45d6121 Merge mysql.com:/opt/local/work/mysql-5.0-8568 
into  mysql.com:/opt/local/work/mysql-5.1-new
 2005-11-19 19:26:22 +03:00
dlenev@mysql.com
b040ad35b1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13825
 2005-11-19 19:07:51 +03:00
konstantin@mysql.com
723baa4d90 A fix for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA when 
COUNT(*) is 0" (the test case has been pushed already)
 2005-11-19 19:00:02 +03:00
guilhem@mysql.com
b3845d1f60 Fix after merge of 5.0 into 5.1. Failed tests before merge: bdb-deadlock, ndb_cache2, ndb_multi2, 
ps_6bdb (this one fails circa once over 4 runs). After the merge: the same PLUS mysql_client_test&sp (due to problem in fix of BUG#14845 which has also
been noticed in 5.0 too and Konstantin is looking at it) PLUS mysqlcheck (just consequence of mysql_client_test).
And a replication bugfix (thd->spcont must be taken into account when calling tables_ok(), as in 5.0,
and so some brackets were missing which changed one test).
Pekka will look at the NDB code where I just used "ul": ndb_charset test, and storage/ndb/src/kernel/vm/SimulatedBlock.cpp
and storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp (SimulatedBlock.hpp automerged);
please also check storage/ndb/src/ndbapi/NdbRecAttr.cpp. Petr please check ha_tina.cc.
 2005-11-19 15:56:55 +01:00
dlenev@mysql.com
d1eb512948 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13825
 2005-11-19 15:11:57 +03:00
dlenev@mysql.com
574e711209 Fix for bug #13825 "Triggers: crash if release savepoint" and for general 
handling of savepoints in stored routines.

Fixed ha_rollback_to_savepoint()/ha_savepoint()/ha_release_savepoint()
functions to properly handle savepoints inside of stored functions and
triggers.
Also now when we invoke stored function or trigger we create new savepoint
level. We destroy it at the end of function/trigger execution and return back
to old savepoint level.
 2005-11-19 15:09:23 +03:00
guilhem@mysql.com
a7c3aed5f4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
 2005-11-19 13:06:16 +01:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-19 11:11:09 +01:00
guilhem@mysql.com
24006266d0 Merge mysql.com:/home/mysql_src/mysql-5.0-van 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
 2005-11-19 10:43:28 +01:00
patg@krsna.patg.net
f6cd0148b8 BUG #14524 
Patch that fixes crashing when partition uses blackole for 
underlying tables.
 2005-11-18 17:02:27 -08:00
konstantin@mysql.com
86f1896fb0 Bug#13510 "Setting password local variable changes current 
password": additional fix, also make sure that a syntax error is 
returned for set names="foo" when there is no such variable or no
stored procedure.
 2005-11-19 01:22:12 +03:00
guilhem@mysql.com
7d7eb22ed1 fix after merge of 5.0 into 5.1 2005-11-18 21:34:54 +01:00
evgen@moonbone.local
c9ab4d614e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13622-bug-5.0-mysql
 2005-11-18 22:11:34 +03:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
 2005-11-18 16:38:01 +01:00
pem@mysql.com
3a832faafe Post-review fixes, mainly fixing all print() methods for sp_instr* classes. 
Also added mysql-test files:
 include/is_debug_build.inc
 r/is_debug_build.require
 r/sp-code.result
 t/sp-code.test
 2005-11-18 16:30:27 +01:00
mskold@mysql.com
38878cd724 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-18 15:51:15 +01:00
konstantin@mysql.com
c20fe5dffd More authors. 2005-11-18 14:39:44 +03:00
mskold@mysql.com
2237d9b745 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-18 10:14:27 +01:00
mskold@mysql.com
96413a44d1 Using new error code HA_ERR_TABLE_DEF_CHANGED to signal wrong schema version of table 2005-11-18 09:54:49 +01:00
igor@rurik.mysql.com
a0744fba27 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-11-17 20:26:34 -08:00
omer@mysql.com
46f140deb3 Updated authors.h file (and show_check.result file) to include QA team members 
Note: This change was reviewed by Brian before the commit.
 2005-11-17 17:35:50 -08:00
evgen@moonbone.local
a031778955 Manually merged 2005-11-18 01:16:15 +03:00
serg@serg.mylan
34f7275834 remove erroneous ' 2005-11-17 22:54:51 +01:00
serg@serg.mylan
e0abc22bfc BUG#13406 - incorrect amount of "records deleted" in CSV. 
Fallback to row-wise delete if number or rows in the table is unknown
 2005-11-17 22:52:31 +01:00
jimw@mysql.com
f8ce7bc01e Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-17 13:37:30 -08:00
jimw@mysql.com
cee6671756 Merge mysql.com:/home/jimw/my/mysql-4.1-11796 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-17 10:58:46 -08:00
konstantin@mysql.com
a42b3730aa Post-review fixes (Bug#13524). 2005-11-17 19:40:48 +03:00
konstantin@mysql.com
c2a1c6c81f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-13524
 2005-11-17 19:26:58 +03:00
guilhem@mysql.com
50afa94dd5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql_src/mysql-5.1
 2005-11-17 15:59:39 +01:00
guilhem@mysql.com
2c8d2ebe6f Fix for BUG#15018 "valgrind error in Rpl_filter (uninitalized memory - could crash)". 
The code was reading a HASH or DYNAMIC_ARRAY which may be uninited (difference from 5.0
is that those vars were always zeroed in 5.0 because were static globals, while they are new'd in 5.1).
 2005-11-17 15:58:55 +01:00
mskold@mysql.com
8ca38a90ad Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-17 15:38:15 +01:00
eric@mysql.com
76ddbf2fd3 removed superfluous local variable 2005-11-17 06:28:11 -08:00
grog@mysql.com
e91e55d643 set_var.cc, mysqld.cc, ha_innodb.h: 
BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.
ha_innodb.cc:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool
 2005-11-17 15:08:49 +01:00
eric@mysql.com
c15c270437 fix potential security hole, pointed out by Sergei. Also simplify code per Sergei's suggestion. 2005-11-17 06:05:09 -08:00
andrey@lmy004.
2982de9ab6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bdb_region
 2005-11-17 15:01:28 +01:00
andrey@lmy004.
3fa9c4243b reorder the variables - should be in alphabetical order 2005-11-17 14:58:14 +01:00
konstantin@mysql.com
85f5263284 A fix and a test case for Bug#13524 "lock timeout gives 
incorrect warning on open cursor"
 2005-11-17 16:20:12 +03:00
mskold@mysql.com
77cbf5d3ff Fixed incorrectly use if table with wrong schema version 2005-11-17 12:45:23 +01:00
eric@mysql.com
c8485ed447 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/eric/fed-txn-mysql-5.1-new
 2005-11-17 02:54:17 -08:00
pem@mysql.com
c518a2405f Background: 
Since long, the compiled code of stored routines has been printed in the trace file
when starting mysqld with the "--debug" flag. (At creation time only, and only in
debug builds of course.) This has been helpful when debugging stored procedure
execution, but it's a bit awkward to use. Also, the printing of some of the
instructions is a bit terse, in particular for sp_instr_stmt where only the command
code was printed.

This improves the printout of several of the instructions, and adds the debugging-
only commands "show procedure code <name>" and "show function code <name>".
(In non-debug builds they are not available.)
 2005-11-17 11:11:48 +01:00
igor@rurik.mysql.com
dc32369fb0 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-11-16 20:09:35 -08:00
dlenev@mysql.com
f0e558c1b8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13399-2
 2005-11-17 04:38:10 +03:00