mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26271 commits 2778 branches 343 tags 1.6 GiB
Commit graph

8149 commits

Author SHA1 Message Date
dlenev@mysql.com
c30c632117 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-09-02 01:23:31 +04:00
bell@sanja.is.com.ua
dd7ab17059 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
 2005-09-01 22:42:37 +03:00
dlenev@mysql.com
d23732962f Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423 
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-09-01 23:25:29 +04:00
msvensson@neptunus.(none)
f1f45919c9 Fix missing command terminator 2005-09-01 20:49:06 +02:00
msvensson@neptunus.(none)
d6b705dd8e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-09-01 20:13:42 +02:00
msvensson@neptunus.(none)
1026fa2fe3 Fix for spelling miss and eol junk 2005-09-01 20:02:08 +02:00
lars@mysql.com
6a91b15b8e Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
 2005-09-01 19:03:09 +02:00
msvensson@neptunus.(none)
544273f9e8 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-01 17:29:49 +02:00
msvensson@neptunus.(none)
28f529d91f Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
 2005-09-01 17:21:03 +02:00
msvensson@neptunus.(none)
305dc01078 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
 2005-09-01 17:15:37 +02:00
msvensson@neptunus.(none)
4b47ebcfc9 mysqltest improvements, updates after merge + test for 5.0 2005-09-01 17:01:23 +02:00
dlenev@mysql.com
0683c122b6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/dlenev/src/mysql-4.1-bg12423
 2005-09-01 17:01:25 +04:00
dlenev@mysql.com
da2af0bb6d Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in 
multi-threaded environment".

To avoid deadlocks between several simultaneously run account management 
commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
commands) we should always take table and internal locks during their
execution in the same order. In other words we should first open and lock
privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.
 2005-09-01 16:52:59 +04:00
kent@mysql.com
b6889a4e72 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-09-01 14:45:39 +02:00
kent@mysql.com
1a5f346bf9 mtr_process.pl: 
Make sure mtr_kill_processes() is called with an array ref
  Corrected error string for STDERR redirect
 2005-09-01 14:32:42 +02:00
pekka@mysql.com
cf626c2000 ndb - fix ha_ndb crash on ordered index on nullable varchar 2005-09-01 14:12:48 +02:00
msvensson@neptunus.(none)
61be2a143d Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316 
into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
 2005-09-01 12:53:23 +02:00
msvensson@neptunus.(none)
ced32517c7 Bug #3131 mysqltest fails on $2=$1 assignment in test 2005-09-01 10:53:33 +02:00
msvensson@neptunus.(none)
906f7c4481 Bug #12471 mysqltest, --error within loop affects wrong statement 
- Move clearing of expected errors
 2005-09-01 09:34:40 +02:00
