database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-12 20:49:12 +03:00
Code Activity
25,957 Commits 3,133 Branches 363 Tags
bc6b03668496e558749e7e65c9b51aafefdbb8d0
Commit Graph

322 Commits

Author SHA1 Message Date
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-08-26 15:56:52 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-08-25 12:08:26 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0 Several fixes for Netware. 2005-08-24 22:03:34 +03:00
monty@mishka.local
e73d6c25fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-31 12:56:02 +03:00
monty@mishka.local
8437e9c1be Fixes during review of new pushed code 
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
 2005-07-31 12:49:55 +03:00
bell@sanja.is.com.ua
36f250a240 Added sql_mode saving to mysql_dump (BUG#5891, part 2) 2005-07-29 23:39:08 +03:00
monty@mysql.com
987edeaa9b Fixed compiler warnings 2005-07-28 21:25:05 +03:00
patg@radha.local
8d671d7bca Applied and tested this patch successfully (bug 10431) to a clean 
tree on brian's amd 64 box (which was already approved). 

[patg@zim mysql-5.0]$ bk changes
ChangeSet@1.1882, 2005-07-21 18:43:55+05:00, gluh@eagle.intranet.mysql.r18.ru
  merge fix

Was the changeset level I applied this patch to.

Master shutdown finished
Slave shutdown finished
All 326 tests were successful.

[patg@zim mysql-5.0]$
 2005-07-22 04:11:45 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
0f7639ba15 Added some missing casts and changed a define for alloca(). 2005-07-20 13:27:57 +03:00
monty@mishka.local
2278e0319c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc Cleanups during review 
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
 2005-07-18 15:33:18 +03:00
mskold@mysql.com
fe73e69b4e Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-06 11:39:48 +02:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
lars@mysql.com
4120003926 BUG#11678: mysqldump --master-data should fail if master binlog disabled 2005-07-01 12:01:00 +02:00
msvensson@neptunus.(none)
ca2ad9cdf6 Merge 2005-06-30 19:21:38 +02:00
msvensson@neptunus.(none)
14e778e43a After review fixes 2005-06-30 19:15:39 +02:00
pem@mysql.comhem.se
6fd1e8227e Fixed compiler errors (i.e. changed C++-isms into C) 2005-06-29 14:23:43 +02:00
monty@mishka.local
7398252d02 Portability fixes 
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
 2005-06-27 20:31:00 +03:00
msvensson@neptunus.(none)
01b025c2d2 Fix so that my_progname is set to "mysqldump" 2005-06-22 20:37:14 +02:00
msvensson@neptunus.(none)
8e9c7a42df Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-06-22 20:24:10 +02:00
msvensson@neptunus.(none)
2dd6a58d58 BUG#9657 mysqldump xml ( -x ) does not format NULL fields correctly 
- Importing the bug fixes by patch due to merge problems.
 2005-06-22 20:22:54 +02:00
msvensson@neptunus.(none)
1199b4ec9d Fix mysqldump for so that my_programname is set to "mysqldump". 
Correct test results now when error message output is predictable.
 2005-06-22 20:12:21 +02:00
msvensson@neptunus.(none)
9258513c1e Bug #9558 mysqldump --no-data db t1 t2 format still dumps data 
- Check the Dflag variable inside of function dump_table to see if data should be
dumped or not.
    - Add test for --xml and --no-data as well
    Reapplying patch!
 2005-06-22 15:43:49 +02:00
msvensson@neptunus.(none)
e9e048f321 Merge fix 2005-06-22 15:29:08 +02:00
msvensson@neptunus.(none)
85b9ffc4ca Merged from mysql-4.1 to mysql-5.0 2005-06-22 14:10:02 +02:00
msvensson@neptunus.(none)[msvensson]
39636f48f0 patch 2005-06-21 14:19:56 +02:00
msvensson@neptunus.(none)
16abf20043 BUG#10927 mysqldump: Can't reload dump with view that consist of other view 
- Create a small dummy table that will take care of the problem of creating a view dependent of another view which hasn't yet been created.
 2005-06-16 15:58:17 +02:00
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +02:00
brian@zim.(none)
6182241268 Additions for --add-drop-database 2005-05-20 06:56:02 -07:00
jimw@mysql.com
d5ee234917 Fixes to merge from 4.1 2005-05-18 15:40:34 -07:00
jimw@mysql.com
3f6aad900c Resolve merge from 4.1 2005-05-18 11:06:34 -07:00
jimw@mysql.com
79ce5dcd90 Resolve bugfix merge 2005-05-18 09:25:06 -07:00
jimw@mysql.com
be221cc012 Small optimization to bug fix, from Monty. 2005-05-18 09:12:37 -07:00
gbichot@quadita2.mysql.com
56dbfc99ba mysqldump.c: disabling --delayed-insert until BUG#7815 is fixed (need table def cache for that, 
to easily check the storage engine supports DELAYED).
 2005-05-18 13:02:09 +02:00
