database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-27 13:04:36 +03:00
Code Activity
17,461 Commits 3,144 Branches 363 Tags
624f855e948c374bda73f0594e4be9090dd90be0
Commit Graph

8211 Commits

Author SHA1 Message Date
jimw@mysql.com
624f855e94 Make sure that warning message when GROUP_CONCAT() cuts values is also 
updated with the correct number of lines. (Bug #8681)
 2005-02-23 17:58:20 -08:00
jimw@mysql.com
a50be4d42b Merge mysql.com:/home/jimw/my/mysql-4.1-7989 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-22 13:15:34 -08:00
jimw@mysql.com
df3c8db4f3 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-22 13:14:49 -08:00
lars@mysql.com
c583eb6954 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 14:17:17 +01:00
lars@mysql.com
6b06ff5956 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/bkroot/mysql-4.1
 2005-02-22 14:12:42 +01:00
lars@mysql.com
d59fa45596 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 14:12:23 +01:00
lars@mysql.com
f09466e0d7 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b8297-4.1 2005-02-22 14:03:01 +01:00
monty@mysql.com
7914e24409 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-22 14:43:14 +02:00
lars@mysql.com
e31ea39d0c Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:39:41 +01:00
bell@51.0.168.192.in-addr.arpa
babcdb6407 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
 2005-02-22 14:34:59 +02:00
lars@mysql.com
d2ecf8e6a5 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:29:20 +01:00
lars@mysql.com
2d1089e8c1 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1 2005-02-22 13:22:34 +01:00
bar@mysql.com
89a5530822 A user variable are now always have IMPLICIT coercibility, 
independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with 
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.
 2005-02-22 15:55:40 +04:00
lars@mysql.com
1d3c67000b BUG#6662: Changes after Guilhems and Sergs review 2005-02-22 12:40:31 +01:00
bell@51.0.168.192.in-addr.arpa
9a9811f3a4 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
 2005-02-22 13:00:00 +02:00
monty@mysql.com
22a76c1dfb Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-22 12:51:54 +02:00
monty@mysql.com
e2dc9b4099 Backport my_strntod() from 5.0 
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)
 2005-02-22 12:51:23 +02:00
bar@mysql.com
c709ad87db field.cc: 
optimize test_if_minus() when not UCS2 support is compiled.
 2005-02-22 08:35:15 +04:00
lars@mysql.com
be28ef0a20 BUG#6662: Importing mysqldumps should not show any warnings of level "notes". 2005-02-21 18:40:28 +01:00
lars@mysql.com
d857155e1d BUG#6676: Added comment for the fix 2005-02-21 17:52:15 +01:00
lars@mysql.com
5cffeb2b85 BUG#6676: Derivation of user variables should be of derivation "IMPLICIT" 2005-02-21 16:26:04 +01:00
konstantin@mysql.com
b902a66e27 Fix -ansi -pedantic compilation failure. 2005-02-21 17:27:36 +03:00
jimw@mysql.com
10800c1eb5 Merge mysql.com:/home/jimw/my/mysql-4.1-8475 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-18 15:40:17 -08:00
jimw@mysql.com
29d1d9a369 Clean up merge for fix for Bug #8350. 2005-02-18 15:23:17 -08:00
jimw@mysql.com
793a505c26 Fix merge of fix for Bug #4872. 2005-02-18 15:02:54 -08:00
jimw@mysql.com
5348bc99c1 Clean up fix for Bug #7989 by avoiding extra memory copy, and adding some 
more information to the error message.
 2005-02-18 12:47:33 -08:00
mats@mysql.com
0ad02a920c Merge from 4.0 2005-02-18 14:19:08 +01:00
mats@mysql.com
d0f1b5f3fd Merge mysql.com:/home/bkroot/mysql-4.0 
into mysql.com:/home/bk/b7879-mysql-4.0
 2005-02-18 13:50:19 +01:00
hf@deer.(none)
8b2fc991cd Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2005-02-18 15:52:59 +04:00
hf@deer.(none)
93e0107050 Fix for the bug #7344 (multiple server_init/server_end lead to crash) 
Some variable wasn't moved to the initial state during mysql_server_end
 2005-02-18 15:51:55 +04:00
jimw@mysql.com
3c700572b4 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 15:23:28 -08:00
jimw@mysql.com
e3ff1bf326 Merge mysql.com:/home/jimw/my/mysql-4.1-8303 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:54:05 -08:00
jimw@mysql.com
219e29d7ae Merge mysql.com:/home/jimw/my/mysql-4.1-8471 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:53:07 -08:00
jimw@mysql.com
08624c0061 Merge mysql.com:/home/jimw/my/mysql-4.1-8355 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:48:34 -08:00
jimw@mysql.com
9df11a3c5e Merge mysql.com:/home/jimw/my/mysql-4.1-7989 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:47:14 -08:00
jimw@mysql.com
1c22de9032 Log each slow query in a multi-statement query to the slow query log. 
(Bug #8475)
 2005-02-17 11:48:44 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
10ab9e982f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1
 2005-02-17 17:52:49 +00:00
svoj@mysql.com
349112292f bug#6958 
Fixed that negative arguments to certain integer options wrap around.
 2005-02-17 15:04:04 +04:00
igor@rurik.mysql.com
d2730b3342 item.h: 
Revised the fix for bug #7098.
  Corrected the method Item_string::new_item.
sql_select.cc:
  Revised the fix for bug #7098.
  Aborted the previous modifications.
 2005-02-16 22:51:32 -08:00
igor@rurik.mysql.com
eedde7ba3e select.result, select.test: 
Added a test case for bug #7098.
sql_select.cc:
  Fixed bug #7098.
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.
 2005-02-16 21:17:20 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
a1bf1c926e Bug#8147 
Fix ambigious table error for INSERT..SELECT..UPDATE
 2005-02-17 01:33:59 +00:00
lars@mysql.com
8663d77775 BUG#8297: If query is filtered on slave, do not put it in general log. 2005-02-17 00:28:04 +01:00
jimw@mysql.com
9df24e5ebd When calling initgroups(), set a flag that the segfault handler checks 
in order to output a special warning about a particular case of segfaults
due to a mix of static binaries, NSS, and LDAP. (Bug #4872)
 2005-02-16 11:58:35 -08:00
pekka@mysql.com
0d03304294 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2
 2005-02-16 12:48:38 +01:00
pekka@mysql.com
7c9a155c4a ndb - fix old decimal type mysql vs ndb 2005-02-16 12:45:59 +01:00
igor@rurik.mysql.com
3100f891d2 Manual merge 2005-02-15 21:03:17 -08:00
igor@rurik.mysql.com
d9f66a261b Merge rurik.mysql.com:/home/igor/mysql-4.0 
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
 2005-02-15 18:48:04 -08:00
igor@rurik.mysql.com
d4779d3534 delete.result, delete.test: 
Added a test case for bug #8392.
sql_delete.cc:
  Fixed bug #8392.
  The bug caused a crash for a delete statement with ORDER BY
  that explicitly referred to the modified table.
 2005-02-15 18:45:42 -08:00
jimw@mysql.com
a6afab6a55 Always lowercase database names from 'host' and 'db' grant tables when they 
are loaded and lower_case_table_names is set, but issue a warning when it is
done. (Bug #7989)
 2005-02-15 13:36:46 -08:00
jimw@mysql.com
dee9795b5b Merge 2005-02-15 12:19:01 -08:00