jimw@mysql.com
d6db387aea Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-31 19:12:16 -07:00
jimw@mysql.com
0ebf1576dc Merge mysql.com:/home/jimw/my/mysql-4.1-12325 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-31 18:32:45 -07:00
jimw@mysql.com
00b17c1c17 Fix handling of filenames that start the same as reserved filenames 
on Windows. (Bug #12325)
 2005-08-31 18:32:15 -07:00
jimw@mysql.com
1d997477aa Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-31 15:24:06 -07:00
tulin@dl145b.mysql.com
d24138e4cc corrected merge error 2005-08-31 23:05:44 +02:00
ndbdev@dl145b.mysql.com
583979d949 merge 2005-08-31 20:45:48 +02:00
evgen@moonbone.local
41fc00641c create.test, create.result, sql_select.cc, item.cc: 
After merge fix for bug #12537
 2005-08-31 22:06:34 +04:00
evgen@moonbone.local
f917803e0c Manual merged 2005-08-31 21:24:25 +04:00
msvensson@neptunus.(none)
d692f0c045 Remove syntax !$<err_no> to set an expected error code 
Use !<err_no> instead
 2005-08-31 18:10:26 +02:00
lars@mysql.com
7fd89c85b7 BUG#12542: All set statements should be executed by slave thd 
rpl_replicate_do.result:
  New test case
sql_parse.cc:
  All SET statements should be executed by slave thd
rpl_replicate_do.test:
  New test case
 2005-08-31 18:08:45 +02:00
msvensson@neptunus.(none)
2fc6ef3a40 BUG#11316: mysqltest, problems when assigning value with '#' to $variable 
- Add stricter checking of syntax in mysqltest
 2005-08-31 17:16:05 +02:00
kent@mysql.com
16eecea22e mtr_timer.pl, mtr_report.pl, mtr_process.pl, mysql-test-run.pl: 
Backporting from 5.0
 2005-08-31 16:28:47 +02:00
evgen@moonbone.local
f1fb30a15f Fix bug #12861 client hang with group_concat insubquery FROM DUAL. 
Item_func_group_concat::fix_fields() set maybe_null flag to 0, and set it to
1 only if some of it's arguments may be null. When used in subquery in tmp 
table created field which can't be null. When no data retireved result field
have to be set to null and error mentioned in bug report occurs. Also this 
bug can occur if selecting from not null field in empty table.

Function group_concat now marked maybe_null from the very beginning not only
if some of it's argument may be null.
 2005-08-31 18:26:50 +04:00
sergefp@mysql.com
04d75ab6e8 Fix group_min_max.test - myisam may return slightly row count estimate on amd64 2005-08-31 13:23:24 +04:00
ramil@mysql.com
a16da25e06 Merge mysql.com:/usr/home/ram/work/4.1.b9613 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2005-08-31 10:25:00 +05:00
kent@mysql.com
5f7ce18fb1 mysql-test-run.pl: 
Put back unused old manager dummy arguments, some scripts use them
 2005-08-31 03:38:33 +02:00
kent@mysql.com
85ed1e8da7 Makefile.am: 
Make dist copy of .imtest files not fail the make target, as there are no files yet
 2005-08-31 02:25:28 +02:00
brian@zim.(none)
57403ddc9d Merge zim.(none):/home/brian/mysql/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.1

Resolved to minor issues.
 2005-08-30 14:40:02 -07:00
jimw@mysql.com
b5c01d7971 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-30 14:36:07 -07:00
evgen@moonbone.local
14d0c25fc5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/12489-bug-5.0-mysql
 2005-08-31 01:07:19 +04:00
evgen@moonbone.local
dc53ac6d1f Fix bug #12489 wrongly printed strcmp() function results in creation of broken 
view.

For Item_func_strcmp print() was not defined and for this class was called
print_op of it's parent class. Because of this strcmp() was printed wrongly
and this results int creation of broken view.

Added function Item_func_strcmp::print() which correctly prints strcmp()
function.
 2005-08-31 00:54:41 +04:00
anozdrin@mysql.com
e7305b8cab Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-im-tests-fw
 2005-08-31 00:29:29 +04:00
evgen@moonbone.local
6ed7255448 manual merge of bug fix#12537 2005-08-30 23:29:47 +04:00
jimw@mysql.com
0dc444ec4e Fix incorrect spellings of "dropped" in source and tests. (Bug #12828) 2005-08-30 12:24:37 -07:00
brian@zim.(none)
bd806f786e Fix for bad merge. 2005-08-30 11:04:23 -07:00
brian@zim.(none)
3091eb3fa4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-08-30 08:28:55 -07:00
brian@zim.(none)
16e30aaf68 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zim.(none):/home/brian/mysql/mysql-4.1
 2005-08-30 08:28:34 -07:00
sergefp@mysql.com
f29bebe216 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug12720
 2005-08-30 16:34:40 +04:00
ramil@mysql.com
dba11de02a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b9613
 2005-08-30 17:32:53 +05:00
evgen@moonbone.local
d76f9471cb Fix bug #12537 UNION produces longtext instead of varchar 
Item::tmp_table_field_from_field_type() and create_tmp_field_from_item()
was converting string field to blob depending on byte-wise length instead of
character length, which results in converting valid varchar string with
length == 86 to longtext.

Made that functions above take into account max width of character when
converting string fields to blobs.
 2005-08-30 16:19:53 +04:00
bar@mysql.com
3ff1acb8db Bug#12363 
character_set_results is nullable, but value_ptr returns string "NULL"

set_var.cc:
  Create Item_null instead of Item_string for NULL values

variables.result, variables.test:
  adding test case
 2005-08-30 17:11:59 +05:00