brian@zim.(none)
8636468466 Merge 2005-05-08 16:19:06 -07:00
jimw@mysql.com
e2a11cc15e Fix crash in mysqldump -c triggered by tables with a large number of long 
field names. (Bug #10286)
 2005-05-08 12:02:46 -07:00
brian@brian-akers-computer.local
39f4e5755d Patch for --insert-ignore 2005-05-07 09:49:39 -07:00
monty@mysql.com
1be0a0c82a Now one gets an error if one tries to insert an invalid value via a stored procedure in STRICT mode. (Bug #5907) 2005-04-05 00:32:48 +03:00
reggie@mdk10.(none)
a722daa1e3 Merge 2005-04-01 08:35:33 -06:00
reggie@mdk10.(none)
cca1e62b80 Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent' 
mysqldump.c:
  Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned
 2005-03-31 08:37:18 -06:00
reggie@mdk10.(none)
04b3c901d6 Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent' 
My code in get_actual_tablename was not checking to make sure SHOW TABLES LIKE % was returning rows.  Now I check that the resultset is not null and has at least 1 row before I process the table.

mysqldump.c:
  Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows
 2005-03-28 13:06:43 -06:00
monty@mysql.com
a1ab786091 Cleanups during review of code 
Fixed newly introduced bug in rollup
 2005-03-21 23:41:28 +02:00
gluh@gluh.mysql.r18.ru
b435d6e862 Merge 4.1 -> 5.0 2005-03-17 16:51:07 +03:00
lars@mysql.com
fc6eda1336 Fixes after Sinisa and Serg comments after push of patch for BUG#9123. 
BUG#9123 is solved earlier than this patch though.
 2005-03-16 21:56:56 +01:00
lars@mysql.com
52f190c098 BUG#9123: Updates after Mats review 2005-03-16 13:57:59 +01:00
lars@mysql.com
11f93ffd2d Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1 2005-03-16 08:14:05 +01:00
reggie@mdk10.(none)
aa395b3a45 Merge mdk10.(none):/home/reggie/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-5.0
 2005-03-15 11:42:31 -06:00
reggie@mdk10.(none)
887f2a53fe Bug #6660 mysqldump creates bad pathnames on Windows 
This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem.  With this patch, data directory and index directory will use only forward slashes (/) when on Windows.

mysqldump.c:
  Removed fixPaths routine.  Was improper fix for bug #6660
sql_show.cc:
  Changed append_directory to convert backslashes to foward slashes when on Windows.
 2005-03-15 11:33:06 -06:00
lars@mysql.com
26fae36137 BUG#9123: If a table name is given with an underscore, 
then this must be properly quoted when sent to 
SHOW TABLES LIKE ...
 2005-03-15 16:23:02 +01:00
reggie@mdk10.(none)
75e1b9e765 Bug #6660 mysqldump creates bad pathnames on Windows 
This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows.  However, this patch fixes the bug in mysqldump.c

mysqldump.c:
  Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows
 2005-03-14 16:47:35 -06:00